diff options
author | Phil Hughes <me@iamphill.com> | 2017-09-06 12:12:19 +0100 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2017-09-06 12:12:19 +0100 |
commit | 2aa8a75f69e338a94cca52a43058d156c0e3a1a1 (patch) | |
tree | 47b5f489b69e2d2e4e389fdd2586cca3781a8da7 /app/assets/stylesheets/new_sidebar.scss | |
parent | de82bd8e447ae7b4b7e66f0368f5f43311848186 (diff) | |
parent | 1632ffa6ad16738994122f0e84f331d50f220879 (diff) | |
download | gitlab-ce-2aa8a75f69e338a94cca52a43058d156c0e3a1a1.tar.gz |
Merge branch 'master' into breadcrumbs-improvements
Diffstat (limited to 'app/assets/stylesheets/new_sidebar.scss')
-rw-r--r-- | app/assets/stylesheets/new_sidebar.scss | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/app/assets/stylesheets/new_sidebar.scss b/app/assets/stylesheets/new_sidebar.scss index e21d52b7db6..55e0343d0dc 100644 --- a/app/assets/stylesheets/new_sidebar.scss +++ b/app/assets/stylesheets/new_sidebar.scss @@ -26,7 +26,7 @@ $new-sidebar-collapsed-width: 50px; // Override position: absolute .right-sidebar { position: fixed; - height: calc(100% - #{$header-height}); + height: calc(100% - #{$new-navbar-height}); } .issues-bulk-update.right-sidebar.right-sidebar-expanded .issuable-sidebar-header { @@ -92,7 +92,7 @@ $new-sidebar-collapsed-width: 50px; z-index: 400; width: $new-sidebar-width; transition: left $sidebar-transition-duration; - top: $header-height; + top: $new-navbar-height; bottom: 0; left: 0; background-color: $gray-normal; @@ -188,7 +188,7 @@ $new-sidebar-collapsed-width: 50px; } .with-performance-bar .nav-sidebar { - top: $header-height + $performance-bar-height; + top: $new-navbar-height + $performance-bar-height; } .sidebar-sub-level-items { @@ -452,7 +452,7 @@ $new-sidebar-collapsed-width: 50px; // Make issue boards full-height now that sub-nav is gone .boards-list { - height: calc(100vh - #{$header-height}); + height: calc(100vh - #{$new-navbar-height}); @media (min-width: $screen-sm-min) { height: 475px; // Needed for PhantomJS @@ -463,7 +463,7 @@ $new-sidebar-collapsed-width: 50px; } .with-performance-bar .boards-list { - height: calc(100vh - #{$header-height} - #{$performance-bar-height}); + height: calc(100vh - #{$new-navbar-height} - #{$performance-bar-height}); } |