Skip to content

Commit e7f9a42

Browse files
committed
Merge branch 'main' of https://github.com/coreui/coreui
2 parents 8cb07ad + 6f58cfb commit e7f9a42

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

docs/assets/scss/_content.scss

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
@use "sass:color";
12
@use "../../../scss/functions/to-rgb" as *;
23
@use "../../../scss/mixins/breakpoints" as *;
34
@use "../../../scss/vendor/rfs" as *;
@@ -118,8 +119,8 @@
118119
}
119120

120121
.docs-lead {
121-
@include font-size(1.5rem);
122122
font-weight: 300;
123+
@include font-size(1.5rem);
123124
}
124125

125126
.bi {
@@ -155,16 +156,16 @@
155156
--cui-tertiary-bg: #{$blue-600};
156157

157158
.dropdown-menu {
158-
--cui-dropdown-bg: #{mix($blue-500, $blue-600)};
159+
--cui-dropdown-bg: #{color.mix($blue-500, $blue-600)};
159160
--cui-dropdown-link-active-bg: #{$blue-700};
160161
}
161162

162163
.btn-secondary {
163-
--cui-btn-bg: #{mix($gray-600, $blue-400, .5)};
164+
--cui-btn-bg: #{color.mix($gray-600, $blue-400, 50%)};
164165
--cui-btn-border-color: #{rgba($white, .25)};
165-
--cui-btn-hover-bg: #{darken(mix($gray-600, $blue-400, .5), 5%)};
166+
--cui-btn-hover-bg: #{color.scale(color.mix($gray-600, $blue-400, 50%), $lightness: -8%)}; // stylelint-disable-line scss/at-function-named-arguments
166167
--cui-btn-hover-border-color: #{rgba($white, .25)};
167-
--cui-btn-active-bg: #{darken(mix($gray-600, $blue-400, .5), 10%)};
168+
--cui-btn-active-bg: #{color.scale(color.mix($gray-600, $blue-400, 50%), $lightness: -16%)}; // stylelint-disable-line scss/at-function-named-arguments
168169
--cui-btn-active-border-color: #{rgba($white, .5)};
169170
--cui-btn-focus-border-color: #{rgba($white, .5)};
170171
--cui-btn-focus-box-shadow: 0 0 0 .25rem rgba(255, 255, 255, .2);

docs/assets/scss/_syntax.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
@use "sass:color";
12
@use "../../../scss/mixins/color-mode" as *;
23
@use "../../../scss/variables" as *;
34

@@ -11,7 +12,7 @@
1112
--base05: #333;
1213
--base06: #fff;
1314
--base07: #{$teal-700}; // #9a6700
14-
--base08: #{mix($red-500, $red-600, 50%)}; // #bc4c00
15+
--base08: #{color.mix($red-500, $red-600, 50%)}; // #bc4c00
1516
--base09: #{$cyan-700}; // #087990
1617
--base0A: #{$purple-500}; // #795da3
1718
--base0B: #{$blue-700}; // #183691

0 commit comments

Comments
 (0)