summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets/pages
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-12-15 13:57:28 -0700
committerAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-12-18 11:48:00 -0700
commitc5e400405e545dddd68bf79e9a581b093159209d (patch)
tree2461b88aefc2aff185edaaa7cc9ea5c694a46f21 /app/assets/stylesheets/pages
parent36b3dbf29ab5af30658c7e50028d4040498c82bd (diff)
downloadgitlab-ce-c5e400405e545dddd68bf79e9a581b093159209d.tar.gz
Fix sidebar height when performance bar enabled
Diffstat (limited to 'app/assets/stylesheets/pages')
-rw-r--r--app/assets/stylesheets/pages/issuable.scss5
1 files changed, 5 insertions, 0 deletions
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 {