diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-17 15:09:01 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-17 15:09:01 +0000 |
commit | b304a72312465ed4c0a568ee6a6ea5e97f705c9b (patch) | |
tree | a2f25dbea26c81e88b169c55a6275e3969323e82 /app/assets/stylesheets/pages | |
parent | b84eeb256c4a780d902faee1f99ca9a711b3214a (diff) | |
download | gitlab-ce-b304a72312465ed4c0a568ee6a6ea5e97f705c9b.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/stylesheets/pages')
-rw-r--r-- | app/assets/stylesheets/pages/merge_requests.scss | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss index 84daec4fb43..5ca75c28ac3 100644 --- a/app/assets/stylesheets/pages/merge_requests.scss +++ b/app/assets/stylesheets/pages/merge_requests.scss @@ -3,6 +3,8 @@ * */ +$mr-widget-min-height: 69px; + .space-children { @include clearfix; @@ -555,12 +557,11 @@ } .mr-source-target { - display: flex; flex-wrap: wrap; border-radius: $border-radius-default; padding: $gl-padding; border: 1px solid $border-color; - min-height: 69px; + min-height: $mr-widget-min-height; @include media-breakpoint-up(md) { align-items: center; @@ -599,6 +600,22 @@ } } +.mr-pipeline-suggest { + flex-wrap: wrap; + border-radius: $border-radius-default; + padding: $gl-padding; + border: 1px solid $border-color; + min-height: $mr-widget-min-height; + + @include media-breakpoint-up(md) { + align-items: center; + } + + .circle-icon-container { + color: $gl-text-color-quaternary; + } +} + .card-new-merge-request { .card-header { padding: 5px 10px; |