diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2021-01-20 22:34:23 +0300 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2021-01-20 22:34:23 +0300 |
| commit | 6438df3a1e0fb944485cebf07976160184697d72 (patch) | |
| tree | 00b09bfd170e77ae9391b1a2f5a93ef6839f2597 /app/assets/stylesheets/startup | |
| parent | 42bcd54d971da7ef2854b896a7b34f4ef8601067 (diff) | |
Add latest changes from gitlab-org/gitlab@13-8-stable-eev13.8.0-rc42
Diffstat (limited to 'app/assets/stylesheets/startup')
| -rw-r--r-- | app/assets/stylesheets/startup/startup-dark.scss | 4 | ||||
| -rw-r--r-- | app/assets/stylesheets/startup/startup-general.scss | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/app/assets/stylesheets/startup/startup-dark.scss b/app/assets/stylesheets/startup/startup-dark.scss index d875f758ead..31a501f3a36 100644 --- a/app/assets/stylesheets/startup/startup-dark.scss +++ b/app/assets/stylesheets/startup/startup-dark.scss @@ -1242,8 +1242,8 @@ body.gl-dark .navbar-gitlab .search form { line-height: 18px; margin: 4px 0 4px 2px; } -.title-container .badge.badge-pill, -.navbar-nav .badge.badge-pill { +.title-container .badge.badge-pill:not(.merge-request-badge), +.navbar-nav .badge.badge-pill:not(.merge-request-badge) { position: inherit; font-weight: 400; margin-left: -6px; diff --git a/app/assets/stylesheets/startup/startup-general.scss b/app/assets/stylesheets/startup/startup-general.scss index a98e91b32eb..7f6e537af8f 100644 --- a/app/assets/stylesheets/startup/startup-general.scss +++ b/app/assets/stylesheets/startup/startup-general.scss @@ -1163,8 +1163,8 @@ input { line-height: 18px; margin: 4px 0 4px 2px; } -.title-container .badge.badge-pill, -.navbar-nav .badge.badge-pill { +.title-container .badge.badge-pill:not(.merge-request-badge), +.navbar-nav .badge.badge-pill:not(.merge-request-badge) { position: inherit; font-weight: 400; margin-left: -6px; |