Skip to content

Commit 94e238e

Browse files
mrholekmrholek
committed
Merge branch 'main' of https://github.com/coreui/coreui 
2 parents 7ffa9a0 + 2800325 commit 94e238e

File tree

6 files changed

+18
-12
lines changed

6 files changed

+18
-12
lines changed

‎docs/assets/scss/_component-examples.scss

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,6 @@
382382
pre {
383383
padding: .25rem 0 .875rem;
384384
margin-top: .8125rem;
385-
margin-right: 1.875rem;
386385
margin-bottom: 0;
387386
overflow: overlay;
388387
white-space: pre;
@@ -397,6 +396,10 @@
397396
}
398397
}
399398

399+
.docs-example-snippet .highlight pre {
400+
margin-right: 0;
401+
}
402+
400403
.highlight-toolbar {
401404
background-color: var(--cd-pre-bg);
402405

‎docs/assets/scss/_layout.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33
@include ltr-rtl("padding-left", var(--cui-sidebar-occupy-start, 0));
44
will-change: auto;
55
@include transition(padding .15s);
6+
7+
> .container-lg {
8+
--cui-gutter-x: 3rem;
9+
}
610
}
711

812
.docs-layout {

‎scss/_header.scss

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
.header {
22
// scss-docs-start header-css-vars
3-
--#{$prefix}header-min-height: #{$header-min-height};
43
--#{$prefix}header-padding-x: #{$header-padding-x};
54
--#{$prefix}header-padding-y: #{$header-padding-y};
65
--#{$prefix}header-bg: #{$header-bg};
@@ -33,7 +32,6 @@
3332
flex-wrap: wrap; // allow us to do the line break for collapsing content
3433
align-items: center;
3534
justify-content: space-between; // space out brand from logo
36-
// min-height: var(--#{$prefix}header-min-height);
3735
padding: var(--#{$prefix}header-padding-y) var(--#{$prefix}header-padding-x);
3836
background: var(--#{$prefix}header-bg);
3937
border-bottom: var(--#{$prefix}header-border);

‎scss/_variables.scss

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1939,9 +1939,8 @@ $list-group-action-active-bg: var(--#{$prefix}secondary-bg) !default;
19391939
// scss-docs-end list-group-variables
19401940

19411941

1942-
// Header // TODO: check
1942+
// Header
19431943
// scss-docs-start header-variables
1944-
$header-min-height: 4rem !default;
19451944
$header-padding-y: $spacer * .5 !default;
19461945
$header-padding-x: $spacer * .5 !default;
19471946
$header-brand-font-size: $font-size-lg !default;
@@ -2112,7 +2111,7 @@ $sidebar-nav-link-icon-bullet-border-width: 1px !default;
21122111
$sidebar-nav-link-icon-bullet-border-color: var(--#{$prefix}tertiary-color) !default;
21132112
$sidebar-nav-link-icon-bullet-border-radius: 50rem !default;
21142113

2115-
$sidebar-nav-link-hover-color: var(--#{$prefix}emphasis-color) !default;
2114+
$sidebar-nav-link-hover-color: rgba(255, 255, 255, 1) !default;
21162115
$sidebar-nav-link-hover-bg: var(--#{$prefix}tertiary-bg) !default;
21172116
$sidebar-nav-link-hover-icon-color: var(--#{$prefix}body-color) !default;
21182117
$sidebar-nav-link-hover-icon-bullet-bg: transparent !default;
@@ -2152,8 +2151,9 @@ $sidebar-toggler-width: .5rem !default;
21522151
$sidebar-toggler-height: .5rem !default;
21532152
$sidebar-toggler-padding-x: .25rem !default;
21542153
$sidebar-toggler-padding-y: .25rem !default;
2154+
$sidebar-toggler-bg: transparent !default;
21552155
$sidebar-toggler-color: var(--#{$prefix}tertiary-color) !default;
2156-
$sidebar-toggler-bg: url("data:image/svg+xml,%0A%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 512 512'%3E%3Cg xmlns='http://www.w3.org/2000/svg' transform='matrix(-1 0 0 -1 512 512)'%3E%3Cpath fill='%23000' d='M472,16H40A24.028,24.028,0,0,0,16,40V200H48V48H464V464H48V304H16V472a24.028,24.028,0,0,0,24,24H472a24.028,24.028,0,0,0,24-24V40A24.028,24.028,0,0,0,472,16Z'/%3E%3Cpolygon fill='%23000' points='209.377 363.306 232.004 385.933 366.627 251.31 232.004 116.687 209.377 139.313 305.374 235.311 16 235.311 16 267.311 305.372 267.311 209.377 363.306'/%3E%3C/g%3E%3C/svg%3E") !default;
2156+
$sidebar-toggler-icon: url("data:image/svg+xml,%0A%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 512 512'%3E%3Cg xmlns='http://www.w3.org/2000/svg' transform='matrix(-1 0 0 -1 512 512)'%3E%3Cpath fill='%23000' d='M472,16H40A24.028,24.028,0,0,0,16,40V200H48V48H464V464H48V304H16V472a24.028,24.028,0,0,0,24,24H472a24.028,24.028,0,0,0,24-24V40A24.028,24.028,0,0,0,472,16Z'/%3E%3Cpolygon fill='%23000' points='209.377 363.306 232.004 385.933 366.627 251.31 232.004 116.687 209.377 139.313 305.374 235.311 16 235.311 16 267.311 305.372 267.311 209.377 363.306'/%3E%3C/g%3E%3C/svg%3E") !default;
21572157
$sidebar-toggler-focus-shadow: $focus-ring-box-shadow !default;
21582158
$sidebar-toggler-hover-color: var(--#{$prefix}secondary-color) !default;
21592159
$sidebar-toggler-focus-color: var(--#{$prefix}secondary-color) !default;

‎scss/sidebar/_sidebar-nav.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@
5151
--#{$prefix}sidebar-nav-group-border-color: #{$sidebar-nav-group-border-color};
5252
--#{$prefix}sidebar-nav-group-items-padding-y: #{$sidebar-nav-group-items-padding-y};
5353
--#{$prefix}sidebar-nav-group-items-padding-x: #{$sidebar-nav-group-items-padding-x};
54-
--#{$prefix}sidebar-nav-group-indicator-color: #{escape-svg($sidebar-nav-group-indicator-color)};
54+
--#{$prefix}sidebar-nav-group-indicator-color: #{$sidebar-nav-group-indicator-color};
5555
--#{$prefix}sidebar-nav-group-indicator-icon: #{escape-svg($sidebar-nav-group-indicator-icon)};
56-
--#{$prefix}sidebar-nav-group-indicator-hover-color: #{escape-svg($sidebar-nav-group-indicator-hover-color)};
56+
--#{$prefix}sidebar-nav-group-indicator-hover-color: #{$sidebar-nav-group-indicator-hover-color};
5757
--#{$prefix}sidebar-nav-group-indicator-hover-icon: #{escape-svg($sidebar-nav-group-indicator-hover-icon)};
5858
--#{$prefix}sidebar-nav-group-toggle-show-color: #{$sidebar-nav-group-toggle-show-color};
5959
// scss-docs-end sidebar-nav-css-vars

‎scss/sidebar/_sidebar.scss

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -215,8 +215,9 @@
215215
// scss-docs-start sidebar-toggler-css-vars
216216
--#{$prefix}sidebar-toggler-width: #{$sidebar-toggler-width};
217217
--#{$prefix}sidebar-toggler-height: #{$sidebar-toggler-height};
218+
--#{$prefix}sidebar-toggler-bg: #{$sidebar-toggler-bg};
218219
--#{$prefix}sidebar-toggler-color: #{$sidebar-toggler-color};
219-
--#{$prefix}sidebar-toggler-bg: #{escape-svg($sidebar-toggler-bg)};
220+
--#{$prefix}sidebar-toggler-icon: #{escape-svg($sidebar-toggler-icon)};
220221
--#{$prefix}sidebar-toggler-hover-color: #{$sidebar-toggler-hover-color};
221222
--#{$prefix}sidebar-toggler-focus-shadow: #{$sidebar-toggler-focus-shadow};
222223
--#{$prefix}sidebar-toggler-focus-color: #{$sidebar-toggler-focus-color};
@@ -228,7 +229,7 @@
228229
width: var(--#{$prefix}sidebar-toggler-width);
229230
height: var(--#{$prefix}sidebar-toggler-height);
230231
padding: $sidebar-toggler-padding-y $sidebar-toggler-padding-x;
231-
background-color: transparent;
232+
background-color: var(--#{$prefix}sidebar-toggler-bg);
232233
border: 0;
233234
@include border-radius();
234235

@@ -240,7 +241,7 @@
240241
height: 100%;
241242
content: "";
242243
background-color: var(--#{$prefix}sidebar-toggler-color);
243-
mask: var(--#{$prefix}sidebar-toggler-bg) no-repeat center;
244+
mask: var(--#{$prefix}sidebar-toggler-icon) no-repeat center;
244245
@include transition(var(--#{$prefix}sidebar-toggler-transition));
245246
@include rtl() {
246247
transform: rotate(-180deg);

0 commit comments

Comments
 (0)