Skip to content

Commit 6872ad9

Browse files
committed
Merge branch 'v4-dev' of https://github.com/coreui/coreui into v4-dev-sync
2 parents b3b3a70 + ab70296 commit 6872ad9

File tree

5 files changed

+12
-24
lines changed

5 files changed

+12
-24
lines changed

docs/assets/js/application.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@
122122
})
123123

124124
// Insert copy to clipboard button before .highlight
125-
var btnHtml = '<div class="docs-clipboard"><button type="button" class="btn-clipboard btn-ghost-primary" title="Copy to clipboard"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><polygon fill="var(--ci-primary-color, currentColor)" points="408 432 376 432 376 464 112 464 112 136 144 136 144 104 80 104 80 496 408 496 408 432" class="ci-primary"/><path fill="var(--ci-primary-color, currentColor)" d="M176,16V400H496V153.373L358.627,16ZM464,368H208V48H312V200H464Zm0-200H344V48h1.372L464,166.627Z" class="ci-primary"/></svg></button></div>'
125+
var btnHtml = '<div class="docs-clipboard"><button type="button" class="btn-clipboard btn btn-ghost-primary" title="Copy to clipboard"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><polygon fill="var(--ci-primary-color, currentColor)" points="408 432 376 432 376 464 112 464 112 136 144 136 144 104 80 104 80 496 408 496 408 432" class="ci-primary"/><path fill="var(--ci-primary-color, currentColor)" d="M176,16V400H496V153.373L358.627,16ZM464,368H208V48H312V200H464Zm0-200H344V48h1.372L464,166.627Z" class="ci-primary"/></svg></button></div>'
126126
document.querySelectorAll('div.highlight')
127127
.forEach(function (element) {
128128
element.insertAdjacentHTML('beforebegin', btnHtml)

docs/assets/scss/_layout.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
.wrapper {
22
width: 100%;
3-
padding-left: var(--cui-sidebar-occupy, 0);
3+
padding-left: var(--cui-sidebar-occupy-start, 0);
44
transform: translateZ(0);
55
will-change: auto;
66
@include transition(padding .15s);

scss/_functions.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,6 @@ $_luminance-list: .0008 .001 .0011 .0013 .0015 .0017 .002 .0022 .0025 .0027 .003
241241

242242
// scss-docs-start table-color-functions
243243
@function table-color-map($background) {
244-
$table-bg: $background;
245244
$color: color-contrast(opaque($body-bg, $background));
246245
$striped-bg: mix($color, $background, percentage($table-striped-bg-factor));
247246
$active-bg: mix($color, $background, percentage($table-active-bg-factor));

scss/_tables.scss

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
padding: $table-cell-padding-y $table-cell-padding-x;
2929
color: var(--#{$variable-prefix}table-color);
3030
background-color: var(--#{$variable-prefix}table-bg);
31-
border-bottom: $table-border-width;
3231
border-bottom-color: var(--#{$variable-prefix}table-border-color);
32+
border-bottom-width: $table-border-width;
3333
box-shadow: inset 0 0 0 9999px var(--#{$variable-prefix}table-accent-bg);
3434
}
3535

@@ -144,17 +144,6 @@
144144
}
145145
}
146146

147-
@each $state, $map in $alert-variants {
148-
$background: map-get($map, "background");
149-
$border-color: map-get($map, "border-color");
150-
$color: contrast-ratio-correction(map-get($map, "color"), map-get($map, "background"), abs($alert-color-scale), $state);
151-
$link-color: map-get($map, "link-color");
152-
153-
.alert-#{$state} {
154-
@include alert-variant($background, $border-color, $color, $link-color);
155-
}
156-
}
157-
158147
// @each $state, $map in $list-group-variants {
159148

160149
// }

scss/mixins/_table-variants.scss

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
// scss-docs-start table-variant
22
@mixin table-variant($map) {
3-
--#{$variable-prefix}table-bg: #{map-get($map, "table-bg")};
4-
--#{$variable-prefix}table-color: #{map-get($map, "table-color")};
5-
--#{$variable-prefix}table-border-color: #{map-get($map, "table-border-color")};
6-
--#{$variable-prefix}table-striped-bg: #{map-get($map, "table-striped-bg")};
7-
--#{$variable-prefix}table-striped-color: #{map-get($map, "table-striped-color")};
8-
--#{$variable-prefix}table-active-bg: #{map-get($map, "table-active-bg")};
9-
--#{$variable-prefix}table-active-color: #{map-get($map, "table-active-color")};
10-
--#{$variable-prefix}table-hover-bg: #{map-get($map, "table-hover-bg")};
11-
--#{$variable-prefix}table-hover-color: #{map-get($map, "table-hover-color")};
3+
--#{$variable-prefix}table-bg: #{map-get($map, "bg")};
4+
--#{$variable-prefix}table-color: #{map-get($map, "color")};
5+
--#{$variable-prefix}table-border-color: #{map-get($map, "border-color")};
6+
--#{$variable-prefix}table-striped-bg: #{map-get($map, "striped-bg")};
7+
--#{$variable-prefix}table-striped-color: #{map-get($map, "striped-color")};
8+
--#{$variable-prefix}table-active-bg: #{map-get($map, "active-bg")};
9+
--#{$variable-prefix}table-active-color: #{map-get($map, "active-color")};
10+
--#{$variable-prefix}table-hover-bg: #{map-get($map, "hover-bg")};
11+
--#{$variable-prefix}table-hover-color: #{map-get($map, "hover-color")};
1212

1313
color: var(--#{$variable-prefix}table-color);
1414
border-color: var(--#{$variable-prefix}table-border-color);

0 commit comments

Comments
 (0)