diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-04-28 10:58:05 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-04-28 10:58:05 +0200 |
| commit | 4b7629ca5a8a15a367fed9a137626044b08d577b (patch) | |
| tree | e145480af905ecfbaff915dcbb56937756be9066 | |
| parent | fd6e1288246c69f984c57d60adf28636e48af66a (diff) | |
| download | gitlab-ce-new-group-navigation.tar.gz | |
Show bottom border for one and 2 row headernew-group-navigation
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| -rw-r--r-- | app/assets/stylesheets/framework/header.scss | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/nav.scss | 5 | ||||
| -rw-r--r-- | app/views/layouts/_page.html.haml | 6 |
3 files changed, 8 insertions, 5 deletions
diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss index 2a3f6d5a432..4e66f762c55 100644 --- a/app/assets/stylesheets/framework/header.scss +++ b/app/assets/stylesheets/framework/header.scss @@ -28,7 +28,7 @@ header { min-height: $header-height; background-color: $gray-light; border: none; - border-bottom: 1px solid $gray-light; + border-bottom: 1px solid $border-color; .container-fluid { width: 100% !important; diff --git a/app/assets/stylesheets/framework/nav.scss b/app/assets/stylesheets/framework/nav.scss index ee1f9c2dcc2..649ac728662 100644 --- a/app/assets/stylesheets/framework/nav.scss +++ b/app/assets/stylesheets/framework/nav.scss @@ -187,7 +187,10 @@ } .layout-nav { - background: $background-color; + position: relative; + z-index: 101; + margin-top: -1px; + background: $gray-light; border-bottom: 1px solid $border-color; .container-fluid { diff --git a/app/views/layouts/_page.html.haml b/app/views/layouts/_page.html.haml index d4e5d5e4bfd..6f4dc1737cd 100644 --- a/app/views/layouts/_page.html.haml +++ b/app/views/layouts/_page.html.haml @@ -22,12 +22,12 @@ = image_tag avatar_icon(current_user, 60), alt: 'Profile', class: 'avatar avatar s36' .username = current_user.username + - if defined?(nav) && nav + .layout-nav + = render "layouts/nav/#{nav}" .content-wrapper = render "layouts/flash" = yield :flash_message - - if defined?(nav) && nav - .layout-nav - = render "layouts/nav/#{nav}" %div{ class: (container_class unless @no_container) } .content .clearfix |