summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets/new_sidebar.scss
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-08-10 15:13:38 -0500
committerAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-09-05 13:19:07 -0700
commitf76e8c6536a3af4c9051ff056b95c2d7f2dd7b7e (patch)
tree049c9eb512adbd79f3fd61d94a29ad87b1abda2e /app/assets/stylesheets/new_sidebar.scss
parentb5a06c609915a5321a5f35b7915dbb6744a54285 (diff)
downloadgitlab-ce-f76e8c6536a3af4c9051ff056b95c2d7f2dd7b7e.tar.gz
Top navigation updates
Diffstat (limited to 'app/assets/stylesheets/new_sidebar.scss')
-rw-r--r--app/assets/stylesheets/new_sidebar.scss10
1 files changed, 5 insertions, 5 deletions
diff --git a/app/assets/stylesheets/new_sidebar.scss b/app/assets/stylesheets/new_sidebar.scss
index f624b130e19..90b0a543c5c 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 {
@@ -93,7 +93,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;
@@ -189,7 +189,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 {
@@ -453,7 +453,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
@@ -464,7 +464,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});
}