aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Rebert <[email protected]>2015-10-07 00:05:38 -0700
committerChris Rebert <[email protected]>2015-10-07 00:07:48 -0700
commit3137eec3706e8d5d3b03d7943e0693d19e9c4791 (patch)
treece5f9d0a0ed6e57095541b358564d3795d43c2ca
parent781916cab6c133da91fcab0a4d7873716e86b607 (diff)
downloadbootstrap-3137eec3706e8d5d3b03d7943e0693d19e9c4791.tar.xz
bootstrap-3137eec3706e8d5d3b03d7943e0693d19e9c4791.zip
Move border-radius mixin from scss/_mixins.scss to scss/mixins/_border-radius.scss
Reunites the family. Closes #17791
-rw-r--r--scss/_mixins.scss6
-rw-r--r--scss/mixins/_border-radius.scss6
2 files changed, 6 insertions, 6 deletions
diff --git a/scss/_mixins.scss b/scss/_mixins.scss
index 90a48cf89..726beda73 100644
--- a/scss/_mixins.scss
+++ b/scss/_mixins.scss
@@ -2,12 +2,6 @@
//
// Used in conjunction with global variables to enable certain theme features.
-@mixin border-radius($radius: $border-radius) {
- @if $enable-rounded {
- border-radius: $radius;
- }
-}
-
@mixin box-shadow($shadow...) {
@if $enable-shadows {
box-shadow: $shadow;
diff --git a/scss/mixins/_border-radius.scss b/scss/mixins/_border-radius.scss
index b1dfbbab6..54f29f41d 100644
--- a/scss/mixins/_border-radius.scss
+++ b/scss/mixins/_border-radius.scss
@@ -1,5 +1,11 @@
// Single side border-radius
+@mixin border-radius($radius: $border-radius) {
+ @if $enable-rounded {
+ border-radius: $radius;
+ }
+}
+
@mixin border-top-radius($radius) {
@if $enable-rounded {
border-top-right-radius: $radius;