summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-05-28 06:10:48 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-05-28 06:10:48 +0000
commitd193734fb97510ffc55f84c2f3a0a3692cd2d859 (patch)
treed01546164fb50d89639e8f4c39e81776bb1347c6 /app/assets/stylesheets
parent50135e6e0460e9276588670e3235a95f19a1660d (diff)
downloadgitlab-ce-d193734fb97510ffc55f84c2f3a0a3692cd2d859.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/stylesheets')
-rw-r--r--app/assets/stylesheets/pages/merge_requests.scss5
1 files changed, 5 insertions, 0 deletions
diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss
index 8246739c8f7..1abaff40bc9 100644
--- a/app/assets/stylesheets/pages/merge_requests.scss
+++ b/app/assets/stylesheets/pages/merge_requests.scss
@@ -107,10 +107,15 @@ $tabs-holder-z-index: 250;
border-radius: $border-radius-default;
}
+ .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;