diff options
| author | Mark Otto <[email protected]> | 2015-09-03 09:04:51 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2015-09-03 09:04:51 -0700 |
| commit | 1a6aad454828b9010645efcd514c85791e35de95 (patch) | |
| tree | 2c3138ca15aa710ff57d2835c0d7e5049d2d8fa5 | |
| parent | 3af4560c672bc3435565499586ae85d4bc159cd1 (diff) | |
| download | bootstrap-1a6aad454828b9010645efcd514c85791e35de95.tar.xz bootstrap-1a6aad454828b9010645efcd514c85791e35de95.zip | |
only apply border radius mixins if rounded corners are enabled; alternate fix to #17426
| -rw-r--r-- | scss/mixins/_border-radius.scss | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/scss/mixins/_border-radius.scss b/scss/mixins/_border-radius.scss index 0b76c3004..b1dfbbab6 100644 --- a/scss/mixins/_border-radius.scss +++ b/scss/mixins/_border-radius.scss @@ -1,21 +1,29 @@ // Single side border-radius @mixin border-top-radius($radius) { - border-top-right-radius: $radius; - border-top-left-radius: $radius; + @if $enable-rounded { + border-top-right-radius: $radius; + border-top-left-radius: $radius; + } } @mixin border-right-radius($radius) { - border-bottom-right-radius: $radius; - border-top-right-radius: $radius; + @if $enable-rounded { + border-bottom-right-radius: $radius; + border-top-right-radius: $radius; + } } @mixin border-bottom-radius($radius) { - border-bottom-right-radius: $radius; - border-bottom-left-radius: $radius; + @if $enable-rounded { + border-bottom-right-radius: $radius; + border-bottom-left-radius: $radius; + } } @mixin border-left-radius($radius) { - border-bottom-left-radius: $radius; - border-top-left-radius: $radius; + @if $enable-rounded { + border-bottom-left-radius: $radius; + border-top-left-radius: $radius; + } } |