diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-12-15 13:57:28 -0700 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-12-18 11:48:00 -0700 |
| commit | c5e400405e545dddd68bf79e9a581b093159209d (patch) | |
| tree | 2461b88aefc2aff185edaaa7cc9ea5c694a46f21 | |
| parent | 36b3dbf29ab5af30658c7e50028d4040498c82bd (diff) | |
| download | gitlab-ce-c5e400405e545dddd68bf79e9a581b093159209d.tar.gz | |
Fix sidebar height when performance bar enabled
| -rw-r--r-- | app/assets/stylesheets/framework/sidebar.scss | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/issuable.scss | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/app/assets/stylesheets/framework/sidebar.scss b/app/assets/stylesheets/framework/sidebar.scss index 1145a49065f..d61809cb0a4 100644 --- a/app/assets/stylesheets/framework/sidebar.scss +++ b/app/assets/stylesheets/framework/sidebar.scss @@ -89,6 +89,7 @@ .right-sidebar { border-left: 1px solid $border-color; + height: calc(100% - #{$header-height}); } .with-performance-bar .right-sidebar.affix { diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss index 4bc7aeb127d..e1637618ab2 100644 --- a/app/assets/stylesheets/pages/issuable.scss +++ b/app/assets/stylesheets/pages/issuable.scss @@ -243,6 +243,7 @@ .issuable-sidebar { width: calc(100% + 100px); + height: 100%; overflow-y: scroll; overflow-x: hidden; -webkit-overflow-scrolling: touch; @@ -499,6 +500,10 @@ .with-performance-bar .right-sidebar { top: $header-height + $performance-bar-height; + + .issuable-sidebar { + height: calc(100% - #{$performance-bar-height}); + } } .sidebar-move-issue-confirmation-button { |