Skip to content

Commit a323305

Browse files
JugglerXJugglerX
committed
update to bootstrap 5.3.2
1 parent 03b84d4 commit a323305

File tree

134 files changed

+7572
-4723
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

134 files changed

+7572
-4723
lines changed

‎Gemfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
source "https://rubygems.org"
22

33
gem "webrick", "~> 1.7"
4-
gem "jekyll", "~> 4.2"
4+
gem "jekyll", "~> 4.3"
55
gem "jekyll-environment-variables"

‎_sass/bootstrap/_accordion.scss‎

Lines changed: 158 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,158 @@
1+
//
2+
// Base styles
3+
//
4+
5+
.accordion {
6+
// scss-docs-start accordion-css-vars
7+
--#{$prefix}accordion-color: #{$accordion-color};
8+
--#{$prefix}accordion-bg: #{$accordion-bg};
9+
--#{$prefix}accordion-transition: #{$accordion-transition};
10+
--#{$prefix}accordion-border-color: #{$accordion-border-color};
11+
--#{$prefix}accordion-border-width: #{$accordion-border-width};
12+
--#{$prefix}accordion-border-radius: #{$accordion-border-radius};
13+
--#{$prefix}accordion-inner-border-radius: #{$accordion-inner-border-radius};
14+
--#{$prefix}accordion-btn-padding-x: #{$accordion-button-padding-x};
15+
--#{$prefix}accordion-btn-padding-y: #{$accordion-button-padding-y};
16+
--#{$prefix}accordion-btn-color: #{$accordion-button-color};
17+
--#{$prefix}accordion-btn-bg: #{$accordion-button-bg};
18+
--#{$prefix}accordion-btn-icon: #{escape-svg($accordion-button-icon)};
19+
--#{$prefix}accordion-btn-icon-width: #{$accordion-icon-width};
20+
--#{$prefix}accordion-btn-icon-transform: #{$accordion-icon-transform};
21+
--#{$prefix}accordion-btn-icon-transition: #{$accordion-icon-transition};
22+
--#{$prefix}accordion-btn-active-icon: #{escape-svg($accordion-button-active-icon)};
23+
--#{$prefix}accordion-btn-focus-border-color: #{$accordion-button-focus-border-color};
24+
--#{$prefix}accordion-btn-focus-box-shadow: #{$accordion-button-focus-box-shadow};
25+
--#{$prefix}accordion-body-padding-x: #{$accordion-body-padding-x};
26+
--#{$prefix}accordion-body-padding-y: #{$accordion-body-padding-y};
27+
--#{$prefix}accordion-active-color: #{$accordion-button-active-color};
28+
--#{$prefix}accordion-active-bg: #{$accordion-button-active-bg};
29+
// scss-docs-end accordion-css-vars
30+
}
31+
32+
.accordion-button {
33+
position: relative;
34+
display: flex;
35+
align-items: center;
36+
width: 100%;
37+
padding: var(--#{$prefix}accordion-btn-padding-y) var(--#{$prefix}accordion-btn-padding-x);
38+
@include font-size($font-size-base);
39+
color: var(--#{$prefix}accordion-btn-color);
40+
text-align: left; // Reset button style
41+
background-color: var(--#{$prefix}accordion-btn-bg);
42+
border: 0;
43+
@include border-radius(0);
44+
overflow-anchor: none;
45+
@include transition(var(--#{$prefix}accordion-transition));
46+
47+
&:not(.collapsed) {
48+
color: var(--#{$prefix}accordion-active-color);
49+
background-color: var(--#{$prefix}accordion-active-bg);
50+
box-shadow: inset 0 calc(-1 * var(--#{$prefix}accordion-border-width)) 0 var(--#{$prefix}accordion-border-color); // stylelint-disable-line function-disallowed-list
51+
52+
&::after {
53+
background-image: var(--#{$prefix}accordion-btn-active-icon);
54+
transform: var(--#{$prefix}accordion-btn-icon-transform);
55+
}
56+
}
57+
58+
// Accordion icon
59+
&::after {
60+
flex-shrink: 0;
61+
width: var(--#{$prefix}accordion-btn-icon-width);
62+
height: var(--#{$prefix}accordion-btn-icon-width);
63+
margin-left: auto;
64+
content: "";
65+
background-image: var(--#{$prefix}accordion-btn-icon);
66+
background-repeat: no-repeat;
67+
background-size: var(--#{$prefix}accordion-btn-icon-width);
68+
@include transition(var(--#{$prefix}accordion-btn-icon-transition));
69+
}
70+
71+
&:hover {
72+
z-index: 2;
73+
}
74+
75+
&:focus {
76+
z-index: 3;
77+
border-color: var(--#{$prefix}accordion-btn-focus-border-color);
78+
outline: 0;
79+
box-shadow: var(--#{$prefix}accordion-btn-focus-box-shadow);
80+
}
81+
}
82+
83+
.accordion-header {
84+
margin-bottom: 0;
85+
}
86+
87+
.accordion-item {
88+
color: var(--#{$prefix}accordion-color);
89+
background-color: var(--#{$prefix}accordion-bg);
90+
border: var(--#{$prefix}accordion-border-width) solid var(--#{$prefix}accordion-border-color);
91+
92+
&:first-of-type {
93+
@include border-top-radius(var(--#{$prefix}accordion-border-radius));
94+
95+
.accordion-button {
96+
@include border-top-radius(var(--#{$prefix}accordion-inner-border-radius));
97+
}
98+
}
99+
100+
&:not(:first-of-type) {
101+
border-top: 0;
102+
}
103+
104+
// Only set a border-radius on the last item if the accordion is collapsed
105+
&:last-of-type {
106+
@include border-bottom-radius(var(--#{$prefix}accordion-border-radius));
107+
108+
.accordion-button {
109+
&.collapsed {
110+
@include border-bottom-radius(var(--#{$prefix}accordion-inner-border-radius));
111+
}
112+
}
113+
114+
.accordion-collapse {
115+
@include border-bottom-radius(var(--#{$prefix}accordion-border-radius));
116+
}
117+
}
118+
}
119+
120+
.accordion-body {
121+
padding: var(--#{$prefix}accordion-body-padding-y) var(--#{$prefix}accordion-body-padding-x);
122+
}
123+
124+
125+
// Flush accordion items
126+
//
127+
// Remove borders and border-radius to keep accordion items edge-to-edge.
128+
129+
.accordion-flush {
130+
.accordion-collapse {
131+
border-width: 0;
132+
}
133+
134+
.accordion-item {
135+
border-right: 0;
136+
border-left: 0;
137+
@include border-radius(0);
138+
139+
&:first-child { border-top: 0; }
140+
&:last-child { border-bottom: 0; }
141+
142+
.accordion-button {
143+
&,
144+
&.collapsed {
145+
@include border-radius(0);
146+
}
147+
}
148+
}
149+
}
150+
151+
@if $enable-dark-mode {
152+
@include color-mode(dark) {
153+
.accordion-button::after {
154+
--#{$prefix}accordion-btn-icon: #{escape-svg($accordion-button-icon-dark)};
155+
--#{$prefix}accordion-btn-active-icon: #{escape-svg($accordion-button-active-icon-dark)};
156+
}
157+
}
158+
}

‎_sass/bootstrap/_alert.scss‎

Lines changed: 32 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,25 @@
33
//
44

55
.alert {
6+
// scss-docs-start alert-css-vars
7+
--#{$prefix}alert-bg: transparent;
8+
--#{$prefix}alert-padding-x: #{$alert-padding-x};
9+
--#{$prefix}alert-padding-y: #{$alert-padding-y};
10+
--#{$prefix}alert-margin-bottom: #{$alert-margin-bottom};
11+
--#{$prefix}alert-color: inherit;
12+
--#{$prefix}alert-border-color: transparent;
13+
--#{$prefix}alert-border: #{$alert-border-width} solid var(--#{$prefix}alert-border-color);
14+
--#{$prefix}alert-border-radius: #{$alert-border-radius};
15+
--#{$prefix}alert-link-color: inherit;
16+
// scss-docs-end alert-css-vars
17+
618
position: relative;
7-
padding: $alert-padding-y $alert-padding-x;
8-
margin-bottom: $alert-margin-bottom;
9-
border: $alert-border-width solid transparent;
10-
@include border-radius($alert-border-radius);
19+
padding: var(--#{$prefix}alert-padding-y) var(--#{$prefix}alert-padding-x);
20+
margin-bottom: var(--#{$prefix}alert-margin-bottom);
21+
color: var(--#{$prefix}alert-color);
22+
background-color: var(--#{$prefix}alert-bg);
23+
border: var(--#{$prefix}alert-border);
24+
@include border-radius(var(--#{$prefix}alert-border-radius));
1125
}
1226

1327
// Headings for larger alerts
@@ -19,6 +33,7 @@
1933
// Provide class for links that match alerts
2034
.alert-link {
2135
font-weight: $alert-link-font-weight;
36+
color: var(--#{$prefix}alert-link-color);
2237
}
2338

2439

@@ -27,26 +42,27 @@
2742
// Expand the right padding and account for the close button's positioning.
2843

2944
.alert-dismissible {
30-
padding-right: $close-font-size + $alert-padding-x * 2;
45+
padding-right: $alert-dismissible-padding-r;
3146

3247
// Adjust close link position
33-
.close {
48+
.btn-close {
3449
position: absolute;
3550
top: 0;
3651
right: 0;
37-
z-index: 2;
38-
padding: $alert-padding-y $alert-padding-x;
39-
color: inherit;
52+
z-index: $stretched-link-z-index + 1;
53+
padding: $alert-padding-y * 1.25 $alert-padding-x;
4054
}
4155
}
4256

4357

44-
// Alternate styles
45-
//
46-
// Generate contextual modifier classes for colorizing the alert.
47-
48-
@each $color, $value in $theme-colors {
49-
.alert-#{$color} {
50-
@include alert-variant(theme-color-level($color, $alert-bg-level), theme-color-level($color, $alert-border-level), theme-color-level($color, $alert-color-level));
58+
// scss-docs-start alert-modifiers
59+
// Generate contextual modifier classes for colorizing the alert
60+
@each $state in map-keys($theme-colors) {
61+
.alert-#{$state} {
62+
--#{$prefix}alert-color: var(--#{$prefix}#{$state}-text-emphasis);
63+
--#{$prefix}alert-bg: var(--#{$prefix}#{$state}-bg-subtle);
64+
--#{$prefix}alert-border-color: var(--#{$prefix}#{$state}-border-subtle);
65+
--#{$prefix}alert-link-color: var(--#{$prefix}#{$state}-text-emphasis);
5166
}
5267
}
68+
// scss-docs-end alert-modifiers

‎_sass/bootstrap/_badge.scss‎

Lines changed: 15 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,26 @@
44
// `background-color`.
55

66
.badge {
7+
// scss-docs-start badge-css-vars
8+
--#{$prefix}badge-padding-x: #{$badge-padding-x};
9+
--#{$prefix}badge-padding-y: #{$badge-padding-y};
10+
@include rfs($badge-font-size, --#{$prefix}badge-font-size);
11+
--#{$prefix}badge-font-weight: #{$badge-font-weight};
12+
--#{$prefix}badge-color: #{$badge-color};
13+
--#{$prefix}badge-border-radius: #{$badge-border-radius};
14+
// scss-docs-end badge-css-vars
15+
716
display: inline-block;
8-
padding: $badge-padding-y $badge-padding-x;
9-
@include font-size($badge-font-size);
10-
font-weight: $badge-font-weight;
17+
padding: var(--#{$prefix}badge-padding-y) var(--#{$prefix}badge-padding-x);
18+
@include font-size(var(--#{$prefix}badge-font-size));
19+
font-weight: var(--#{$prefix}badge-font-weight);
1120
line-height: 1;
21+
color: var(--#{$prefix}badge-color);
1222
text-align: center;
1323
white-space: nowrap;
1424
vertical-align: baseline;
15-
@include border-radius($badge-border-radius);
16-
@include transition($badge-transition);
17-
18-
@at-root a#{&} {
19-
@include hover-focus() {
20-
text-decoration: none;
21-
}
22-
}
25+
@include border-radius(var(--#{$prefix}badge-border-radius));
26+
@include gradient-bg();
2327

2428
// Empty badges collapse automatically
2529
&:empty {
@@ -32,23 +36,3 @@
3236
position: relative;
3337
top: -1px;
3438
}
35-
36-
// Pill badges
37-
//
38-
// Make them extra rounded with a modifier to replace v3's badges.
39-
40-
.badge-pill {
41-
padding-right: $badge-pill-padding-x;
42-
padding-left: $badge-pill-padding-x;
43-
@include border-radius($badge-pill-border-radius);
44-
}
45-
46-
// Colors
47-
//
48-
// Contextual variations (linked badges get darker on :hover).
49-
50-
@each $color, $value in $theme-colors {
51-
.badge-#{$color} {
52-
@include badge-variant($value);
53-
}
54-
}

‎_sass/bootstrap/_breadcrumb.scss‎

Lines changed: 22 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,40 @@
11
.breadcrumb {
2+
// scss-docs-start breadcrumb-css-vars
3+
--#{$prefix}breadcrumb-padding-x: #{$breadcrumb-padding-x};
4+
--#{$prefix}breadcrumb-padding-y: #{$breadcrumb-padding-y};
5+
--#{$prefix}breadcrumb-margin-bottom: #{$breadcrumb-margin-bottom};
6+
@include rfs($breadcrumb-font-size, --#{$prefix}breadcrumb-font-size);
7+
--#{$prefix}breadcrumb-bg: #{$breadcrumb-bg};
8+
--#{$prefix}breadcrumb-border-radius: #{$breadcrumb-border-radius};
9+
--#{$prefix}breadcrumb-divider-color: #{$breadcrumb-divider-color};
10+
--#{$prefix}breadcrumb-item-padding-x: #{$breadcrumb-item-padding-x};
11+
--#{$prefix}breadcrumb-item-active-color: #{$breadcrumb-active-color};
12+
// scss-docs-end breadcrumb-css-vars
13+
214
display: flex;
315
flex-wrap: wrap;
4-
padding: $breadcrumb-padding-y $breadcrumb-padding-x;
5-
margin-bottom: $breadcrumb-margin-bottom;
6-
@include font-size($breadcrumb-font-size);
16+
padding: var(--#{$prefix}breadcrumb-padding-y) var(--#{$prefix}breadcrumb-padding-x);
17+
margin-bottom: var(--#{$prefix}breadcrumb-margin-bottom);
18+
@include font-size(var(--#{$prefix}breadcrumb-font-size));
719
list-style: none;
8-
background-color: $breadcrumb-bg;
9-
@include border-radius($breadcrumb-border-radius);
20+
background-color: var(--#{$prefix}breadcrumb-bg);
21+
@include border-radius(var(--#{$prefix}breadcrumb-border-radius));
1022
}
1123

1224
.breadcrumb-item {
1325
// The separator between breadcrumbs (by default, a forward-slash: "/")
1426
+ .breadcrumb-item {
15-
padding-left: $breadcrumb-item-padding;
27+
padding-left: var(--#{$prefix}breadcrumb-item-padding-x);
1628

1729
&::before {
1830
float: left; // Suppress inline spacings and underlining of the separator
19-
padding-right: $breadcrumb-item-padding;
20-
color: $breadcrumb-divider-color;
21-
content: escape-svg($breadcrumb-divider);
31+
padding-right: var(--#{$prefix}breadcrumb-item-padding-x);
32+
color: var(--#{$prefix}breadcrumb-divider-color);
33+
content: var(--#{$prefix}breadcrumb-divider, escape-svg($breadcrumb-divider)) #{"/* rtl:"} var(--#{$prefix}breadcrumb-divider, escape-svg($breadcrumb-divider-flipped)) #{"*/"};
2234
}
2335
}
2436

25-
// IE9-11 hack to properly handle hyperlink underlines for breadcrumbs built
26-
// without `<ul>`s. The `::before` pseudo-element generates an element
27-
// *within* the .breadcrumb-item and thereby inherits the `text-decoration`.
28-
//
29-
// To trick IE into suppressing the underline, we give the pseudo-element an
30-
// underline and then immediately remove it.
31-
+ .breadcrumb-item:hover::before {
32-
text-decoration: underline;
33-
}
34-
// stylelint-disable-next-line no-duplicate-selectors
35-
+ .breadcrumb-item:hover::before {
36-
text-decoration: none;
37-
}
38-
3937
&.active {
40-
color: $breadcrumb-active-color;
38+
color: var(--#{$prefix}breadcrumb-item-active-color);
4139
}
4240
}

0 commit comments

Comments
 (0)