Skip to content

Commit acd8561

Browse files
mrholekmrholek
committed
Merge branch 'v4-next' of https://github.com/coreui/coreui into v4-next
2 parents a40f29c + 5b219d3 commit acd8561

File tree

4 files changed

+26
-50
lines changed

4 files changed

+26
-50
lines changed

‎scss/_root.scss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,9 @@
7777
--#{$prefix}tertiary-bg-rgb: #{to-rgb($body-tertiary-bg)};
7878
// scss-docs-end root-body-variables
7979

80-
--#{$prefix}high-emphasis: #{$high-emphasis};
81-
--#{$prefix}medium-emphasis: #{$medium-emphasis};
82-
--#{$prefix}disabled: #{$disabled};
80+
--#{$prefix}high-emphasis: #{$body-color};
81+
--#{$prefix}medium-emphasis: #{$body-secondary-color};
82+
--#{$prefix}disabled: #{$body-tertiary-color};
8383

8484
--#{$prefix}high-emphasis-inverse: #{$high-emphasis-inverse};
8585
--#{$prefix}medium-emphasis-inverse: #{$medium-emphasis-inverse};

‎scss/_variables-dark.scss

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -238,4 +238,12 @@ $time-picker-indicator-icon-color-dark: $body-tertiary-color-dark !default;
238238
$time-picker-indicator-icon-dark: url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 512 512' role='img'><polygon fill='#{$time-picker-indicator-icon-color-dark}' points='271.514 95.5 239.514 95.5 239.514 273.611 355.127 328.559 368.864 299.657 271.514 253.389 271.514 95.5'></polygon><path fill='#{$time-picker-indicator-icon-color-dark}' d='M256,16C123.452,16,16,123.452,16,256S123.452,496,256,496,496,388.548,496,256,388.548,16,256,16Zm0,448C141.125,464,48,370.875,48,256S141.125,48,256,48s208,93.125,208,208S370.875,464,256,464Z'></path></svg>") !default;
239239
$time-picker-indicator-invalid-icon-dark: url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 512 512' role='img'><polygon fill='#{$form-invalid-color-dark}' points='271.514 95.5 239.514 95.5 239.514 273.611 355.127 328.559 368.864 299.657 271.514 253.389 271.514 95.5'></polygon><path fill='#{$form-invalid-color-dark}' d='M256,16C123.452,16,16,123.452,16,256S123.452,496,256,496,496,388.548,496,256,388.548,16,256,16Zm0,448C141.125,464,48,370.875,48,256S141.125,48,256,48s208,93.125,208,208S370.875,464,256,464Z'></path></svg>") !default;
240240
$time-picker-indicator-valid-icon-dark: url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 512 512' role='img'><polygon fill='#{$form-valid-color-dark}' points='271.514 95.5 239.514 95.5 239.514 273.611 355.127 328.559 368.864 299.657 271.514 253.389 271.514 95.5'></polygon><path fill='#{$form-valid-color-dark}' d='M256,16C123.452,16,16,123.452,16,256S123.452,496,256,496,496,388.548,496,256,388.548,16,256,16Zm0,448C141.125,464,48,370.875,48,256S141.125,48,256,48s208,93.125,208,208S370.875,464,256,464Z'></path></svg>") !default;
241+
242+
//
243+
// Sidebar
244+
//
245+
246+
$sidebar-bg-dark: $body-bg-dark !default;
247+
$sidebar-border-width-dark: var(--#{$prefix}border-width) !default;
248+
$sidebar-border-color-dark: var(--#{$prefix}border-color) !default;
241249
// scss-docs-end sass-dark-mode-vars

‎scss/_variables.scss

Lines changed: 5 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
// scss-docs-start gray-color-variables
99
$white: #fff !default;
10-
$gray-base: #101318 !default;
10+
$gray-base: #323a49 !default;
1111
$gray-100: #f3f4f7 !default;
1212
$gray-200: #e7eaee !default;
1313
$gray-300: #dbdfe6 !default;
@@ -306,48 +306,6 @@ $cyans: (
306306
) !default;
307307
// fusv-enable
308308

309-
// // fusv-disable
310-
// $primary-darker: #1f1498 !default;
311-
// $primary-base: #321fdb !default;
312-
// $primary-50: #988fed !default;
313-
// $primary-25: #ccc7f6 !default;
314-
315-
// $secondary-darker: #212233 !default;
316-
// $secondary-base: #9da5b1 !default;
317-
// $secondary-50: #9da5b1 !default;
318-
// $secondary-25: #ced2d8 !default;
319-
320-
// $success-darker: #0f5722 !default;
321-
// $success-base: #2eb85c !default;
322-
// $success-50: #96dbad !default;
323-
// $success-25: #cbedd6 !default;
324-
325-
// $info-darker: #184c77 !default;
326-
// $info-base: #39f !default;
327-
// $info-50: #80c6ff !default;
328-
// $info-25: #c0e6ff !default;
329-
330-
// $warning-darker: #764705 !default;
331-
// $warning-base: #f9b115 !default;
332-
// $warning-50: #fcd88a !default;
333-
// $warning-25: #feecc5 !default;
334-
335-
// $danger-darker: #671414 !default;
336-
// $danger-base: #e55353 !default;
337-
// $danger-50: #f2a9a9 !default;
338-
// $danger-25: #f9d4d4 !default;
339-
340-
// $light-darker: $gray-100 !default;
341-
// $light-base: $gray-100 !default;
342-
// $light-50: shift-color($light-base, -70%) !default;
343-
// $light-25: shift-color($light-base, -80%) !default;
344-
345-
// $dark-darker: $gray-900 !default;
346-
// $dark-base: $gray-900 !default;
347-
// $dark-50: shift-color($dark-base, -70%) !default;
348-
// $dark-25: shift-color($dark-base, -80%) !default;
349-
// // fusv-enable
350-
351309
// scss-docs-start theme-color-variables
352310
$primary: #321fdb !default;
353311
$secondary: #9da5b1 !default;
@@ -2036,9 +1994,9 @@ $subheader-nav-link-padding-x: .5rem !default;
20361994
// Default theme //TODO: check
20371995
// scss-docs-start subheader-default-themes
20381996
$subheader-bg: $white !default;
2039-
$subheader-color: $medium-emphasis !default;
2040-
$subheader-hover-color: $high-emphasis !default;
2041-
$subheader-active-color: $high-emphasis !default;
1997+
$subheader-color: var(--#{$prefix}secondary-color) !default;
1998+
$subheader-hover-color: var(--#{$prefix}body-color) !default;
1999+
$subheader-active-color: var(--#{$prefix}body-color) !default;
20422000
$subheader-disabled-color: $disabled !default;
20432001
// scss-docs-end subheader-default-themes
20442002

@@ -2207,7 +2165,7 @@ $sidebar-toggler-transition: transform .15s !default;
22072165

22082166
$sidebar-toggler-indicator-width: 4rem !default;
22092167
$sidebar-toggler-indicator-height: 3rem !default;
2210-
$sidebar-toggler-indicator-color: $gray-600 !default;
2168+
$sidebar-toggler-indicator-color: $disabled-inverse !default;
22112169
$sidebar-toggler-indicator-icon: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 11 14'%3E%3Cpath fill='#{$sidebar-toggler-indicator-color}' d='M9.148 2.352l-4.148 4.148 4.148 4.148q0.148 0.148 0.148 0.352t-0.148 0.352l-1.297 1.297q-0.148 0.148-0.352 0.148t-0.352-0.148l-5.797-5.797q-0.148-0.148-0.148-0.352t0.148-0.352l5.797-5.797q0.148-0.148 0.352-0.148t0.352 0.148l1.297 1.297q0.148 0.148 0.148 0.352t-0.148 0.352z'/%3E%3C/svg%3E") !default;
22122170
$sidebar-toggler-hover-bg: rgba(0, 0, 0, .3) !default;
22132171

‎scss/sidebar/_sidebar.scss

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -358,3 +358,13 @@
358358
--#{$prefix}sidebar-toggler-indicator: #{$sidebar-light-toggler-indicator-icon};
359359
--#{$prefix}sidebar-toggler-indicator-hover: #{$sidebar-light-toggler-indicator-hover-icon};
360360
}
361+
362+
@if $enable-dark-mode {
363+
@include color-mode(dark) {
364+
.sidebar {
365+
--#{$prefix}sidebar-bg: #{$sidebar-bg-dark};
366+
--#{$prefix}sidebar-border-width: #{$sidebar-border-width-dark};
367+
--#{$prefix}sidebar-border-color: #{$sidebar-border-color-dark};
368+
}
369+
}
370+
}

0 commit comments

Comments
 (0)