diff options
author | Phil Hughes <me@iamphill.com> | 2017-01-27 18:41:19 +0300 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2017-01-27 18:44:41 +0300 |
commit | d7c0955b88f8947e2da41bbce76544dbda76cc0e (patch) | |
tree | df4af2b201243e9fbc1269d533e40eac3c9b6406 /app/assets/stylesheets/pages/merge_requests.scss | |
parent | b9ff4656a8afc7f401d032b857c2089612c597c2 (diff) |
Fixed merge request tabs extra margin
Fixed extra margin when the merge request tabs are affixed
This was caused by some weird padding that was on the container & then
not correctly removed.
The fix involved removing the container from inside the tabs holder div
& then adding the widths through CSS depending on if fixed & whether the
parent is limited width or not.
In reality out container classes need to be fixed as it is getting pretty un-managable at the moment this should of been an easy fix, but in reality turned into something much harder.
Closes #26853
Diffstat (limited to 'app/assets/stylesheets/pages/merge_requests.scss')
-rw-r--r-- | app/assets/stylesheets/pages/merge_requests.scss | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss index 45ff9f7ff5f..ab68b360f93 100644 --- a/app/assets/stylesheets/pages/merge_requests.scss +++ b/app/assets/stylesheets/pages/merge_requests.scss @@ -420,10 +420,6 @@ .merge-request-tabs-holder { background-color: $white-light; - .container-limited { - max-width: $limited-layout-width; - } - &.affix { top: 100px; left: 0; @@ -433,10 +429,26 @@ @media (max-width: $screen-xs-max) { right: 0; } + + .merge-request-tabs-container { + padding-left: $gl-padding; + padding-right: $gl-padding; + } } +} - &:not(.affix) .container-fluid { - padding-left: 0; - padding-right: 0; +.limit-container-width { + .merge-request-tabs-container { + max-width: $limited-layout-width; + margin-left: auto; + margin-right: auto; + } +} + +.limit-container-width:not(.container-limited) { + .merge-request-tabs-holder:not(.affix) { + .merge-request-tabs-container { + max-width: $limited-layout-width - ($gl-padding * 2); + } } } |