resolving conflicts

2020-07-08 16:01:48 -04:00
parent 754c6b1a64 0ce44ec17f
commit 0ebc16c10c
421 changed files with 10650 additions and 8434 deletions
@@ -0,0 +1,12 @@
+# NOTE
+
+
+This directory contains stylesheet files referenced by different sections of
+the website. Please use caution when moving/renaming them.
+
+## Style Sheets used by API reference
+
+- bootstrap-4.3.1.min.css
+- fontawesome-4.7.0.min.css
+- style_apiref.css
+
@@ -4,9 +4,9 @@
 <META charset="UTF-8">
 <TITLE>Kubernetes API Reference Docs</TITLE>
 <LINK rel="shortcut icon" href="favicon.ico" type="image/vnd.microsoft.icon">
-<LINK rel="stylesheet" href="css/bootstrap.min.css">
-<LINK rel="stylesheet" href="css/font-awesome.min.css" type="text/css">
-<LINK rel="stylesheet" href="css/stylesheet.css" type="text/css">
+<LINK rel="stylesheet" href="/css/bootstrap-4.3.1.min.css">
+<LINK rel="stylesheet" href="/css/fontawesome-4.7.0.min.css" type="text/css">
+<LINK rel="stylesheet" href="/css/style_apiref.css" type="text/css">
 </HEAD>
 <BODY>
 <DIV id="wrapper" class="container-fluid">
@@ -47944,10 +47944,10 @@ The contents of the target Secret&#39;s Data field will be presented in a volume
 </DIV>
 </DIV>
 </DIV>
-<SCRIPT src="/js/jquery-3.2.1.min.js"></SCRIPT>
-<SCRIPT src="js/jquery.scrollTo.min.js"></SCRIPT>
+<SCRIPT src="/js/jquery-3.3.1.min.js"></SCRIPT>
+<SCRIPT src="/js/jquery.scrollTo-2.1.2.min.js"></SCRIPT>
 <SCRIPT src="/js/bootstrap-4.3.1.min.js"></SCRIPT>
 <SCRIPT src="js/navData.js"></SCRIPT>
-<SCRIPT src="js/scroll.js"></SCRIPT>
+<SCRIPT src="/js/scroll-apiref.js"></SCRIPT>
 </BODY>
 </HTML>
@@ -1,3 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24px" height="24px" viewBox="0 0 24 24" fill="#FFFFFF">
+<svg xmlns="http://www.w3.org/2000/svg" width="24px" height="24px" viewBox="0 0 24 24" fill="#184eb1">
 <path d="M16 1H4c-1.1 0-2 .9-2 2v14h2V3h12V1zm3 4H8c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h11c1.1 0 2-.9 2-2V7c0-1.1-.9-2-2-2zm0 16H8V7h11v14z"/>
 </svg>
--- a/Show More
+++ b/Show More