diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-09-30 00:03:50 +0300 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-10-06 22:12:11 +0300 |
| commit | 940e702468ecd8c811dc2f2f4602c38ebffd9742 (patch) | |
| tree | aad8864fd6aa77b68860326cfc214be06093bd3d /app/assets/stylesheets/pages/merge_requests.scss | |
| parent | 314cfc39a7c3832f212d9837970f6cc59c436a50 (diff) | |
Start moving new nav styles into header.scss
Diffstat (limited to 'app/assets/stylesheets/pages/merge_requests.scss')
| -rw-r--r-- | app/assets/stylesheets/pages/merge_requests.scss | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss index 09a14578dd3..d9fb3b44d29 100644 --- a/app/assets/stylesheets/pages/merge_requests.scss +++ b/app/assets/stylesheets/pages/merge_requests.scss @@ -649,7 +649,7 @@ } .merge-request-tabs-holder { - top: $new-navbar-height; + top: $header-height; z-index: 200; background-color: $white-light; border-bottom: 1px solid $border-color; @@ -679,7 +679,7 @@ } .with-performance-bar .merge-request-tabs-holder { - top: $new-navbar-height + $performance-bar-height; + top: $header-height + $performance-bar-height; } .merge-request-tabs { |