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:
Diffstat (limited to 'scss/mixins')
-rw-r--r--scss/mixins/_border-radius.scss6
-rw-r--r--scss/mixins/_buttons.scss6
2 files changed, 6 insertions, 6 deletions
diff --git a/scss/mixins/_border-radius.scss b/scss/mixins/_border-radius.scss
index 2024febcfa..f32feca90c 100644
--- a/scss/mixins/_border-radius.scss
+++ b/scss/mixins/_border-radius.scss
@@ -1,9 +1,13 @@
+// stylelint-disable property-blacklist
// Single side border-radius
-@mixin border-radius($radius: $border-radius) {
+@mixin border-radius($radius: $border-radius, $fallback-border-radius: false) {
@if $enable-rounded {
border-radius: $radius;
}
+ @else if $fallback-border-radius != false {
+ border-radius: $fallback-border-radius;
+ }
}
@mixin border-top-radius($radius) {
diff --git a/scss/mixins/_buttons.scss b/scss/mixins/_buttons.scss
index 3e1e2c09d0..64cc482f69 100644
--- a/scss/mixins/_buttons.scss
+++ b/scss/mixins/_buttons.scss
@@ -103,9 +103,5 @@
font-size: $font-size;
line-height: $line-height;
// Manually declare to provide an override to the browser default
- @if $enable-rounded {
- border-radius: $border-radius;
- } @else {
- border-radius: 0;
- }
+ @include border-radius($border-radius, 0);
}