Make logo-margin work even if search is enabled, see #692 for details

vunb · Feb 24, 2017 · e7f5144 · e7f5144
1 parent 1c09962
commit e7f5144
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/source/layouts/layout.erb b/source/layouts/layout.erb
@@ -42,7 +42,7 @@ under the License.
       </span>
     </a>
     <div class="tocify-wrapper">
-      <%= image_tag "logo.png" %>
+      <%= image_tag "logo.png", class: 'logo' %>
       <% if language_tabs.any? %>
         <div class="lang-selector">
           <% language_tabs.each do |lang| %>

diff --git a/source/stylesheets/_variables.scss b/source/stylesheets/_variables.scss
@@ -54,7 +54,7 @@ $lang-select-pressed-text: #fff !default; // color of language tab text when mou
 ////////////////////
 $nav-width: 230px !default; // width of the navbar
 $examples-width: 50% !default; // portion of the screen taken up by code examples
-$logo-margin: 20px !default; // margin between nav items and logo, ignored if search is active
+$logo-margin: 0px !default; // margin below logo
 $main-padding: 28px !default; // padding to left and right of content & examples
 $nav-padding: 15px !default; // padding to left and right of navbar
 $nav-v-padding: 10px !default; // padding used vertically around search boxes and results

diff --git a/source/stylesheets/screen.css.scss b/source/stylesheets/screen.css.scss
@@ -110,8 +110,8 @@ html, body {
     }
   }
 
-  img+.tocify, .lang-selector+.tocify {
-    margin-top: $logo-margin;
+  .logo {
+    margin-bottom: $logo-margin;
   }
 
   .search-results {