Skip to content

Commit 82267ab

Browse files
authored
Merge branch 'main' into patch-1
2 parents 29ea88c + 1ab75c8 commit 82267ab

File tree

13 files changed

+348
-240
lines changed

13 files changed

+348
-240
lines changed

hugo.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ security:
88
getenv:
99
- ^HUGO_
1010
- NETLIFY
11+
gotemplates:
12+
allowActionJSTmpl: true
1113

1214
markup:
1315
goldmark:

package-lock.json

Lines changed: 321 additions & 205 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -100,15 +100,15 @@
100100
"watch-js-docs": "nodemon --watch site/assets/js/ --ext js --exec \"npm run js-lint\""
101101
},
102102
"peerDependencies": {
103-
"@popperjs/core": "^2.11.7"
103+
"@popperjs/core": "^2.11.8"
104104
},
105105
"devDependencies": {
106106
"@babel/cli": "^7.22.5",
107107
"@babel/core": "^7.22.5",
108108
"@babel/preset-env": "^7.22.5",
109109
"@popperjs/core": "^2.11.8",
110110
"@rollup/plugin-babel": "^6.0.3",
111-
"@rollup/plugin-commonjs": "^25.0.0",
111+
"@rollup/plugin-commonjs": "^25.0.2",
112112
"@rollup/plugin-node-resolve": "^15.1.0",
113113
"@rollup/plugin-replace": "^5.0.2",
114114
"autoprefixer": "^10.4.14",
@@ -124,7 +124,7 @@
124124
"find-unused-sass-variables": "^5.0.0",
125125
"globby": "^11.1.0",
126126
"hammer-simulator": "0.0.1",
127-
"hugo-bin": "^0.108.0",
127+
"hugo-bin": "^0.110.1",
128128
"ip": "^2.0.0",
129129
"jasmine": "^4.6.0",
130130
"jquery": "^3.7.0",
@@ -142,13 +142,13 @@
142142
"npm-run-all2": "^6.0.5",
143143
"postcss": "^8.4.24",
144144
"postcss-cli": "^10.1.0",
145-
"rollup": "^3.25.1",
145+
"rollup": "^3.25.3",
146146
"rollup-plugin-istanbul": "^4.0.0",
147147
"rtlcss": "^4.1.0",
148-
"sass": "^1.62.1",
148+
"sass": "^1.63.6",
149149
"sass-true": "^7.0.0",
150150
"shelljs": "^0.8.5",
151-
"stylelint": "^15.8.0",
151+
"stylelint": "^15.9.0",
152152
"stylelint-config-twbs-bootstrap": "^10.0.0",
153153
"terser": "^5.18.1",
154154
"vnu-jar": "23.4.11"
@@ -178,7 +178,7 @@
178178
},
179179
"dependencies": {},
180180
"peerDependencies": {
181-
"@popperjs/core": "^2.11.7"
181+
"@popperjs/core": "^2.11.8"
182182
}
183183
}
184184
}

scss/_nav.scss

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@
4444
}
4545

4646
// Disabled state lightens text
47-
&.disabled {
47+
&.disabled,
48+
&:disabled {
4849
color: var(--#{$prefix}nav-link-disabled-color);
4950
pointer-events: none;
5051
cursor: default;
@@ -79,13 +80,6 @@
7980
isolation: isolate;
8081
border-color: var(--#{$prefix}nav-tabs-link-hover-border-color);
8182
}
82-
83-
&.disabled,
84-
&:disabled {
85-
color: var(--#{$prefix}nav-link-disabled-color);
86-
background-color: transparent;
87-
border-color: transparent;
88-
}
8983
}
9084

9185
.nav-link.active,
@@ -117,12 +111,6 @@
117111

118112
.nav-link {
119113
@include border-radius(var(--#{$prefix}nav-pills-border-radius));
120-
121-
&:disabled {
122-
color: var(--#{$prefix}nav-link-disabled-color);
123-
background-color: transparent;
124-
border-color: transparent;
125-
}
126114
}
127115

128116
.nav-link.active,

scss/_reboot.scss

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -524,15 +524,15 @@ legend {
524524
height: auto;
525525
}
526526

527-
// 1. Correct the outline style in Safari.
528-
// 2. This overrides the extra rounded corners on search inputs in iOS so that our
527+
// 1. This overrides the extra rounded corners on search inputs in iOS so that our
529528
// `.form-control` class can properly style them. Note that this cannot simply
530529
// be added to `.form-control` as it's not specific enough. For details, see
531530
// https://github.com/twbs/bootstrap/issues/11586.
531+
// 2. Correct the outline style in Safari.
532532

533533
[type="search"] {
534-
outline-offset: -2px; // 1
535-
-webkit-appearance: textfield; // 2
534+
-webkit-appearance: textfield; // 1
535+
outline-offset: -2px; // 2
536536
}
537537

538538
// 1. A few input types should stay LTR

scss/_variables-dark.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ $light-border-subtle-dark: $gray-700 !default;
4040
$dark-border-subtle-dark: $gray-800 !default;
4141
// scss-docs-end theme-border-subtle-dark-variables
4242

43-
$body-color-dark: $gray-500 !default;
43+
$body-color-dark: $gray-300 !default;
4444
$body-bg-dark: $gray-900 !default;
4545
$body-secondary-color-dark: rgba($body-color-dark, .75) !default;
4646
$body-secondary-bg-dark: $gray-800 !default;

scss/forms/_form-check.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,13 @@
3333
height: $form-check-input-width;
3434
margin-top: ($line-height-base - $form-check-input-width) * .5; // line-height minus check height
3535
vertical-align: top;
36+
appearance: none;
3637
background-color: var(--#{$prefix}form-check-bg);
3738
background-image: var(--#{$prefix}form-check-bg-image);
3839
background-repeat: no-repeat;
3940
background-position: center;
4041
background-size: contain;
4142
border: $form-check-input-border;
42-
appearance: none;
4343
print-color-adjust: exact; // Keep themed appearance for print
4444
@include transition($form-check-transition);
4545

scss/forms/_form-control.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111
font-weight: $input-font-weight;
1212
line-height: $input-line-height;
1313
color: $input-color;
14+
appearance: none; // Fix appearance for date inputs in Safari
1415
background-color: $input-bg;
1516
background-clip: padding-box;
1617
border: $input-border-width solid $input-border-color;
17-
appearance: none; // Fix appearance for date inputs in Safari
1818

1919
// Note: This has no effect on <select>s in some browsers, due to the limited stylability of `<select>`s in CSS.
2020
@include border-radius($input-border-radius, 0);

scss/forms/_form-range.scss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
width: 100%;
99
height: add($form-range-thumb-height, $form-range-thumb-focus-box-shadow-width * 2);
1010
padding: 0; // Need to reset padding
11-
background-color: transparent;
1211
appearance: none;
12+
background-color: transparent;
1313

1414
&:focus {
1515
outline: 0;
@@ -28,12 +28,12 @@
2828
width: $form-range-thumb-width;
2929
height: $form-range-thumb-height;
3030
margin-top: ($form-range-track-height - $form-range-thumb-height) * .5; // Webkit specific
31+
appearance: none;
3132
@include gradient-bg($form-range-thumb-bg);
3233
border: $form-range-thumb-border;
3334
@include border-radius($form-range-thumb-border-radius);
3435
@include box-shadow($form-range-thumb-box-shadow);
3536
@include transition($form-range-thumb-transition);
36-
appearance: none;
3737

3838
&:active {
3939
@include gradient-bg($form-range-thumb-active-bg);
@@ -54,12 +54,12 @@
5454
&::-moz-range-thumb {
5555
width: $form-range-thumb-width;
5656
height: $form-range-thumb-height;
57+
appearance: none;
5758
@include gradient-bg($form-range-thumb-bg);
5859
border: $form-range-thumb-border;
5960
@include border-radius($form-range-thumb-border-radius);
6061
@include box-shadow($form-range-thumb-box-shadow);
6162
@include transition($form-range-thumb-transition);
62-
appearance: none;
6363

6464
&:active {
6565
@include gradient-bg($form-range-thumb-active-bg);

scss/forms/_form-select.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
font-weight: $form-select-font-weight;
1515
line-height: $form-select-line-height;
1616
color: $form-select-color;
17+
appearance: none;
1718
background-color: $form-select-bg;
1819
background-image: var(--#{$prefix}form-select-bg-img), var(--#{$prefix}form-select-bg-icon, none);
1920
background-repeat: no-repeat;
@@ -23,7 +24,6 @@
2324
@include border-radius($form-select-border-radius, 0);
2425
@include box-shadow($form-select-box-shadow);
2526
@include transition($form-select-transition);
26-
appearance: none;
2727

2828
&:focus {
2929
border-color: $form-select-focus-border-color;

site/content/docs/5.3/components/navbar.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ Mix and match with other components and utilities as needed.
331331
Navbar themes are easier than ever thanks to Bootstrap's combination of Sass and CSS variables. The default is our "light navbar" for use with light background colors, but you can also apply `data-bs-theme="dark"` to the `.navbar` parent for dark background colors. Then, customize with `.bg-*` and additional utilities.
332332

333333
<div class="bd-example">
334-
<nav class="navbar navbar-expand-lg bg-dark border-bottom border-bottom-dark" data-bs-theme="dark">
334+
<nav class="navbar navbar-expand-lg bg-dark border-bottom border-body" data-bs-theme="dark">
335335
<div class="container-fluid">
336336
<a class="navbar-brand" href="#">Navbar</a>
337337
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarColor01" aria-controls="navbarColor01" aria-expanded="false" aria-label="Toggle navigation">
@@ -420,7 +420,7 @@ Navbar themes are easier than ever thanks to Bootstrap's combination of Sass and
420420
</div>
421421

422422
```html
423-
<nav class="navbar bg-dark border-bottom border-bottom-dark" data-bs-theme="dark">
423+
<nav class="navbar bg-dark border-bottom border-body" data-bs-theme="dark">
424424
<!-- Navbar content -->
425425
</nav>
426426

site/content/docs/5.3/components/navs-tabs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ Change the style of `.nav`s component with modifiers and utilities. Mix and matc
5353

5454
### Horizontal alignment
5555

56-
Change the horizontal alignment of your nav with [flexbox utilities]({{< docsref "/layout/grid#horizontal-alignment" >}}). By default, navs are left-aligned, but you can easily change them to center or right aligned.
56+
Change the horizontal alignment of your nav with [flexbox utilities]({{< docsref "/utilities/flex#justify-content" >}}). By default, navs are left-aligned, but you can easily change them to center or right-aligned.
5757

5858
Centered with `.justify-content-center`:
5959

site/content/docs/5.3/utilities/opacity.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,15 @@ Set the `opacity` of an element using `.opacity-{value}` utilities.
1515
<div class="opacity-75 p-3 m-2 bg-primary text-light fw-bold rounded">75%</div>
1616
<div class="opacity-50 p-3 m-2 bg-primary text-light fw-bold rounded">50%</div>
1717
<div class="opacity-25 p-3 m-2 bg-primary text-light fw-bold rounded">25%</div>
18+
<div class="opacity-0 p-3 m-2 bg-primary text-light fw-bold rounded">0%</div>
1819
</div>
1920

2021
```html
2122
<div class="opacity-100">...</div>
2223
<div class="opacity-75">...</div>
2324
<div class="opacity-50">...</div>
2425
<div class="opacity-25">...</div>
26+
<div class="opacity-0">...</div>
2527
```
2628

2729
## CSS

0 commit comments

Comments
 (0)