Skip to content

Commit 86ae58c

Browse files
committed
fix(color): adjust color scheme for some elements
- icons, buttons, nav-items, tabs, pills, inputs
1 parent 23202fa commit 86ae58c

13 files changed

+100
-29
lines changed

themes/boodark/css/theme-nord.css

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

themes/boodark/css/theme-nord.css.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

themes/boodark/css/theme-orange.css

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

themes/boodark/css/theme-orange.css.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

themes/boodark/css/theme-teal.css

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

themes/boodark/css/theme-teal.css.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

themes/boodark/css/theme.css

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

themes/boodark/css/theme.css.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

themes/boodark/css/theme.rtl.css

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

themes/boodark/scss/_forms.scss

+46-8
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ input {
4545
// }
4646
}
4747

48-
&[type=checkbox]:not(.form-check-input:not(.form-check-input)),
49-
&[type=radio]:not(.form-check-input:not(.form-check-input)) {
48+
&[type=checkbox]:not(.form-check-input),
49+
&[type=radio]:not(.form-check-input) {
5050
width: $form-check-input-width;
5151
height: $form-check-input-width;
5252
margin-top: ($line-height-base - $form-check-input-width) * .75;
@@ -105,15 +105,53 @@ input {
105105
}
106106
}
107107

108-
&[type=file]::file-selector-button {
109-
@extend .btn-dark;
110-
border-width: 1px;
111-
border-style: solid;
108+
&[type=file] {
109+
// display: block;
110+
// width: 100%;
111+
display: inline-block;
112+
width: auto;
113+
padding: $input-padding-y $input-padding-x;
114+
font-family: $input-font-family;
115+
@include font-size($input-font-size);
116+
font-weight: $input-font-weight;
117+
line-height: $input-line-height;
118+
color: $input-color;
119+
background-color: $input-bg;
120+
background-clip: padding-box;
121+
border: $input-border-width solid $input-border-color;
122+
appearance: none; // Fix appearance for date inputs in Safari
123+
124+
// Note: This has no effect on <select>s in some browsers, due to the limited stylability of `<select>`s in CSS.
125+
@include border-radius($input-border-radius, 0);
126+
127+
@include box-shadow($input-box-shadow);
128+
@include transition($input-transition);
129+
130+
&::file-selector-button {
131+
padding: $input-padding-y $input-padding-x;
132+
margin: (-$input-padding-y) (-$input-padding-x);
133+
margin-inline-end: $input-padding-x;
134+
color: $form-file-button-color;
135+
@include gradient-bg($form-file-button-bg);
136+
pointer-events: none;
137+
border-color: inherit;
138+
border-style: solid;
139+
border-width: 0;
140+
border-inline-end-width: $input-border-width;
141+
border-radius: 0;
142+
@include transition($btn-transition);
143+
}
112144
}
113145

114146
&:hover:not(:disabled):not([readonly])::file-selector-button {
115-
background-color: $pma-blue !important;
116-
border-color: $pma-blue !important;
147+
background-color: $form-file-button-hover-bg;
148+
color: color-contrast($form-file-button-hover-bg);
149+
}
150+
}
151+
152+
.form-control {
153+
&:hover:not(:disabled):not([readonly])::file-selector-button {
154+
color: color-contrast($form-file-button-hover-bg);
117155
}
118156
}
119157

themes/boodark/scss/_nav.scss

+8
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,11 @@
77
.nav-tabs {
88
background-color: $nav-tabs-bg;
99
}
10+
11+
.nav-pills {
12+
.nav-link.active {
13+
.icon {
14+
filter: brightness(0) invert(0);
15+
}
16+
}
17+
}

themes/boodark/scss/_navbar.scss

+17-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,23 @@
1313
.navbar-light {
1414
.navbar-nav {
1515
.nav-item.active {
16-
color: $component-active-color;
17-
background-color: $component-active-bg;
16+
@include button-variant($component-active-bg, $component-active-bg);
17+
color: var(--bs-btn-color);
18+
background-color: var(--bs-btn-bg);
19+
border-top-left-radius: $nav-item-border-radius;
20+
border-top-right-radius: $nav-item-border-radius;
21+
22+
&:first-child {
23+
border-top-left-radius: 0;
24+
}
25+
26+
.nav-link {
27+
color: var(--bs-btn-color);
28+
}
29+
30+
.icon {
31+
filter: brightness(0) invert(0);
32+
}
1833
}
1934
}
2035
}

themes/boodark/scss/_variables.scss

+15-5
Original file line numberDiff line numberDiff line change
@@ -82,12 +82,13 @@ $pma-color-scheme: $pma-cyan;
8282

8383
// PMA Base Style
8484
// -----------------------------------------------------------------------------
85+
$pma-primary: $pma-color-scheme;
8586
$pma-body-color: $white;
8687
$pma-body-bg: $pma-gray-900;
8788
$pma-component-bg: $pma-gray-800;
8889
$pma-component-hover-bg: $pma-gray-600;
89-
$pma-component-active-color: $white;
90-
$pma-component-active-bg: $pma-blue;
90+
$pma-component-active-color: $black;
91+
$pma-component-active-bg: $pma-primary;
9192
$pma-table-bg: $pma-gray-700;
9293
$pma-form-border-color: $pma-gray-900;
9394
$pma-selected-bg: $pma-gray-700;
@@ -96,14 +97,15 @@ $pma-fieldset-bg: $pma-gray-600;
9697
$pma-border-color: $pma-gray-600;
9798
$pma-disable-color: $pma-gray-500;
9899
$pma-cond-border-color: $black;
99-
$pma-button-color: $pma-color-scheme;
100-
$pma-link-color: $pma-color-scheme;
100+
$pma-button-color: $pma-primary;
101+
$pma-link-color: $pma-primary;
101102
$pma-link-hover-color: $pma-red;
102103
$pma-custom-color: $pma-orange;
103104

104105
// Bootstrap variables
105106
// -----------------------------------------------------------------------------
106107
// Color system
108+
$primary: $pma-primary;
107109
$secondary: $pma-gray-700;
108110
$light: $pma-gray-800;
109111
// Options
@@ -148,17 +150,23 @@ $input-group-addon-bg: $pma-component-bg;
148150
$form-check-input-border: 1px solid rgba($pma-body-color, .4);
149151
$form-select-indicator-color: $pma-body-color;
150152
$form-switch-color: rgba($pma-body-color, .75);
153+
$form-file-button-color: color-contrast($pma-gray-900);
154+
$form-file-button-bg: $pma-gray-900;
155+
$form-file-button-hover-bg: $pma-primary;
151156
// Form validation
152157
// Z-index master list
153-
// Navs
158+
// Nav Tabs
154159
$nav-tabs-bg: rgba($pma-body-bg, .5);
155160
$nav-tabs-border-color: rgba($pma-body-bg, .5);
156161
$nav-tabs-border-width: 0;
157162
$nav-tabs-link-hover-border-color: transparent;
158163
$nav-tabs-link-active-color: $pma-component-active-color;
159164
$nav-tabs-link-active-bg: $pma-component-active-bg;
160165
$nav-tabs-link-active-border-color: rgba($pma-body-bg, .5);
166+
// Nav Pills
161167
$nav-pills-bg: $pma-body-bg;
168+
$nav-pills-link-active-color: $pma-component-active-color;
169+
$nav-pills-link-active-bg: $pma-component-active-bg;
162170
// Navbar
163171
$navbar-light-color: $white;
164172
$navbar-light-hover-color: rgba($white, .65);
@@ -178,6 +186,7 @@ $navbar-dark-toggler-icon-bg: url("data:image/svg+xml,<svg xmlns='http://w
178186
$navbar-dark-toggler-border-color: rgba($white, .1);
179187
$navbar-dark-brand-color: $navbar-dark-active-color;
180188
$navbar-dark-brand-hover-color: $navbar-dark-active-color;
189+
$nav-item-border-radius: .375rem;
181190
// Dropdowns
182191
$dropdown-color: $pma-body-color;
183192
$dropdown-bg: $pma-body-bg;
@@ -207,6 +216,7 @@ $accordion-bg: $pma-component-bg;
207216
$accordion-button-bg: darken($pma-component-bg, 2.5%);
208217
$accordion-button-active-bg: darken($pma-component-bg, 3.5%);
209218
$accordion-button-active-color: $pma-body-color;
219+
$accordion-border-color: $pma-form-border-color;
210220
// Tooltips
211221
// Popovers
212222
// Toasts

0 commit comments

Comments
 (0)