From c06b4b3871e782a171bb7d58de46320b8b1e868f Mon Sep 17 00:00:00 2001 From: Marcin Kulik Date: Sat, 18 Oct 2014 11:05:04 +0200 Subject: [PATCH] Make top navbar fixed --- app/assets/stylesheets/base.sass | 1 + app/assets/stylesheets/header.sass | 14 +++++++++++--- app/views/layouts/_header.html.slim | 2 +- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/app/assets/stylesheets/base.sass b/app/assets/stylesheets/base.sass index 5640967..d93874c 100644 --- a/app/assets/stylesheets/base.sass +++ b/app/assets/stylesheets/base.sass @@ -5,6 +5,7 @@ body font-family: "Source Sans Pro", "Helvetica Neue", Helvetica, Arial, sans-serif font-size: 15px background-color: $background-color + padding-top: 42px .btn font-size: 15px diff --git a/app/assets/stylesheets/header.sass b/app/assets/stylesheets/header.sass index a032e7a..99642a2 100644 --- a/app/assets/stylesheets/header.sass +++ b/app/assets/stylesheets/header.sass @@ -3,8 +3,9 @@ header.navbar color: #fff border-radius: 0 border: 0 - min-height: 40px + min-height: 42px margin-bottom: 0 + border-bottom: 1px solid #222222 .navbar-nav > li @@ -62,10 +63,13 @@ header.navbar background-color: #444 .navbar-collapse - border-color: #666 !important + border-color: #444 !important .navbar-toggle - border-color: #888 + border: 0 + padding: 10px + margin: 3px 5px 0 0 + border-radius: 0 .icon-bar background-color: #888 @@ -90,3 +94,7 @@ header.navbar .caret margin-left: 10px + +@media (max-width: 767px) + .navbar-default .navbar-nav .open .dropdown-menu > li > a + color: #fff diff --git a/app/views/layouts/_header.html.slim b/app/views/layouts/_header.html.slim index 13304a5..47d7586 100644 --- a/app/views/layouts/_header.html.slim +++ b/app/views/layouts/_header.html.slim @@ -1,4 +1,4 @@ -header.navbar.navbar-default[role="navigation"] +header.navbar.navbar-default.navbar-fixed-top[role="navigation"] .container .navbar-header button.navbar-toggle[type="button" data-toggle="collapse" data-target=".navbar-ex1-collapse"]