summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets/pages/merge_requests.scss
diff options
context:
space:
mode:
Diffstat (limited to 'app/assets/stylesheets/pages/merge_requests.scss')
-rw-r--r--app/assets/stylesheets/pages/merge_requests.scss21
1 files changed, 15 insertions, 6 deletions
diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss
index 36d39c1a613..1abaff40bc9 100644
--- a/app/assets/stylesheets/pages/merge_requests.scss
+++ b/app/assets/stylesheets/pages/merge_requests.scss
@@ -43,8 +43,6 @@ $tabs-holder-z-index: 250;
}
.mr-widget-section {
- border-radius: $border-radius-default $border-radius-default 0 0;
-
.code-text {
flex: 1;
}
@@ -88,7 +86,6 @@ $tabs-holder-z-index: 250;
.mr-section-container {
border: 1px solid $border-color;
border-radius: $border-radius-default;
- border-top: 0;
background: var(--white, $white);
}
@@ -110,11 +107,15 @@ $tabs-holder-z-index: 250;
border-radius: $border-radius-default;
}
- .mr-widget-section,
+ .mr-widget-section:not(:first-child),
.mr-widget-footer {
border-top: solid 1px $border-color;
}
+ .mr-widget-alert-container + .mr-widget-section {
+ border-top: 0;
+ }
+
.mr-fast-forward-message {
padding-left: $gl-padding-50;
padding-bottom: $gl-padding;
@@ -525,9 +526,7 @@ $tabs-holder-z-index: 250;
.mr-source-target {
flex-wrap: wrap;
- border-radius: $border-radius-default;
padding: $gl-padding;
- border: 1px solid $border-color;
background: var(--white, $white);
min-height: $mr-widget-min-height;
@@ -1027,3 +1026,13 @@ $tabs-holder-z-index: 250;
vertical-align: middle;
}
}
+
+.mr-widget-alert-container {
+ $radius: $border-radius-default - 1px;
+
+ border-radius: $radius $radius 0 0;
+
+ .gl-alert:not(:last-child) {
+ margin-bottom: 1px;
+ }
+}