Skip to content

Commit

Permalink
Merge branch 'main' into patch-1
Browse files Browse the repository at this point in the history
  • Loading branch information
KODerFunk committed Jul 3, 2023
2 parents 29ea88c + 1ab75c8 commit 82267ab
Show file tree
Hide file tree
Showing 13 changed files with 348 additions and 240 deletions.
2 changes: 2 additions & 0 deletions hugo.yml
Expand Up @@ -8,6 +8,8 @@ security:
getenv:
- ^HUGO_
- NETLIFY
gotemplates:
allowActionJSTmpl: true

markup:
goldmark:
Expand Down
526 changes: 321 additions & 205 deletions package-lock.json

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions package.json
Expand Up @@ -100,15 +100,15 @@
"watch-js-docs": "nodemon --watch site/assets/js/ --ext js --exec \"npm run js-lint\""
},
"peerDependencies": {
"@popperjs/core": "^2.11.7"
"@popperjs/core": "^2.11.8"
},
"devDependencies": {
"@babel/cli": "^7.22.5",
"@babel/core": "^7.22.5",
"@babel/preset-env": "^7.22.5",
"@popperjs/core": "^2.11.8",
"@rollup/plugin-babel": "^6.0.3",
"@rollup/plugin-commonjs": "^25.0.0",
"@rollup/plugin-commonjs": "^25.0.2",
"@rollup/plugin-node-resolve": "^15.1.0",
"@rollup/plugin-replace": "^5.0.2",
"autoprefixer": "^10.4.14",
Expand All @@ -124,7 +124,7 @@
"find-unused-sass-variables": "^5.0.0",
"globby": "^11.1.0",
"hammer-simulator": "0.0.1",
"hugo-bin": "^0.108.0",
"hugo-bin": "^0.110.1",
"ip": "^2.0.0",
"jasmine": "^4.6.0",
"jquery": "^3.7.0",
Expand All @@ -142,13 +142,13 @@
"npm-run-all2": "^6.0.5",
"postcss": "^8.4.24",
"postcss-cli": "^10.1.0",
"rollup": "^3.25.1",
"rollup": "^3.25.3",
"rollup-plugin-istanbul": "^4.0.0",
"rtlcss": "^4.1.0",
"sass": "^1.62.1",
"sass": "^1.63.6",
"sass-true": "^7.0.0",
"shelljs": "^0.8.5",
"stylelint": "^15.8.0",
"stylelint": "^15.9.0",
"stylelint-config-twbs-bootstrap": "^10.0.0",
"terser": "^5.18.1",
"vnu-jar": "23.4.11"
Expand Down Expand Up @@ -178,7 +178,7 @@
},
"dependencies": {},
"peerDependencies": {
"@popperjs/core": "^2.11.7"
"@popperjs/core": "^2.11.8"
}
}
}
16 changes: 2 additions & 14 deletions scss/_nav.scss
Expand Up @@ -44,7 +44,8 @@
}

// Disabled state lightens text
&.disabled {
&.disabled,
&:disabled {
color: var(--#{$prefix}nav-link-disabled-color);
pointer-events: none;
cursor: default;
Expand Down Expand Up @@ -79,13 +80,6 @@
isolation: isolate;
border-color: var(--#{$prefix}nav-tabs-link-hover-border-color);
}

&.disabled,
&:disabled {
color: var(--#{$prefix}nav-link-disabled-color);
background-color: transparent;
border-color: transparent;
}
}

.nav-link.active,
Expand Down Expand Up @@ -117,12 +111,6 @@

.nav-link {
@include border-radius(var(--#{$prefix}nav-pills-border-radius));

&:disabled {
color: var(--#{$prefix}nav-link-disabled-color);
background-color: transparent;
border-color: transparent;
}
}

.nav-link.active,
Expand Down
8 changes: 4 additions & 4 deletions scss/_reboot.scss
Expand Up @@ -524,15 +524,15 @@ legend {
height: auto;
}

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

[type="search"] {
outline-offset: -2px; // 1
-webkit-appearance: textfield; // 2
-webkit-appearance: textfield; // 1
outline-offset: -2px; // 2
}

// 1. A few input types should stay LTR
Expand Down
2 changes: 1 addition & 1 deletion scss/_variables-dark.scss
Expand Up @@ -40,7 +40,7 @@ $light-border-subtle-dark: $gray-700 !default;
$dark-border-subtle-dark: $gray-800 !default;
// scss-docs-end theme-border-subtle-dark-variables

$body-color-dark: $gray-500 !default;
$body-color-dark: $gray-300 !default;
$body-bg-dark: $gray-900 !default;
$body-secondary-color-dark: rgba($body-color-dark, .75) !default;
$body-secondary-bg-dark: $gray-800 !default;
Expand Down
2 changes: 1 addition & 1 deletion scss/forms/_form-check.scss
Expand Up @@ -33,13 +33,13 @@
height: $form-check-input-width;
margin-top: ($line-height-base - $form-check-input-width) * .5; // line-height minus check height
vertical-align: top;
appearance: none;
background-color: var(--#{$prefix}form-check-bg);
background-image: var(--#{$prefix}form-check-bg-image);
background-repeat: no-repeat;
background-position: center;
background-size: contain;
border: $form-check-input-border;
appearance: none;
print-color-adjust: exact; // Keep themed appearance for print
@include transition($form-check-transition);

Expand Down
2 changes: 1 addition & 1 deletion scss/forms/_form-control.scss
Expand Up @@ -11,10 +11,10 @@
font-weight: $input-font-weight;
line-height: $input-line-height;
color: $input-color;
appearance: none; // Fix appearance for date inputs in Safari
background-color: $input-bg;
background-clip: padding-box;
border: $input-border-width solid $input-border-color;
appearance: none; // Fix appearance for date inputs in Safari

// Note: This has no effect on <select>s in some browsers, due to the limited stylability of `<select>`s in CSS.
@include border-radius($input-border-radius, 0);
Expand Down
6 changes: 3 additions & 3 deletions scss/forms/_form-range.scss
Expand Up @@ -8,8 +8,8 @@
width: 100%;
height: add($form-range-thumb-height, $form-range-thumb-focus-box-shadow-width * 2);
padding: 0; // Need to reset padding
background-color: transparent;
appearance: none;
background-color: transparent;

&:focus {
outline: 0;
Expand All @@ -28,12 +28,12 @@
width: $form-range-thumb-width;
height: $form-range-thumb-height;
margin-top: ($form-range-track-height - $form-range-thumb-height) * .5; // Webkit specific
appearance: none;
@include gradient-bg($form-range-thumb-bg);
border: $form-range-thumb-border;
@include border-radius($form-range-thumb-border-radius);
@include box-shadow($form-range-thumb-box-shadow);
@include transition($form-range-thumb-transition);
appearance: none;

&:active {
@include gradient-bg($form-range-thumb-active-bg);
Expand All @@ -54,12 +54,12 @@
&::-moz-range-thumb {
width: $form-range-thumb-width;
height: $form-range-thumb-height;
appearance: none;
@include gradient-bg($form-range-thumb-bg);
border: $form-range-thumb-border;
@include border-radius($form-range-thumb-border-radius);
@include box-shadow($form-range-thumb-box-shadow);
@include transition($form-range-thumb-transition);
appearance: none;

&:active {
@include gradient-bg($form-range-thumb-active-bg);
Expand Down
2 changes: 1 addition & 1 deletion scss/forms/_form-select.scss
Expand Up @@ -14,6 +14,7 @@
font-weight: $form-select-font-weight;
line-height: $form-select-line-height;
color: $form-select-color;
appearance: none;
background-color: $form-select-bg;
background-image: var(--#{$prefix}form-select-bg-img), var(--#{$prefix}form-select-bg-icon, none);
background-repeat: no-repeat;
Expand All @@ -23,7 +24,6 @@
@include border-radius($form-select-border-radius, 0);
@include box-shadow($form-select-box-shadow);
@include transition($form-select-transition);
appearance: none;

&:focus {
border-color: $form-select-focus-border-color;
Expand Down
4 changes: 2 additions & 2 deletions site/content/docs/5.3/components/navbar.md
Expand Up @@ -331,7 +331,7 @@ Mix and match with other components and utilities as needed.
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.

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

```html
<nav class="navbar bg-dark border-bottom border-bottom-dark" data-bs-theme="dark">
<nav class="navbar bg-dark border-bottom border-body" data-bs-theme="dark">
<!-- Navbar content -->
</nav>

Expand Down
2 changes: 1 addition & 1 deletion site/content/docs/5.3/components/navs-tabs.md
Expand Up @@ -53,7 +53,7 @@ Change the style of `.nav`s component with modifiers and utilities. Mix and matc

### Horizontal alignment

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.
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.

Centered with `.justify-content-center`:

Expand Down
2 changes: 2 additions & 0 deletions site/content/docs/5.3/utilities/opacity.md
Expand Up @@ -15,13 +15,15 @@ Set the `opacity` of an element using `.opacity-{value}` utilities.
<div class="opacity-75 p-3 m-2 bg-primary text-light fw-bold rounded">75%</div>
<div class="opacity-50 p-3 m-2 bg-primary text-light fw-bold rounded">50%</div>
<div class="opacity-25 p-3 m-2 bg-primary text-light fw-bold rounded">25%</div>
<div class="opacity-0 p-3 m-2 bg-primary text-light fw-bold rounded">0%</div>
</div>

```html
<div class="opacity-100">...</div>
<div class="opacity-75">...</div>
<div class="opacity-50">...</div>
<div class="opacity-25">...</div>
<div class="opacity-0">...</div>
```

## CSS
Expand Down

0 comments on commit 82267ab

Please sign in to comment.