From 1a6aad454828b9010645efcd514c85791e35de95 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 3 Sep 2015 09:04:51 -0700 Subject: [PATCH] only apply border radius mixins if rounded corners are enabled; alternate fix to #17426 --- scss/mixins/_border-radius.scss | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/scss/mixins/_border-radius.scss b/scss/mixins/_border-radius.scss index 0b76c30043..b1dfbbab68 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; + } } -- 2.47.2