diff options
| author | Stan Hu <stanhu@gmail.com> | 2017-08-02 16:58:28 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2017-08-02 16:58:28 -0700 |
| commit | 408df2edcbd5f3f93ef5541bac9de2b71ba4f0ea (patch) | |
| tree | 708ae61f9683b48f436f7577d1fad98f30e100fc /app/assets/stylesheets/framework/sidebar.scss | |
| parent | 3f81586ef0ab20533b8da1213bd9f60e1786dbaa (diff) | |
| parent | faa2a123911eaf84bb57163ea7af759d4632601b (diff) | |
| download | gitlab-ce-408df2edcbd5f3f93ef5541bac9de2b71ba4f0ea.tar.gz | |
Merge branch 'master' into sh-headless-chrome-support
Diffstat (limited to 'app/assets/stylesheets/framework/sidebar.scss')
| -rw-r--r-- | app/assets/stylesheets/framework/sidebar.scss | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/sidebar.scss b/app/assets/stylesheets/framework/sidebar.scss index 5cf9330b8f8..09b60ad1676 100644 --- a/app/assets/stylesheets/framework/sidebar.scss +++ b/app/assets/stylesheets/framework/sidebar.scss @@ -89,10 +89,13 @@ } } +.with-performance-bar .right-sidebar.affix { + top: $header-height + $performance-bar-height; +} + @mixin maintain-sidebar-dimensions { display: block; width: $gutter-width; - padding: 10px 20px; } .issues-bulk-update.right-sidebar { @@ -104,6 +107,15 @@ &.right-sidebar-expanded { @include maintain-sidebar-dimensions; width: $gutter-width; + + .issuable-sidebar-header { + // matches `.top-area .nav-controls` for issuable index pages + padding: 11px 0; + } + + .block:last-of-type { + border: none; + } } &.right-sidebar-collapsed { |