diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-03-24 14:56:36 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-03-24 14:56:36 +0000 |
| commit | 35f8136479ce7d5c9d55a27243457ed6ea7ddbda (patch) | |
| tree | aeb96d76e9b71ee4c9471c7bf117523562a6ebc3 /app/assets | |
| parent | 76c6aa8b6a36996a42ba5b2024adbb292e35bbbd (diff) | |
| parent | ba6864343b776251a70378295242dd2e41e13de0 (diff) | |
| download | gitlab-ce-35f8136479ce7d5c9d55a27243457ed6ea7ddbda.tar.gz | |
Merge branch '29880-refactor-sidebar-hacks' into 'master'
Resolve "Move sub_nav content above the content-wrapper class"
Closes #29880
See merge request !10163
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/stylesheets/framework/nav.scss | 12 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/builds.scss | 6 |
2 files changed, 7 insertions, 11 deletions
diff --git a/app/assets/stylesheets/framework/nav.scss b/app/assets/stylesheets/framework/nav.scss index 205d23b1329..5ab505034b6 100644 --- a/app/assets/stylesheets/framework/nav.scss +++ b/app/assets/stylesheets/framework/nav.scss @@ -416,14 +416,16 @@ .page-with-layout-nav { .right-sidebar { - top: ($header-height * 2) + 2; + top: ($header-height + 1) * 2; } - .build-sidebar { - top: ($header-height * 3) + 3; + &.page-with-sub-nav { + .right-sidebar { + top: ($header-height + 1) * 3; - &.affix { - top: 0; + &.affix { + top: 0; + } } } } diff --git a/app/assets/stylesheets/pages/builds.scss b/app/assets/stylesheets/pages/builds.scss index a24292a7c8c..969fc75c6eb 100644 --- a/app/assets/stylesheets/pages/builds.scss +++ b/app/assets/stylesheets/pages/builds.scss @@ -366,9 +366,3 @@ right: 0; margin-top: -17px; } - -@media (min-width: $screen-md-min) { - .sub-nav.build { - width: calc(100% + #{$gutter_width}); - } -} |