]> git.ipfire.org Git - ipfire.org.git/commitdiff
Fix navbar size on webkit
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 16 Oct 2018 08:54:56 +0000 (09:54 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 16 Oct 2018 08:54:56 +0000 (09:54 +0100)
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
src/scss/_variables.scss
src/scss/style.scss

index e075b70af1d8400afdbd9aabc4ab5d008be4332c..8a1eabfc4dc233a79df517821e9def158c16713e 100644 (file)
@@ -72,13 +72,12 @@ $display1-size:                             4rem;
 $link-color:                           $primary;
 
 // Navbar
-$navbar-brand-font-size:       44px;
-$navbar-brand-height:          76px;
+$navbar-brand-font-size:       3rem;
+$navbar-brand-height:          5rem;
+$navbar-brand-padding-y:       1rem;
+$navbar-height:                                $navbar-brand-height + ($navbar-brand-padding-y * 2);
 
-$nav-link-height:                      48px;
-$navbar-nav-link-padding-x:    16px;
-
-$navbar-padding-y:                     24px;
+$navbar-nav-link-padding-x:    1rem;
 
 // Input
 $input-btn-padding-x:          1.5rem;
index 526ab8fb5f73b8dc57c9699e484da412e0f23f1e..b5bc5122a5616d7cfa3e16208b07b6d3b26a2e2c 100644 (file)
@@ -87,6 +87,10 @@ body {
 .navbar {
        background-color: rgba($gray-400, .06);
 
+       // Webkit is being stupid and cannot figure out the height
+       // of the navbar by itself
+       min-height: $navbar-height;
+
        .navbar-brand {
                color: inherit;
        }