Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/twbs/bootstrap.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Déramond <julien.deramond@orange.com>2022-04-25 13:34:49 +0300
committerMark Otto <otto@github.com>2022-04-29 07:56:46 +0300
commit54e0af0303fe6617e438b9bf68e85b377b0e8ef2 (patch)
tree775baa081850aa233dfe5de24192f7d61cabab0d
parent3143824ea43cf15e42f8513ce65872b3a3f41d6f (diff)
Clean up last `$variable-prefix` usages
-rw-r--r--scss/_variables.scss4
-rw-r--r--site/assets/scss/_navbar.scss6
-rw-r--r--site/layouts/partials/home/masthead-followup.html4
3 files changed, 7 insertions, 7 deletions
diff --git a/scss/_variables.scss b/scss/_variables.scss
index 2c89f991f3..79649a5f9a 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -1253,7 +1253,7 @@ $card-group-margin: $grid-gutter-width * .5 !default;
// scss-docs-start accordion-variables
$accordion-padding-y: 1rem !default;
$accordion-padding-x: 1.25rem !default;
-$accordion-color: var(--#{$variable-prefix}body-color) !default;
+$accordion-color: var(--#{$prefix}body-color) !default;
$accordion-bg: $body-bg !default;
$accordion-border-width: $border-width !default;
$accordion-border-color: var(--#{$prefix}border-color) !default;
@@ -1266,7 +1266,7 @@ $accordion-body-padding-x: $accordion-padding-x !default;
$accordion-button-padding-y: $accordion-padding-y !default;
$accordion-button-padding-x: $accordion-padding-x !default;
$accordion-button-color: $accordion-color !default;
-$accordion-button-bg: var(--#{$variable-prefix}accordion-bg) !default;
+$accordion-button-bg: var(--#{$prefix}accordion-bg) !default;
$accordion-transition: $btn-transition, border-radius .15s ease !default;
$accordion-button-active-bg: tint-color($component-active-bg, 90%) !default;
$accordion-button-active-color: shade-color($primary, 10%) !default;
diff --git a/site/assets/scss/_navbar.scss b/site/assets/scss/_navbar.scss
index 4f9f3f8290..57e3f47b7f 100644
--- a/site/assets/scss/_navbar.scss
+++ b/site/assets/scss/_navbar.scss
@@ -69,9 +69,9 @@
}
.dropdown-menu {
- --#{$variable-prefix}dropdown-min-width: 12rem;
- --#{$variable-prefix}dropdown-link-hover-bg: rgba(var(--bd-violet-rgb), .1);
- @include rfs(.875rem, --#{$variable-prefix}dropdown-font-size);
+ --#{$prefix}dropdown-min-width: 12rem;
+ --#{$prefix}dropdown-link-hover-bg: rgba(var(--bd-violet-rgb), .1);
+ @include rfs(.875rem, --#{$prefix}dropdown-font-size);
box-shadow: $dropdown-box-shadow;
}
diff --git a/site/layouts/partials/home/masthead-followup.html b/site/layouts/partials/home/masthead-followup.html
index 26c8a04a9b..a57e0f7330 100644
--- a/site/layouts/partials/home/masthead-followup.html
+++ b/site/layouts/partials/home/masthead-followup.html
@@ -66,7 +66,7 @@
{{ highlight (printf `// Variable overrides first
$primary: #900;
$enable-shadows: true;
-$variable-prefix: "mo-";
+$prefix: "mo-";
// Then import Bootstrap
@import "../node_modules/bootstrap/scss/bootstrap";
@@ -82,7 +82,7 @@ $variable-prefix: "mo-";
// Variable overrides second
$primary: #900;
$enable-shadows: true;
-$variable-prefix: "mo-";
+$prefix: "mo-";
// Required Bootstrap imports
@import "../node_modules/bootstrap/scss/variables";