diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2016-12-27 20:40:12 +0000 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-12-27 20:40:12 +0000 |
| commit | ae51027da0f89bc98b9cd39e61c9e51d8da23add (patch) | |
| tree | ae28ce6ddd771a07270aaeef2b0f7862563557e8 | |
| parent | 48b3004bfb6bd24ef34a2b8235b9c843e8fe1947 (diff) | |
| parent | 6328ec3ab2595722afb780a9b60b44ef4c0bcac2 (diff) | |
| download | gitlab-ce-ae51027da0f89bc98b9cd39e61c9e51d8da23add.tar.gz | |
Merge branch '25907-limited-container' into 'master'
Only limit container width on issues & MRs within fixed-width container
Closes #25907
See merge request !8330
| -rw-r--r-- | app/assets/stylesheets/pages/issuable.scss | 60 |
1 files changed, 31 insertions, 29 deletions
diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss index eeb5b590625..9478b66f536 100644 --- a/app/assets/stylesheets/pages/issuable.scss +++ b/app/assets/stylesheets/pages/issuable.scss @@ -1,48 +1,50 @@ // Limit MR description for side-by-side diff view -.limit-container-width { - .detail-page-header { - max-width: calc(#{$limited-layout-width} - (#{$gl-padding} * 2)); - margin-left: auto; - margin-right: auto; - } - - .issuable-details { - .detail-page-description, - .mr-source-target, - .mr-state-widget, - .merge-manually { +.container-limited { + &.limit-container-width { + .detail-page-header { max-width: calc(#{$limited-layout-width} - (#{$gl-padding} * 2)); margin-left: auto; margin-right: auto; } - .merge-request-tabs-holder { - &.affix { - border-bottom: 1px solid $border-color; + .issuable-details { + .detail-page-description, + .mr-source-target, + .mr-state-widget, + .merge-manually { + max-width: calc(#{$limited-layout-width} - (#{$gl-padding} * 2)); + margin-left: auto; + margin-right: auto; + } + + .merge-request-tabs-holder { + &.affix { + border-bottom: 1px solid $border-color; + + .nav-links { + border: 0; + } + } - .nav-links { - border: 0; + .container-fluid { + padding-left: 0; + padding-right: 0; + max-width: calc(#{$limited-layout-width} - (#{$gl-padding} * 2)); + margin-left: auto; + margin-right: auto; } } + } - .container-fluid { - padding-left: 0; - padding-right: 0; + .diffs { + .mr-version-controls, + .files-changed { max-width: calc(#{$limited-layout-width} - (#{$gl-padding} * 2)); margin-left: auto; margin-right: auto; } } } - - .diffs { - .mr-version-controls, - .files-changed { - max-width: calc(#{$limited-layout-width} - (#{$gl-padding} * 2)); - margin-left: auto; - margin-right: auto; - } - } } .issuable-details { |