diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-01-04 12:21:28 -0600 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-02-10 15:09:08 -0600 |
| commit | a11e798aa0fdc2f67bdc0fc5ad611a6872af0e9f (patch) | |
| tree | 56e38778e8681ac94a11df979b4a41390f3cf644 /app/assets/stylesheets/framework | |
| parent | eefbc2bf738b9b715aad3777868d4dbeaadf612e (diff) | |
| download | gitlab-ce-a11e798aa0fdc2f67bdc0fc5ad611a6872af0e9f.tar.gz | |
Keep sidebars absolute until fixed at top; remove unneeded JS
Diffstat (limited to 'app/assets/stylesheets/framework')
| -rw-r--r-- | app/assets/stylesheets/framework/nav.scss | 10 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/sidebar.scss | 5 |
2 files changed, 13 insertions, 2 deletions
diff --git a/app/assets/stylesheets/framework/nav.scss b/app/assets/stylesheets/framework/nav.scss index d62f34ccb85..674d3bb45aa 100644 --- a/app/assets/stylesheets/framework/nav.scss +++ b/app/assets/stylesheets/framework/nav.scss @@ -416,14 +416,20 @@ } .page-with-layout-nav { - .right-sidebar { top: ($header-height * 2) + 2; } + + .build-sidebar { + top: ($header-height * 3) + 3; + + &.affix { + top: 0; + } + } } .activities { - .nav-block { border-bottom: 1px solid $border-color; diff --git a/app/assets/stylesheets/framework/sidebar.scss b/app/assets/stylesheets/framework/sidebar.scss index d60661222e9..20bcb1eeb23 100644 --- a/app/assets/stylesheets/framework/sidebar.scss +++ b/app/assets/stylesheets/framework/sidebar.scss @@ -256,4 +256,9 @@ header.header-sidebar-pinned { .right-sidebar { border-left: 1px solid $border-color; + + &.affix { + position: fixed; + top: 0; + } } |