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

This commit is contained in:
Robert Lord 2017-02-24 11:22:22 -06:00
parent 1c0996227d
commit e7f5144e4c
3 changed files with 4 additions and 4 deletions

View file

@ -42,7 +42,7 @@ under the License.
</span> </span>
</a> </a>
<div class="tocify-wrapper"> <div class="tocify-wrapper">
<%= image_tag "logo.png" %> <%= image_tag "logo.png", class: 'logo' %>
<% if language_tabs.any? %> <% if language_tabs.any? %>
<div class="lang-selector"> <div class="lang-selector">
<% language_tabs.each do |lang| %> <% language_tabs.each do |lang| %>

View file

@ -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 $nav-width: 230px !default; // width of the navbar
$examples-width: 50% !default; // portion of the screen taken up by code examples $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 $main-padding: 28px !default; // padding to left and right of content & examples
$nav-padding: 15px !default; // padding to left and right of navbar $nav-padding: 15px !default; // padding to left and right of navbar
$nav-v-padding: 10px !default; // padding used vertically around search boxes and results $nav-v-padding: 10px !default; // padding used vertically around search boxes and results

View file

@ -110,8 +110,8 @@ html, body {
} }
} }
img+.tocify, .lang-selector+.tocify { .logo {
margin-top: $logo-margin; margin-bottom: $logo-margin;
} }
.search-results { .search-results {