summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-07-20 21:55:01 +0000
committerJames Edwards-Jones <jedwardsjones@gitlab.com>2017-07-31 20:11:08 +0100
commitd8b666155d4ace84d92d8a1b68624857f31e9bd3 (patch)
tree44246388b715c3c7293d0ac72f37eea4fd4a1d89
parentc8276c9b76f4e03fcf99c6eefaa67690d902d218 (diff)
downloadgitlab-ce-d8b666155d4ace84d92d8a1b68624857f31e9bd3.tar.gz
Merge branch 'new-nav-issue-boards-height' into 'master'
Fix height of issue boards with new navigation Closes #35299 See merge request !12985
-rw-r--r--app/assets/stylesheets/new_sidebar.scss2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/stylesheets/new_sidebar.scss b/app/assets/stylesheets/new_sidebar.scss
index ad8a271938a..1ffb8891536 100644
--- a/app/assets/stylesheets/new_sidebar.scss
+++ b/app/assets/stylesheets/new_sidebar.scss
@@ -191,7 +191,7 @@ $new-sidebar-width: 220px;
@media (min-width: $screen-sm-min) {
height: 475px; // Needed for PhantomJS
// scss-lint:disable DuplicateProperty
- height: calc(100vh - 120px);
+ height: calc(100vh - 180px);
// scss-lint:enable DuplicateProperty
}
}