diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-09-20 21:10:16 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-09-20 21:10:16 +0300 |
| commit | d66aa9b2992a7d44cc6bae54dfa1c3ba08ad8ef4 (patch) | |
| tree | 8d3810dbd41295262b1282567ff8020cd61bf6ff /app/assets/stylesheets | |
| parent | 8ad0af586ed73d33493fe91a0f5204953c7e701a (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/stylesheets')
| -rw-r--r-- | app/assets/stylesheets/page_bundles/escalation_policies.scss | 6 | ||||
| -rw-r--r-- | app/assets/stylesheets/page_bundles/merge_request.scss | 6 |
2 files changed, 11 insertions, 1 deletions
diff --git a/app/assets/stylesheets/page_bundles/escalation_policies.scss b/app/assets/stylesheets/page_bundles/escalation_policies.scss index 84c62ba93dd..49423fccea4 100644 --- a/app/assets/stylesheets/page_bundles/escalation_policies.scss +++ b/app/assets/stylesheets/page_bundles/escalation_policies.scss @@ -42,3 +42,9 @@ $stroke-size: 1px; @include gl-w-full; } } + +.escalation-email-user-dropdown { + .show.dropdown .dropdown-menu { + max-height: 300px; + } +} diff --git a/app/assets/stylesheets/page_bundles/merge_request.scss b/app/assets/stylesheets/page_bundles/merge_request.scss index f03efb82860..e429c0c149e 100644 --- a/app/assets/stylesheets/page_bundles/merge_request.scss +++ b/app/assets/stylesheets/page_bundles/merge_request.scss @@ -205,7 +205,11 @@ $comparison-empty-state-height: 62px; top: $calc-application-header-height; z-index: $tabs-holder-z-index; border-bottom: 1px solid var(--border-color, $border-color); - background-color: var(--gray-10, $white); + background-color: $white; + + .gl-dark & { + background-color: var(--gray-10); + } @include media-breakpoint-up(md) { position: sticky; |