summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2016-12-27 11:26:25 -0600
committerAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2016-12-27 11:26:25 -0600
commit6328ec3ab2595722afb780a9b60b44ef4c0bcac2 (patch)
treee9b6aa0371c182401ab9128b57db2ad5f4e3a4f1
parentf264ec6ee74a0263b4e5212e921c4638c25f8fcd (diff)
downloadgitlab-ce-25907-limited-container.tar.gz
Only limit container width on issues & MRs within fixed-width container25907-limited-container
-rw-r--r--app/assets/stylesheets/pages/issuable.scss60
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 {