diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-20 12:16:11 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-20 12:16:11 +0300 |
commit | edaa33dee2ff2f7ea3fac488d41558eb5f86d68c (patch) | |
tree | 11f143effbfeba52329fb7afbd05e6e2a3790241 /app/assets/stylesheets/startup/startup-general.scss | |
parent | d8a5691316400a0f7ec4f83832698f1988eb27c1 (diff) |
Add latest changes from gitlab-org/gitlab@14-7-stable-eev14.7.0-rc42
Diffstat (limited to 'app/assets/stylesheets/startup/startup-general.scss')
-rw-r--r-- | app/assets/stylesheets/startup/startup-general.scss | 59 |
1 files changed, 44 insertions, 15 deletions
diff --git a/app/assets/stylesheets/startup/startup-general.scss b/app/assets/stylesheets/startup/startup-general.scss index a57202515ad..2f79c86cdc6 100644 --- a/app/assets/stylesheets/startup/startup-general.scss +++ b/app/assets/stylesheets/startup/startup-general.scss @@ -121,7 +121,7 @@ h1 { color: #303030; background-color: #fff; background-clip: padding-box; - border: 1px solid #dbdbdb; + border: 1px solid #868686; border-radius: 0.25rem; } @media (prefers-reduced-motion: reduce) { @@ -295,6 +295,10 @@ h1 { padding-left: 0.6em; border-radius: 10rem; } +.badge-info { + color: #fff; + background-color: #1f75cb; +} .bg-transparent { background-color: transparent !important; } @@ -353,6 +357,24 @@ h1 { padding-left: 0.5rem; padding-right: 0.5rem; } +.gl-badge.sm { + padding-top: 0; + padding-bottom: 0; +} +.gl-badge.badge-info { + background-color: #cbe2f9; + color: #0b5cad; +} +a.gl-badge.badge-info.active, +a.gl-badge.badge-info:active { + color: #033464; + background-color: #9dc7f1; +} +a.gl-badge.badge-info:active { + box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.8), + 0 0 0 1px rgba(255, 255, 255, 0.4), 0 0 0 4px rgba(31, 117, 203, 0.48); + outline: none; +} .gl-button .gl-badge { top: 0; } @@ -685,7 +707,7 @@ input { padding: 0 16px; z-index: 1000; margin-bottom: 0; - min-height: 40px; + min-height: var(--header-height, 40px); border: 0; position: fixed; top: 0; @@ -710,7 +732,7 @@ input { display: flex; justify-content: space-between; position: relative; - min-height: 40px; + min-height: var(--header-height, 40px); padding-left: 0; } .navbar-gitlab .header-content .title-container { @@ -796,7 +818,7 @@ input { .container-fluid .navbar-nav li - .badge.badge-pill:not(.merge-request-badge) { + .badge.badge-pill:not(.merge-request-badge):not(.version-check-badge) { box-shadow: none; font-weight: 600; } @@ -879,8 +901,10 @@ input { line-height: 18px; margin: 4px 0 4px 2px; } -.title-container .badge.badge-pill:not(.merge-request-badge), -.navbar-nav .badge.badge-pill:not(.merge-request-badge) { +.title-container + .badge.badge-pill:not(.merge-request-badge):not(.version-check-badge), +.navbar-nav + .badge.badge-pill:not(.merge-request-badge):not(.version-check-badge) { position: inherit; font-weight: 400; margin-left: -6px; @@ -891,17 +915,22 @@ input { border-radius: 7px; box-shadow: 0 1px 0 rgba(76, 78, 84, 0.2); } -.title-container .badge.badge-pill:not(.merge-request-badge).green-badge, -.navbar-nav .badge.badge-pill:not(.merge-request-badge).green-badge { +.title-container + .badge.badge-pill:not(.merge-request-badge):not(.version-check-badge).green-badge, +.navbar-nav + .badge.badge-pill:not(.merge-request-badge):not(.version-check-badge).green-badge { background-color: var(--green-400, #2da160); } .title-container - .badge.badge-pill:not(.merge-request-badge).merge-requests-count, -.navbar-nav .badge.badge-pill:not(.merge-request-badge).merge-requests-count { + .badge.badge-pill:not(.merge-request-badge):not(.version-check-badge).merge-requests-count, +.navbar-nav + .badge.badge-pill:not(.merge-request-badge):not(.version-check-badge).merge-requests-count { background-color: var(--orange-400, #c17d10); } -.title-container .badge.badge-pill:not(.merge-request-badge).todos-count, -.navbar-nav .badge.badge-pill:not(.merge-request-badge).todos-count { +.title-container + .badge.badge-pill:not(.merge-request-badge):not(.version-check-badge).todos-count, +.navbar-nav + .badge.badge-pill:not(.merge-request-badge):not(.version-check-badge).todos-count { background-color: var(--blue-400, #428fdc); } .title-container .canary-badge .badge, @@ -1011,7 +1040,7 @@ input { left: 0; z-index: 600; width: 220px; - top: 40px; + top: var(--header-height, 40px); background-color: #f0f0f0; transform: translate3d(0, 0, 0); } @@ -1348,7 +1377,7 @@ input { border-radius: 4px; box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.08); } -.sidebar-top-level-items > li .badge.badge-pill { +.sidebar-top-level-items > li .badge.badge-pill:not(.gl-badge) { border-radius: 0.5rem; padding-top: 0.125rem; padding-bottom: 0.125rem; @@ -1362,7 +1391,7 @@ input { .sidebar-sub-level-items:not(.is-fly-out-only) { display: block; } -.sidebar-top-level-items > li.active .badge.badge-pill { +.sidebar-top-level-items > li.active .badge.badge-pill:not(.gl-badge) { font-weight: 400; color: #0b5cad; } |