API layout cleanup and use one API CSS stylesheet to rule them all

Signed-off-by: Ian Maddaus <[email protected]>
chef · Sep 15, 2023 · 0658488 · 0658488
1 parent ee4b28a
commit 0658488
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 42 deletions.
diff --git a/themes/docs-new/layouts/_default/data-api.html b/themes/docs-new/layouts/_default/data-api.html
@@ -14,14 +14,10 @@
       {{- end -}}
     {{- end }}
     <link href="https://fonts.googleapis.com/css?family=Montserrat:300,400,700|Roboto:300,400,700" rel="stylesheet">
-    {{ if in .Params.product "automate" }}
-    <link rel="stylesheet" type="text/css" href="/automate-api-stylesheet.css">
-    {{ else }}
-    <link rel="stylesheet" type="text/css" href="{{ $.Page.Params.style_sheet }}">
-    {{ end }}
+    <link rel="stylesheet" type="text/css" href="/api-stylesheet.css">
   </head>
   <body>
-    {{ if in .Params.product "automate" }}
+    {{ if eq $.Page.Params.title "Chef Automate API" }}
       <div id="top-container">
         <span id="top-container-return">
           <a class="return" style="position: static;" href="{{ $.Page.Params.return_page }}">Return to Docs</a>

diff --git a/...cs-new/static/automate-api-stylesheet.css → themes/docs-new/static/api-stylesheet.css b/...cs-new/static/automate-api-stylesheet.css → themes/docs-new/static/api-stylesheet.css
@@ -28,30 +28,33 @@ a.return {
 	padding:20px;
 	font-family: Montserrat, sans-serif;
 	font-weight: 400;
-	font-size: .9em;
-	line-height: 1.6em;
+	font-size: 14px;
+	line-height: 1.5em;
 	color: rgb(51, 51, 51);
 	background-color: rgb(250, 250, 250);
+	border-bottom: 1px solid rgb(225, 225, 225);
 }
+
 #top-container-return {
 	padding-left: 10px;
 	flex: 0 0 200px;
 	margin-top: 1em;
 }
 
+/* The following content is for a note at the top of the Automate API page */
+
 #top-container-messages {
 	flex: 1 1 500px;
-	margin: 1em;
-	padding: 0 1em;
+	margin: 1em 1em 0 1em;
+	padding: 0;
 	border-radius: 3px;
 	display: flex;
 	flex-direction: column;
 }
 
 .top-container-message {
-	padding: 0 15px;
-	margin: 1em;
 	padding: 0;
+	margin: 0 1em;
 	border-radius: 3px;
 }
 
@@ -82,10 +85,5 @@ p#top-container-warning {
 }
 
 .top-container-text {
-	padding: 1em;
-}
-
-redoc[spec-url] a img[src^="/images/chef-automate-logo.svg"] {
-	width: 220px;
-	margin: 20px;
+	padding: 0 1em;
 }
diff --git a/themes/docs-new/static/habitat-api-styles.css b/themes/docs-new/static/habitat-api-styles.css