Merge pull request #541 from 47degrees/fix/search-styling-tweaks

Search styling tweaks
47degrees · Jan 28, 2021 · a526739 · a526739
2 parents 0bbca51 + 32a2030
commit a526739
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 5 deletions.
diff --git a/src/main/resources/_sass/light-style/_light-docs.scss b/src/main/resources/_sass/light-style/_light-docs.scss
@@ -205,6 +205,12 @@
         padding: 0;
         margin: 0;
 
+        .search-nav {
+          @include bp(small) {
+            display: none !important;
+          }
+        }
+
         li {
           list-style: none;
           display: inline-block;

diff --git a/src/main/resources/_sass/light-style/_navbar.scss b/src/main/resources/_sass/light-style/_navbar.scss
@@ -111,6 +111,12 @@
           display: inline-block;
         }
       }
+
+      .search-nav {
+        @include bp(medium) {
+          display: none;
+        }
+      }
     }
   }
 }
diff --git a/src/main/resources/_sass/light-style/_variables_style.scss b/src/main/resources/_sass/light-style/_variables_style.scss
@@ -49,7 +49,7 @@ $state-danger-bg:               #f2dede;
 $line-height-base:              1.428571429;
 $body-bg:                       $white-color;
 // Breakpoint
-$bp-small: 480px;
-$bp-medium: 768px;
+$bp-small: 530px;
+$bp-medium: 868px;
 $bp-large: 992px;
 $bp-xlarge: 1130px;
diff --git a/src/main/scala/microsites/layouts/DocsLayout.scala b/src/main/scala/microsites/layouts/DocsLayout.scala
@@ -107,6 +107,11 @@ class DocsLayout(config: MicrositeSettings) extends Layout(config) {
       } else Seq.empty
     }
 
+    val maybeSearch =
+      if (config.visualSettings.theme != "pattern" && config.searchSettings.searchEnabled) {
+        Seq(siteSearch)
+      } else Seq.empty
+
     val sidebar =
       if (config.visualSettings.theme == "pattern") buildSidebar else buildLightSidebar
 
@@ -121,10 +126,8 @@ class DocsLayout(config: MicrositeSettings) extends Layout(config) {
                 div(cls := "action-menu pull-left clearfix",
                   a(href := "#menu-toggle", id := "menu-toggle", i(cls := "fa fa-bars", aria.hidden := "true"))
                 ),
-                ul(cls := "pull-left",
-                  siteSearch
-                ),
                 ul(cls := "pull-right",
+                  maybeSearch,
                   githubLinks,
                   shareOnSocial
                 )