Skip to content

Commit 3b311a4

Browse files
committed
Merge branch 'v4-dev' of https://github.com/coreui/coreui into v4-dev-sync-pro
# Conflicts: # scss/_variables.scss
2 parents e0fa3a9 + 007ec95 commit 3b311a4

File tree

2 files changed

+105
-89
lines changed

2 files changed

+105
-89
lines changed

scss/_utilities.scss

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -557,12 +557,12 @@ $utilities: map-merge(
557557
"black-50": rgba($black, .5),
558558
"white-50": rgba($white, .5),
559559
"reset": inherit,
560-
"high-emphasis-light": $high-emphasis-light,
561-
"medium-emphasis-light": $medium-emphasis-light,
562-
"disabled-light": $disabled-light,
563-
"high-emphasis-dark": $high-emphasis-dark,
564-
"medium-emphasis-dark": $medium-emphasis-dark,
565-
"disabled-dark": $disabled-dark
560+
"high-emphasis-inverse": $text-high-emphasis-inverse,
561+
"medium-emphasis-inverse": $text-medium-emphasis-inverse,
562+
"disabled-inverse": $text-disabled-inverse,
563+
"high-emphasis": $text-high-emphasis,
564+
"medium-emphasis": $text-medium-emphasis,
565+
"disabled": $text-disabled
566566
)
567567
),
568568
vars: true

0 commit comments

Comments
 (0)