diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-25 00:09:08 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-25 00:09:08 +0300 |
| commit | 7671216b60e2796a050358ff808b4a0c2de3d22f (patch) | |
| tree | 605dfc1339a3cd7dc7353ac6d725191086a9acca /app/assets/stylesheets | |
| parent | c2367afbf57ebc65d5b78a743b5d6a91f0aece9f (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/stylesheets')
| -rw-r--r-- | app/assets/stylesheets/framework/images.scss | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/merge_requests.scss | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/images.scss b/app/assets/stylesheets/framework/images.scss index d78c707192f..2c9397d363c 100644 --- a/app/assets/stylesheets/framework/images.scss +++ b/app/assets/stylesheets/framework/images.scss @@ -20,7 +20,7 @@ width: 100%; } - $image-widths: 80 130 250 306 394 430; + $image-widths: 80 130 150 250 306 394 430; @each $width in $image-widths { &.svg-#{$width} { img, diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss index 5ca75c28ac3..ad8b251d3e4 100644 --- a/app/assets/stylesheets/pages/merge_requests.scss +++ b/app/assets/stylesheets/pages/merge_requests.scss @@ -614,6 +614,10 @@ $mr-widget-min-height: 69px; .circle-icon-container { color: $gl-text-color-quaternary; } + + .popover { + z-index: 240; + } } .card-new-merge-request { |