Commit 57837051 authored by Natalia Tepluhina's avatar Natalia Tepluhina

Merge branch '350557-add-css-custom-property-for-theme' into 'master'

Introduce theme accent custom property

See merge request gitlab-org/gitlab!78488
parents 1babaf44 8b4371f3
...@@ -43,6 +43,10 @@ gl-emoji { ...@@ -43,6 +43,10 @@ gl-emoji {
border-bottom-color: transparent; border-bottom-color: transparent;
} }
.emoji-picker-category-active {
border-bottom-color: var(--gl-theme-accent, $theme-indigo-500);
}
.emoji-picker .gl-new-dropdown-inner > :last-child { .emoji-picker .gl-new-dropdown-inner > :last-child {
padding-bottom: 0; padding-bottom: 0;
} }
...@@ -40,9 +40,11 @@ ...@@ -40,9 +40,11 @@
a.active { a.active {
color: $black; color: $black;
font-weight: $gl-font-weight-bold; font-weight: $gl-font-weight-bold;
border-bottom: 2px solid var(--gl-theme-accent, $theme-indigo-500);
.badge.badge-pill { .badge.badge-pill {
color: $black; color: $black;
font-weight: $gl-font-weight-bold;
} }
} }
...@@ -126,14 +128,6 @@ ...@@ -126,14 +128,6 @@
input { input {
display: inline-block; display: inline-block;
position: relative; position: relative;
&:not[type='checkbox'] {
/* Medium devices (desktops, 992px and up) */
@include media-breakpoint-up(md) { width: 200px; }
/* Large devices (large desktops, 1200px and up) */
@include media-breakpoint-up(lg) { width: 250px; }
}
} }
@include media-breakpoint-up(md) { @include media-breakpoint-up(md) {
......
...@@ -1795,6 +1795,9 @@ body.gl-dark { ...@@ -1795,6 +1795,9 @@ body.gl-dark {
.nav-sidebar li.active:not(.fly-out-top-item) > a:not(.has-sub-items) { .nav-sidebar li.active:not(.fly-out-top-item) > a:not(.has-sub-items) {
background-color: var(--indigo-900-alpha-008); background-color: var(--indigo-900-alpha-008);
} }
body.gl-dark {
--gl-theme-accent: #868686;
}
body.gl-dark .navbar-gitlab { body.gl-dark .navbar-gitlab {
background-color: #fafafa; background-color: #fafafa;
} }
......
...@@ -4,12 +4,16 @@ ...@@ -4,12 +4,16 @@
*/ */
@mixin gitlab-theme( @mixin gitlab-theme(
$search-and-nav-links, $search-and-nav-links,
$active-tab-border, $accent,
$border-and-box-shadow, $border-and-box-shadow,
$sidebar-text, $sidebar-text,
$nav-svg-color, $nav-svg-color,
$color-alternate $color-alternate
) { ) {
// Set custom properties
--gl-theme-accent: #{$accent};
// Header // Header
.navbar-gitlab { .navbar-gitlab {
...@@ -219,22 +223,6 @@ ...@@ -219,22 +223,6 @@
} }
} }
.nav-links li {
&.active a,
&.md-header-tab.active button,
a.active {
border-bottom: 2px solid $active-tab-border;
.badge.badge-pill {
font-weight: $gl-font-weight-bold;
}
}
}
.emoji-picker-category-active {
border-bottom-color: $active-tab-border;
}
.branch-header-title { .branch-header-title {
color: $border-and-box-shadow; color: $border-and-box-shadow;
} }
......
...@@ -1795,6 +1795,9 @@ body.gl-dark { ...@@ -1795,6 +1795,9 @@ body.gl-dark {
.nav-sidebar li.active:not(.fly-out-top-item) > a:not(.has-sub-items) { .nav-sidebar li.active:not(.fly-out-top-item) > a:not(.has-sub-items) {
background-color: var(--indigo-900-alpha-008); background-color: var(--indigo-900-alpha-008);
} }
body.gl-dark {
--gl-theme-accent: #868686;
}
body.gl-dark .navbar-gitlab { body.gl-dark .navbar-gitlab {
background-color: #fafafa; background-color: #fafafa;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment