Skip to content

G
gitlab-ce
Commit c5e40040 authored by Annabel Dunstone Gray's avatar Annabel Dunstone Gray
Browse files
Options

Fix sidebar height when performance bar enabled

parent 36b3dbf2
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 0 deletions
app/assets/stylesheets/framework/sidebar.scss
View file @ c5e40040
...@@ -89,6 +89,7 @@ ...@@ -89,6 +89,7 @@
.right-sidebar { .right-sidebar {
border-left: 1px solid $border-color; border-left: 1px solid $border-color;
height: calc(100% - #{$header-height});
} }
.with-performance-bar .right-sidebar.affix { .with-performance-bar .right-sidebar.affix {
......
app/assets/stylesheets/pages/issuable.scss
View file @ c5e40040
...@@ -243,6 +243,7 @@ ...@@ -243,6 +243,7 @@
.issuable-sidebar { .issuable-sidebar {
width: calc(100% + 100px); width: calc(100% + 100px);
height: 100%;
overflow-y: scroll; overflow-y: scroll;
overflow-x: hidden; overflow-x: hidden;
-webkit-overflow-scrolling: touch; -webkit-overflow-scrolling: touch;
...@@ -499,6 +500,10 @@ ...@@ -499,6 +500,10 @@
.with-performance-bar .right-sidebar { .with-performance-bar .right-sidebar {
top: $header-height + $performance-bar-height; top: $header-height + $performance-bar-height;
.issuable-sidebar {
height: calc(100% - #{$performance-bar-height});
}
} }
.sidebar-move-issue-confirmation-button { .sidebar-move-issue-confirmation-button {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7