diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-18 13:34:06 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-18 13:34:06 +0300 |
commit | 859a6fb938bb9ee2a317c46dfa4fcc1af49608f0 (patch) | |
tree | d7f2700abe6b4ffcb2dcfc80631b2d87d0609239 /app/assets/stylesheets/pages/merge_requests.scss | |
parent | 446d496a6d000c73a304be52587cd9bbc7493136 (diff) |
Add latest changes from gitlab-org/gitlab@13-9-stable-eev13.9.0-rc42
Diffstat (limited to 'app/assets/stylesheets/pages/merge_requests.scss')
-rw-r--r-- | app/assets/stylesheets/pages/merge_requests.scss | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss index b99e619cc98..a62df1258af 100644 --- a/app/assets/stylesheets/pages/merge_requests.scss +++ b/app/assets/stylesheets/pages/merge_requests.scss @@ -221,7 +221,7 @@ $mr-widget-min-height: 69px; .mr-widget-pipeline-graph { .dropdown-menu { - z-index: 300; + z-index: $zindex-dropdown-menu; } } @@ -375,13 +375,14 @@ $mr-widget-min-height: 69px; } .text { - span { - font-weight: $gl-font-weight-bold; - } - p { margin-top: $gl-padding; } + + .highlight { + margin: 0 0 $gl-padding; + font-weight: $gl-font-weight-bold; + } } } @@ -981,7 +982,14 @@ $mr-widget-min-height: 69px; } .mini-pipeline-graph-dropdown-toggle, - .stage-cell .mini-pipeline-graph-dropdown-toggle svg { + .stage-cell .mini-pipeline-graph-dropdown-toggle svg, + // As the `mini-pipeline-item` mixin specificity is lower + // than the toggle of dropdown with 'variant="link"' we add + // classes ".gl-button.btn-link" to make it more specific. + // Once FF ci_mini_pipeline_gl_dropdown is removed, the `mini-pipeline-item` + // itself could increase its specificity to simplify this selector + button.gl-button.btn-link.mini-pipeline-graph-gl-dropdown-toggle, + .stage-cell button.gl-button.btn-link.mini-pipeline-graph-gl-dropdown-toggle svg { height: $ci-action-icon-size-lg; width: $ci-action-icon-size-lg; } |