Skip to content

Commit 1501e81

Browse files
committed
Merge branch 'dev' of https://github.com/coreui/coreui into dev
2 parents 965f3e3 + 77ad0f9 commit 1501e81

21 files changed

+278
-250
lines changed

docs/assets/scss/_ads.scss

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
// stylelint-disable declaration-no-important, selector-max-id
2+
@use "../../../scss/mixins/border-radius" as *;
3+
@use "../../../scss/mixins/breakpoints" as *;
4+
@use "../../../scss/vendor/rfs" as *;
25

36
//
47
// Carbon ads

docs/assets/scss/_anchor.scss

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
@use "../../../scss/mixins/transition" as *;
2+
@use "../../../scss/variables" as *;
3+
14
.anchor-link {
25
padding: 0 .175rem;
36
font-weight: 400;

docs/assets/scss/_buttons.scss

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
@use "../../../scss/functions/color" as *;
2+
@use "variables" as *;
3+
14
// Buttons
25
//
36
// Custom buttons for the docs.

docs/assets/scss/_callouts.scss

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
@use "../../../scss/variables" as *;
2+
@use "variables" as *;
3+
14
//
25
// Callouts
36
//

docs/assets/scss/_clipboard-js.scss

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
@use "../../../scss/mixins/border-radius" as *;
2+
@use "../../../scss/mixins/breakpoints" as *;
3+
14
// clipboard.js
25
//
36
// JS-based `Copy` buttons for code snippets.

docs/assets/scss/_colors.scss

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,14 @@
1+
@use "sass:map";
2+
@use "sass:string";
3+
@use "../../../scss/functions/color-contrast" as *;
4+
@use "../../../scss/functions/color" as *;
5+
@use "../../../scss/variables" as *;
6+
17
//
28
// Docs color palette classes
39
//
410

5-
6-
@each $color, $value in map-merge($colors, ("gray-500": $gray-500)) {
11+
@each $color, $value in map.merge($colors, ("gray-500": $gray-500)) {
712
.swatch-#{$color} {
813
color: color-contrast($value);
914
background-color: #{$value};
@@ -20,9 +25,9 @@
2025
line-height: 1.35;
2126
white-space: pre;
2227
content:
23-
str-slice($contrast-ratio, 1, 4) "\A"
24-
str-slice($against-white, 1, 4) "\A"
25-
str-slice($against-black, 1, 4);
28+
string.slice($contrast-ratio, 1, 4) "\A"
29+
string.slice($against-white, 1, 4) "\A"
30+
string.slice($against-black, 1, 4);
2631
background-color: $value;
2732
background-image:
2833
linear-gradient(

docs/assets/scss/_component-examples.scss

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
@use "../../../scss/mixins/border-radius" as *;
2+
@use "../../../scss/mixins/breakpoints" as *;
3+
@use "../../../scss/mixins/clearfix" as *;
4+
@use "../../../scss/mixins/container" as *;
5+
@use "../../../scss/mixins/grid" as *;
6+
@use "../../../scss/vendor/rfs" as *;
7+
@use "../../../scss/variables" as *;
8+
@use "variables" as *;
9+
110
//
211
// Docs examples
312
//

docs/assets/scss/_content.scss

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
@use "../../../scss/functions/to-rgb" as *;
2+
@use "../../../scss/mixins/breakpoints" as *;
3+
@use "../../../scss/vendor/rfs" as *;
4+
@use "../../../scss/variables" as *;
5+
16
//
27
// CoreUI docs content theming
38
//

docs/assets/scss/_footer.scss

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
@use "../../../scss/vendor/rfs" as *;
2+
@use "../../../scss/variables" as *;
3+
14
//
25
// Footer
36
//

docs/assets/scss/_header.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
@use "../../../scss/variables" as *;
2+
13
.docs-header {
24
--#{$prefix}header-bg: #{var(--cui-body-bg)};
35
}

0 commit comments

Comments
 (0)