From c39a17437535023129d20f02f85db2cadafd2d15 Mon Sep 17 00:00:00 2001 From: Rob Date: Tue, 13 Jun 2023 18:32:35 +1000 Subject: [PATCH] update bootstrap 5.3, pr and issue updates --- .hugo_build.lock | 0 README.md | 13 +- assets/scss/_bootstrap-variables.scss | 35 - assets/scss/_variables.scss | 58 + assets/scss/bootstrap/_accordion.scss | 158 ++ assets/scss/bootstrap/_alert.scss | 47 +- assets/scss/bootstrap/_badge.scss | 46 +- assets/scss/bootstrap/_breadcrumb.scss | 48 +- assets/scss/bootstrap/_button-group.scss | 75 +- assets/scss/bootstrap/_buttons.scss | 208 +- assets/scss/bootstrap/_card.scss | 209 +- assets/scss/bootstrap/_carousel.scss | 119 +- assets/scss/bootstrap/_close.scss | 80 +- assets/scss/bootstrap/_code.scss | 48 - assets/scss/bootstrap/_containers.scss | 41 + assets/scss/bootstrap/_custom-forms.scss | 521 ----- assets/scss/bootstrap/_dropdown.scss | 201 +- assets/scss/bootstrap/_forms.scss | 347 +--- assets/scss/bootstrap/_functions.scss | 224 +- assets/scss/bootstrap/_grid.scss | 66 +- assets/scss/bootstrap/_helpers.scss | 12 + assets/scss/bootstrap/_images.scss | 2 +- assets/scss/bootstrap/_input-group.scss | 191 -- assets/scss/bootstrap/_jumbotron.scss | 17 - assets/scss/bootstrap/_list-group.scss | 131 +- assets/scss/bootstrap/_maps.scss | 174 ++ assets/scss/bootstrap/_media.scss | 8 - assets/scss/bootstrap/_mixins.scss | 25 +- assets/scss/bootstrap/_modal.scss | 216 +- assets/scss/bootstrap/_nav.scss | 135 +- assets/scss/bootstrap/_navbar.scss | 305 ++- assets/scss/bootstrap/_offcanvas.scss | 146 ++ assets/scss/bootstrap/_pagination.scss | 110 +- assets/scss/bootstrap/_placeholders.scss | 51 + assets/scss/bootstrap/_popover.scss | 172 +- assets/scss/bootstrap/_print.scss | 141 -- assets/scss/bootstrap/_progress.scss | 50 +- assets/scss/bootstrap/_reboot.scss | 554 +++-- assets/scss/bootstrap/_root.scss | 184 +- assets/scss/bootstrap/_spinners.scss | 74 +- assets/scss/bootstrap/_tables.scss | 216 +- assets/scss/bootstrap/_toasts.scss | 79 +- assets/scss/bootstrap/_tooltip.scss | 130 +- assets/scss/bootstrap/_transitions.scss | 9 +- assets/scss/bootstrap/_type.scss | 99 +- assets/scss/bootstrap/_utilities.scss | 823 +++++++- assets/scss/bootstrap/_variables-dark.scss | 85 + assets/scss/bootstrap/_variables.scss | 1838 +++++++++++------ assets/scss/bootstrap/bootstrap-grid.scss | 73 +- assets/scss/bootstrap/bootstrap-reboot.scss | 12 +- .../scss/bootstrap/bootstrap-utilities.scss | 19 + assets/scss/bootstrap/bootstrap.scss | 34 +- .../bootstrap/forms/_floating-labels.scss | 94 + assets/scss/bootstrap/forms/_form-check.scss | 188 ++ .../scss/bootstrap/forms/_form-control.scss | 214 ++ assets/scss/bootstrap/forms/_form-range.scss | 91 + assets/scss/bootstrap/forms/_form-select.scss | 80 + assets/scss/bootstrap/forms/_form-text.scss | 11 + assets/scss/bootstrap/forms/_input-group.scss | 132 ++ assets/scss/bootstrap/forms/_labels.scss | 36 + assets/scss/bootstrap/forms/_validation.scss | 12 + .../{utilities => helpers}/_clearfix.scss | 0 assets/scss/bootstrap/helpers/_color-bg.scss | 8 + .../bootstrap/helpers/_colored-links.scss | 30 + .../scss/bootstrap/helpers/_focus-ring.scss | 5 + assets/scss/bootstrap/helpers/_icon-link.scss | 25 + assets/scss/bootstrap/helpers/_position.scss | 36 + assets/scss/bootstrap/helpers/_ratio.scss | 26 + assets/scss/bootstrap/helpers/_stacks.scss | 15 + .../bootstrap/helpers/_stretched-link.scss | 15 + .../bootstrap/helpers/_text-truncation.scss | 7 + .../bootstrap/helpers/_visually-hidden.scss | 8 + assets/scss/bootstrap/helpers/_vr.scss | 8 + assets/scss/bootstrap/mixins/_alert.scss | 17 +- assets/scss/bootstrap/mixins/_backdrop.scss | 14 + .../bootstrap/mixins/_background-variant.scss | 22 - assets/scss/bootstrap/mixins/_badge.scss | 17 - assets/scss/bootstrap/mixins/_banner.scss | 7 + .../scss/bootstrap/mixins/_border-radius.scss | 59 +- assets/scss/bootstrap/mixins/_box-shadow.scss | 16 +- .../scss/bootstrap/mixins/_breakpoints.scss | 36 +- assets/scss/bootstrap/mixins/_buttons.scss | 160 +- assets/scss/bootstrap/mixins/_caret.scss | 61 +- assets/scss/bootstrap/mixins/_clearfix.scss | 2 + assets/scss/bootstrap/mixins/_color-mode.scss | 21 + .../scss/bootstrap/mixins/_color-scheme.scss | 7 + assets/scss/bootstrap/mixins/_container.scss | 11 + assets/scss/bootstrap/mixins/_float.scss | 14 - assets/scss/bootstrap/mixins/_forms.scss | 130 +- assets/scss/bootstrap/mixins/_gradients.scss | 24 +- .../bootstrap/mixins/_grid-framework.scss | 71 - assets/scss/bootstrap/mixins/_grid.scss | 158 +- assets/scss/bootstrap/mixins/_hover.scss | 37 - assets/scss/bootstrap/mixins/_image.scss | 22 +- assets/scss/bootstrap/mixins/_list-group.scss | 9 +- assets/scss/bootstrap/mixins/_lists.scss | 2 +- .../scss/bootstrap/mixins/_nav-divider.scss | 11 - assets/scss/bootstrap/mixins/_pagination.scss | 26 +- assets/scss/bootstrap/mixins/_reset-text.scss | 6 +- .../scss/bootstrap/mixins/_screen-reader.scss | 34 - assets/scss/bootstrap/mixins/_size.scss | 7 - assets/scss/bootstrap/mixins/_table-row.scss | 39 - .../bootstrap/mixins/_table-variants.scss | 24 + .../scss/bootstrap/mixins/_text-emphasis.scss | 17 - assets/scss/bootstrap/mixins/_text-hide.scss | 11 - assets/scss/bootstrap/mixins/_transition.scss | 26 +- assets/scss/bootstrap/mixins/_utilities.scss | 97 + assets/scss/bootstrap/mixins/_visibility.scss | 8 - .../bootstrap/mixins/_visually-hidden.scss | 33 + assets/scss/bootstrap/tests/jasmine.js | 16 + .../tests/mixins/_color-modes.test.scss | 69 + .../_media-query-color-mode-full.test.scss | 8 + .../tests/mixins/_utilities.test.scss | 393 ++++ .../bootstrap/tests/sass-true/register.js | 14 + .../scss/bootstrap/tests/sass-true/runner.js | 17 + .../bootstrap/tests/utilities/_api.test.scss | 75 + assets/scss/bootstrap/utilities/_align.scss | 8 - assets/scss/bootstrap/utilities/_api.scss | 47 + .../scss/bootstrap/utilities/_background.scss | 19 - assets/scss/bootstrap/utilities/_borders.scss | 75 - assets/scss/bootstrap/utilities/_display.scss | 26 - assets/scss/bootstrap/utilities/_embed.scss | 39 - assets/scss/bootstrap/utilities/_flex.scss | 51 - assets/scss/bootstrap/utilities/_float.scss | 11 - .../scss/bootstrap/utilities/_overflow.scss | 5 - .../scss/bootstrap/utilities/_position.scss | 32 - .../bootstrap/utilities/_screenreaders.scss | 11 - assets/scss/bootstrap/utilities/_shadows.scss | 6 - assets/scss/bootstrap/utilities/_sizing.scss | 20 - assets/scss/bootstrap/utilities/_spacing.scss | 73 - .../bootstrap/utilities/_stretched-link.scss | 19 - assets/scss/bootstrap/utilities/_text.scss | 72 - .../scss/bootstrap/utilities/_visibility.scss | 13 - assets/scss/bootstrap/vendor/_rfs.scss | 408 ++-- assets/scss/components/_call.scss | 1 - assets/scss/style.scss | 15 +- exampleSite/content/about.md | 2 + exampleSite/content/services/accounting.md | 1 + .../content/services/business-advisory.md | 128 +- .../content/services/business-sales.md | 119 +- exampleSite/content/services/mergers.md | 120 +- .../content/services/superannuation.md | 120 +- .../content/services/tax-preperation.md | 99 +- exampleSite/content/team/_index.md | 8 +- exampleSite/content/team/susan-shelton.md | 10 - ...rtworks-coworking-cW4lLTavU80-unsplash.jpg | Bin layouts/_default/single.html | 3 +- layouts/page/contact.html | 2 +- layouts/services/single.html | 2 +- layouts/services/summary.html | 2 +- 150 files changed, 8109 insertions(+), 5006 deletions(-) create mode 100644 .hugo_build.lock delete mode 100755 assets/scss/_bootstrap-variables.scss create mode 100755 assets/scss/_variables.scss create mode 100644 assets/scss/bootstrap/_accordion.scss delete mode 100644 assets/scss/bootstrap/_code.scss create mode 100644 assets/scss/bootstrap/_containers.scss delete mode 100644 assets/scss/bootstrap/_custom-forms.scss create mode 100644 assets/scss/bootstrap/_helpers.scss delete mode 100644 assets/scss/bootstrap/_input-group.scss delete mode 100644 assets/scss/bootstrap/_jumbotron.scss create mode 100644 assets/scss/bootstrap/_maps.scss delete mode 100644 assets/scss/bootstrap/_media.scss create mode 100644 assets/scss/bootstrap/_offcanvas.scss create mode 100644 assets/scss/bootstrap/_placeholders.scss delete mode 100644 assets/scss/bootstrap/_print.scss create mode 100644 assets/scss/bootstrap/_variables-dark.scss create mode 100644 assets/scss/bootstrap/bootstrap-utilities.scss create mode 100644 assets/scss/bootstrap/forms/_floating-labels.scss create mode 100644 assets/scss/bootstrap/forms/_form-check.scss create mode 100644 assets/scss/bootstrap/forms/_form-control.scss create mode 100644 assets/scss/bootstrap/forms/_form-range.scss create mode 100644 assets/scss/bootstrap/forms/_form-select.scss create mode 100644 assets/scss/bootstrap/forms/_form-text.scss create mode 100644 assets/scss/bootstrap/forms/_input-group.scss create mode 100644 assets/scss/bootstrap/forms/_labels.scss create mode 100644 assets/scss/bootstrap/forms/_validation.scss rename assets/scss/bootstrap/{utilities => helpers}/_clearfix.scss (100%) create mode 100644 assets/scss/bootstrap/helpers/_color-bg.scss create mode 100644 assets/scss/bootstrap/helpers/_colored-links.scss create mode 100644 assets/scss/bootstrap/helpers/_focus-ring.scss create mode 100644 assets/scss/bootstrap/helpers/_icon-link.scss create mode 100644 assets/scss/bootstrap/helpers/_position.scss create mode 100644 assets/scss/bootstrap/helpers/_ratio.scss create mode 100644 assets/scss/bootstrap/helpers/_stacks.scss create mode 100644 assets/scss/bootstrap/helpers/_stretched-link.scss create mode 100644 assets/scss/bootstrap/helpers/_text-truncation.scss create mode 100644 assets/scss/bootstrap/helpers/_visually-hidden.scss create mode 100644 assets/scss/bootstrap/helpers/_vr.scss create mode 100644 assets/scss/bootstrap/mixins/_backdrop.scss delete mode 100644 assets/scss/bootstrap/mixins/_background-variant.scss delete mode 100644 assets/scss/bootstrap/mixins/_badge.scss create mode 100644 assets/scss/bootstrap/mixins/_banner.scss create mode 100644 assets/scss/bootstrap/mixins/_color-mode.scss create mode 100644 assets/scss/bootstrap/mixins/_color-scheme.scss create mode 100644 assets/scss/bootstrap/mixins/_container.scss delete mode 100644 assets/scss/bootstrap/mixins/_float.scss delete mode 100644 assets/scss/bootstrap/mixins/_grid-framework.scss delete mode 100644 assets/scss/bootstrap/mixins/_hover.scss delete mode 100644 assets/scss/bootstrap/mixins/_nav-divider.scss delete mode 100644 assets/scss/bootstrap/mixins/_screen-reader.scss delete mode 100644 assets/scss/bootstrap/mixins/_size.scss delete mode 100644 assets/scss/bootstrap/mixins/_table-row.scss create mode 100644 assets/scss/bootstrap/mixins/_table-variants.scss delete mode 100644 assets/scss/bootstrap/mixins/_text-emphasis.scss delete mode 100644 assets/scss/bootstrap/mixins/_text-hide.scss create mode 100644 assets/scss/bootstrap/mixins/_utilities.scss delete mode 100644 assets/scss/bootstrap/mixins/_visibility.scss create mode 100644 assets/scss/bootstrap/mixins/_visually-hidden.scss create mode 100644 assets/scss/bootstrap/tests/jasmine.js create mode 100644 assets/scss/bootstrap/tests/mixins/_color-modes.test.scss create mode 100644 assets/scss/bootstrap/tests/mixins/_media-query-color-mode-full.test.scss create mode 100644 assets/scss/bootstrap/tests/mixins/_utilities.test.scss create mode 100644 assets/scss/bootstrap/tests/sass-true/register.js create mode 100644 assets/scss/bootstrap/tests/sass-true/runner.js create mode 100644 assets/scss/bootstrap/tests/utilities/_api.test.scss delete mode 100644 assets/scss/bootstrap/utilities/_align.scss create mode 100644 assets/scss/bootstrap/utilities/_api.scss delete mode 100644 assets/scss/bootstrap/utilities/_background.scss delete mode 100644 assets/scss/bootstrap/utilities/_borders.scss delete mode 100644 assets/scss/bootstrap/utilities/_display.scss delete mode 100644 assets/scss/bootstrap/utilities/_embed.scss delete mode 100644 assets/scss/bootstrap/utilities/_flex.scss delete mode 100644 assets/scss/bootstrap/utilities/_float.scss delete mode 100644 assets/scss/bootstrap/utilities/_overflow.scss delete mode 100644 assets/scss/bootstrap/utilities/_position.scss delete mode 100644 assets/scss/bootstrap/utilities/_screenreaders.scss delete mode 100644 assets/scss/bootstrap/utilities/_shadows.scss delete mode 100644 assets/scss/bootstrap/utilities/_sizing.scss delete mode 100644 assets/scss/bootstrap/utilities/_spacing.scss delete mode 100644 assets/scss/bootstrap/utilities/_stretched-link.scss delete mode 100644 assets/scss/bootstrap/utilities/_text.scss delete mode 100644 assets/scss/bootstrap/utilities/_visibility.scss delete mode 100644 exampleSite/content/team/susan-shelton.md rename exampleSite/static/images/{team => }/smartworks-coworking-cW4lLTavU80-unsplash.jpg (100%) diff --git a/.hugo_build.lock b/.hugo_build.lock new file mode 100644 index 00000000..e69de29b diff --git a/README.md b/README.md index a0782989..f67840be 100644 --- a/README.md +++ b/README.md @@ -123,6 +123,14 @@ Use Netlify to deploy this theme. This theme contains a valid and tested `netlif [![Deploy to Netlify](https://www.netlify.com/img/deploy/button.svg)](https://app.netlify.com/start/deploy?repository=https://github.com/zerostaticthemes/hugo-serif-theme) + +#### +You can run this site without installing as a hugo theme using the following command. I use this for theme development. + +``` +hugo server --source=exampleSite --theme=../../ +``` + ## Configuring Theme ### Logo @@ -249,7 +257,4 @@ You can configure og meta data global settings in the config. - [Hugo Winston](https://github.com/zerostaticthemes/hugo-winston-theme) Open Source:- blog theme - [Hugo Advance](https://www.zerostatic.io/theme/hugo-advance/) Premium: advanced multi page business and marketing theme - [Hugo Paradigm](https://www.zerostatic.io/theme/hugo-paradigm/) Premium: landing page / site builder theme - -🇦🇺 **Made in Australia** by Robert Austin - leave a star mate! - -Buy Me A Coffee +- [Hugo Lever](https://www.zerostatic.io/theme/hugo-lever/) Premium: bio / resume / personal theme \ No newline at end of file diff --git a/assets/scss/_bootstrap-variables.scss b/assets/scss/_bootstrap-variables.scss deleted file mode 100755 index 6824794e..00000000 --- a/assets/scss/_bootstrap-variables.scss +++ /dev/null @@ -1,35 +0,0 @@ -$grid-breakpoints: ( - xs: 0, - sm: 576px, - md: 768px, - lg: 992px, - xl: 1300px, -); - -$container-max-widths: ( - sm: 566px, - md: 740px, - lg: 960px, - xl: 1140px, -); - -$grid-gutter-width: 30px; - -$spacer: 1rem; -$spacers: (); -$spacers: map-merge( - ( - 0: 0, - 1: 10px, - 2: 20px, - 3: 30px, - 4: 40px, - 5: 50px, - 6: 60px, - 7: 70px, - 8: 80px, - 9: 90px, - 10: 100px, - ), - $spacers -); diff --git a/assets/scss/_variables.scss b/assets/scss/_variables.scss new file mode 100755 index 00000000..b90ec171 --- /dev/null +++ b/assets/scss/_variables.scss @@ -0,0 +1,58 @@ +$grid-breakpoints: ( + xs: 0, + sm: 576px, + md: 768px, + lg: 992px, + xl: 1300px, +); + +$container-max-widths: ( + sm: 566px, + md: 740px, + lg: 960px, + xl: 1140px, +); + +$grid-gutter-width: 30px; + +$spacer: 1rem; +$spacers: (); +$spacers: map-merge( + ( + 0: 0, + 1: 10px, + 2: 20px, + 3: 30px, + 4: 40px, + 5: 50px, + 6: 60px, + 7: 70px, + 8: 80px, + 9: 90px, + 10: 100px, + 11: 110px, + 12: 120px, + 13: 130px, + 14: 140px, + 15: 150px, + 16: 160px, + 17: 170px, + 18: 180px, + 19: 190px, + 20: 200px, + ), + $spacers +); + +// Links +$link-color: $primary; +$link-decoration: none; +$link-hover-decoration: underline; + +// Footer +$footer-background-color: $primary; +$footer-text-color: $white; +$sub-footer-background-color: darken($primary, 10%); +$sub-footer-text-color: $white; + +$min-contrast-ratio: 2.5; \ No newline at end of file diff --git a/assets/scss/bootstrap/_accordion.scss b/assets/scss/bootstrap/_accordion.scss new file mode 100644 index 00000000..75588a5a --- /dev/null +++ b/assets/scss/bootstrap/_accordion.scss @@ -0,0 +1,158 @@ +// +// Base styles +// + +.accordion { + // scss-docs-start accordion-css-vars + --#{$prefix}accordion-color: #{$accordion-color}; + --#{$prefix}accordion-bg: #{$accordion-bg}; + --#{$prefix}accordion-transition: #{$accordion-transition}; + --#{$prefix}accordion-border-color: #{$accordion-border-color}; + --#{$prefix}accordion-border-width: #{$accordion-border-width}; + --#{$prefix}accordion-border-radius: #{$accordion-border-radius}; + --#{$prefix}accordion-inner-border-radius: #{$accordion-inner-border-radius}; + --#{$prefix}accordion-btn-padding-x: #{$accordion-button-padding-x}; + --#{$prefix}accordion-btn-padding-y: #{$accordion-button-padding-y}; + --#{$prefix}accordion-btn-color: #{$accordion-button-color}; + --#{$prefix}accordion-btn-bg: #{$accordion-button-bg}; + --#{$prefix}accordion-btn-icon: #{escape-svg($accordion-button-icon)}; + --#{$prefix}accordion-btn-icon-width: #{$accordion-icon-width}; + --#{$prefix}accordion-btn-icon-transform: #{$accordion-icon-transform}; + --#{$prefix}accordion-btn-icon-transition: #{$accordion-icon-transition}; + --#{$prefix}accordion-btn-active-icon: #{escape-svg($accordion-button-active-icon)}; + --#{$prefix}accordion-btn-focus-border-color: #{$accordion-button-focus-border-color}; + --#{$prefix}accordion-btn-focus-box-shadow: #{$accordion-button-focus-box-shadow}; + --#{$prefix}accordion-body-padding-x: #{$accordion-body-padding-x}; + --#{$prefix}accordion-body-padding-y: #{$accordion-body-padding-y}; + --#{$prefix}accordion-active-color: #{$accordion-button-active-color}; + --#{$prefix}accordion-active-bg: #{$accordion-button-active-bg}; + // scss-docs-end accordion-css-vars +} + +.accordion-button { + position: relative; + display: flex; + align-items: center; + width: 100%; + padding: var(--#{$prefix}accordion-btn-padding-y) var(--#{$prefix}accordion-btn-padding-x); + @include font-size($font-size-base); + color: var(--#{$prefix}accordion-btn-color); + text-align: left; // Reset button style + background-color: var(--#{$prefix}accordion-btn-bg); + border: 0; + @include border-radius(0); + overflow-anchor: none; + @include transition(var(--#{$prefix}accordion-transition)); + + &:not(.collapsed) { + color: var(--#{$prefix}accordion-active-color); + background-color: var(--#{$prefix}accordion-active-bg); + box-shadow: inset 0 calc(-1 * var(--#{$prefix}accordion-border-width)) 0 var(--#{$prefix}accordion-border-color); // stylelint-disable-line function-disallowed-list + + &::after { + background-image: var(--#{$prefix}accordion-btn-active-icon); + transform: var(--#{$prefix}accordion-btn-icon-transform); + } + } + + // Accordion icon + &::after { + flex-shrink: 0; + width: var(--#{$prefix}accordion-btn-icon-width); + height: var(--#{$prefix}accordion-btn-icon-width); + margin-left: auto; + content: ""; + background-image: var(--#{$prefix}accordion-btn-icon); + background-repeat: no-repeat; + background-size: var(--#{$prefix}accordion-btn-icon-width); + @include transition(var(--#{$prefix}accordion-btn-icon-transition)); + } + + &:hover { + z-index: 2; + } + + &:focus { + z-index: 3; + border-color: var(--#{$prefix}accordion-btn-focus-border-color); + outline: 0; + box-shadow: var(--#{$prefix}accordion-btn-focus-box-shadow); + } +} + +.accordion-header { + margin-bottom: 0; +} + +.accordion-item { + color: var(--#{$prefix}accordion-color); + background-color: var(--#{$prefix}accordion-bg); + border: var(--#{$prefix}accordion-border-width) solid var(--#{$prefix}accordion-border-color); + + &:first-of-type { + @include border-top-radius(var(--#{$prefix}accordion-border-radius)); + + .accordion-button { + @include border-top-radius(var(--#{$prefix}accordion-inner-border-radius)); + } + } + + &:not(:first-of-type) { + border-top: 0; + } + + // Only set a border-radius on the last item if the accordion is collapsed + &:last-of-type { + @include border-bottom-radius(var(--#{$prefix}accordion-border-radius)); + + .accordion-button { + &.collapsed { + @include border-bottom-radius(var(--#{$prefix}accordion-inner-border-radius)); + } + } + + .accordion-collapse { + @include border-bottom-radius(var(--#{$prefix}accordion-border-radius)); + } + } +} + +.accordion-body { + padding: var(--#{$prefix}accordion-body-padding-y) var(--#{$prefix}accordion-body-padding-x); +} + + +// Flush accordion items +// +// Remove borders and border-radius to keep accordion items edge-to-edge. + +.accordion-flush { + .accordion-collapse { + border-width: 0; + } + + .accordion-item { + border-right: 0; + border-left: 0; + @include border-radius(0); + + &:first-child { border-top: 0; } + &:last-child { border-bottom: 0; } + + .accordion-button { + &, + &.collapsed { + @include border-radius(0); + } + } + } +} + +@if $enable-dark-mode { + @include color-mode(dark) { + .accordion-button::after { + --#{$prefix}accordion-btn-icon: #{escape-svg($accordion-button-icon-dark)}; + --#{$prefix}accordion-btn-active-icon: #{escape-svg($accordion-button-active-icon-dark)}; + } + } +} diff --git a/assets/scss/bootstrap/_alert.scss b/assets/scss/bootstrap/_alert.scss index da2a98af..b8cff9b7 100644 --- a/assets/scss/bootstrap/_alert.scss +++ b/assets/scss/bootstrap/_alert.scss @@ -3,11 +3,25 @@ // .alert { + // scss-docs-start alert-css-vars + --#{$prefix}alert-bg: transparent; + --#{$prefix}alert-padding-x: #{$alert-padding-x}; + --#{$prefix}alert-padding-y: #{$alert-padding-y}; + --#{$prefix}alert-margin-bottom: #{$alert-margin-bottom}; + --#{$prefix}alert-color: inherit; + --#{$prefix}alert-border-color: transparent; + --#{$prefix}alert-border: #{$alert-border-width} solid var(--#{$prefix}alert-border-color); + --#{$prefix}alert-border-radius: #{$alert-border-radius}; + --#{$prefix}alert-link-color: inherit; + // scss-docs-end alert-css-vars + position: relative; - padding: $alert-padding-y $alert-padding-x; - margin-bottom: $alert-margin-bottom; - border: $alert-border-width solid transparent; - @include border-radius($alert-border-radius); + padding: var(--#{$prefix}alert-padding-y) var(--#{$prefix}alert-padding-x); + margin-bottom: var(--#{$prefix}alert-margin-bottom); + color: var(--#{$prefix}alert-color); + background-color: var(--#{$prefix}alert-bg); + border: var(--#{$prefix}alert-border); + @include border-radius(var(--#{$prefix}alert-border-radius)); } // Headings for larger alerts @@ -19,6 +33,7 @@ // Provide class for links that match alerts .alert-link { font-weight: $alert-link-font-weight; + color: var(--#{$prefix}alert-link-color); } @@ -27,25 +42,27 @@ // Expand the right padding and account for the close button's positioning. .alert-dismissible { - padding-right: $close-font-size + $alert-padding-x * 2; + padding-right: $alert-dismissible-padding-r; // Adjust close link position - .close { + .btn-close { position: absolute; top: 0; right: 0; - padding: $alert-padding-y $alert-padding-x; - color: inherit; + z-index: $stretched-link-z-index + 1; + padding: $alert-padding-y * 1.25 $alert-padding-x; } } -// Alternate styles -// -// Generate contextual modifier classes for colorizing the alert. - -@each $color, $value in $theme-colors { - .alert-#{$color} { - @include alert-variant(theme-color-level($color, $alert-bg-level), theme-color-level($color, $alert-border-level), theme-color-level($color, $alert-color-level)); +// scss-docs-start alert-modifiers +// Generate contextual modifier classes for colorizing the alert +@each $state in map-keys($theme-colors) { + .alert-#{$state} { + --#{$prefix}alert-color: var(--#{$prefix}#{$state}-text-emphasis); + --#{$prefix}alert-bg: var(--#{$prefix}#{$state}-bg-subtle); + --#{$prefix}alert-border-color: var(--#{$prefix}#{$state}-border-subtle); + --#{$prefix}alert-link-color: var(--#{$prefix}#{$state}-text-emphasis); } } +// scss-docs-end alert-modifiers diff --git a/assets/scss/bootstrap/_badge.scss b/assets/scss/bootstrap/_badge.scss index 42c5d08d..cc3d2695 100644 --- a/assets/scss/bootstrap/_badge.scss +++ b/assets/scss/bootstrap/_badge.scss @@ -4,22 +4,26 @@ // `background-color`. .badge { + // scss-docs-start badge-css-vars + --#{$prefix}badge-padding-x: #{$badge-padding-x}; + --#{$prefix}badge-padding-y: #{$badge-padding-y}; + @include rfs($badge-font-size, --#{$prefix}badge-font-size); + --#{$prefix}badge-font-weight: #{$badge-font-weight}; + --#{$prefix}badge-color: #{$badge-color}; + --#{$prefix}badge-border-radius: #{$badge-border-radius}; + // scss-docs-end badge-css-vars + display: inline-block; - padding: $badge-padding-y $badge-padding-x; - @include font-size($badge-font-size); - font-weight: $badge-font-weight; + padding: var(--#{$prefix}badge-padding-y) var(--#{$prefix}badge-padding-x); + @include font-size(var(--#{$prefix}badge-font-size)); + font-weight: var(--#{$prefix}badge-font-weight); line-height: 1; + color: var(--#{$prefix}badge-color); text-align: center; white-space: nowrap; vertical-align: baseline; - @include border-radius($badge-border-radius); - @include transition($badge-transition); - - @at-root a#{&} { - @include hover-focus() { - text-decoration: none; - } - } + @include border-radius(var(--#{$prefix}badge-border-radius)); + @include gradient-bg(); // Empty badges collapse automatically &:empty { @@ -32,23 +36,3 @@ position: relative; top: -1px; } - -// Pill badges -// -// Make them extra rounded with a modifier to replace v3's badges. - -.badge-pill { - padding-right: $badge-pill-padding-x; - padding-left: $badge-pill-padding-x; - @include border-radius($badge-pill-border-radius); -} - -// Colors -// -// Contextual variations (linked badges get darker on :hover). - -@each $color, $value in $theme-colors { - .badge-#{$color} { - @include badge-variant($value); - } -} diff --git a/assets/scss/bootstrap/_breadcrumb.scss b/assets/scss/bootstrap/_breadcrumb.scss index d748894f..b8252ff2 100644 --- a/assets/scss/bootstrap/_breadcrumb.scss +++ b/assets/scss/bootstrap/_breadcrumb.scss @@ -1,42 +1,40 @@ .breadcrumb { + // scss-docs-start breadcrumb-css-vars + --#{$prefix}breadcrumb-padding-x: #{$breadcrumb-padding-x}; + --#{$prefix}breadcrumb-padding-y: #{$breadcrumb-padding-y}; + --#{$prefix}breadcrumb-margin-bottom: #{$breadcrumb-margin-bottom}; + @include rfs($breadcrumb-font-size, --#{$prefix}breadcrumb-font-size); + --#{$prefix}breadcrumb-bg: #{$breadcrumb-bg}; + --#{$prefix}breadcrumb-border-radius: #{$breadcrumb-border-radius}; + --#{$prefix}breadcrumb-divider-color: #{$breadcrumb-divider-color}; + --#{$prefix}breadcrumb-item-padding-x: #{$breadcrumb-item-padding-x}; + --#{$prefix}breadcrumb-item-active-color: #{$breadcrumb-active-color}; + // scss-docs-end breadcrumb-css-vars + display: flex; flex-wrap: wrap; - padding: $breadcrumb-padding-y $breadcrumb-padding-x; - margin-bottom: $breadcrumb-margin-bottom; - @include font-size($breadcrumb-font-size); + padding: var(--#{$prefix}breadcrumb-padding-y) var(--#{$prefix}breadcrumb-padding-x); + margin-bottom: var(--#{$prefix}breadcrumb-margin-bottom); + @include font-size(var(--#{$prefix}breadcrumb-font-size)); list-style: none; - background-color: $breadcrumb-bg; - @include border-radius($breadcrumb-border-radius); + background-color: var(--#{$prefix}breadcrumb-bg); + @include border-radius(var(--#{$prefix}breadcrumb-border-radius)); } .breadcrumb-item { // The separator between breadcrumbs (by default, a forward-slash: "/") + .breadcrumb-item { - padding-left: $breadcrumb-item-padding; + padding-left: var(--#{$prefix}breadcrumb-item-padding-x); &::before { - display: inline-block; // Suppress underlining of the separator in modern browsers - padding-right: $breadcrumb-item-padding; - color: $breadcrumb-divider-color; - content: escape-svg($breadcrumb-divider); + float: left; // Suppress inline spacings and underlining of the separator + padding-right: var(--#{$prefix}breadcrumb-item-padding-x); + color: var(--#{$prefix}breadcrumb-divider-color); + content: var(--#{$prefix}breadcrumb-divider, escape-svg($breadcrumb-divider)) #{"/* rtl:"} var(--#{$prefix}breadcrumb-divider, escape-svg($breadcrumb-divider-flipped)) #{"*/"}; } } - // IE9-11 hack to properly handle hyperlink underlines for breadcrumbs built - // without `