aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2017-03-03 11:34:10 -0800
committerMark Otto <[email protected]>2017-03-05 12:40:01 -0800
commit9a93671b75dda49421cb20e43eaa7281ceac61b0 (patch)
tree089017d3616d07e059edcab912846c1f26cb004b
parentac3a2fe9bf5bbfb2d0948da260d5353a03cc5b03 (diff)
downloadbootstrap-9a93671b75dda49421cb20e43eaa7281ceac61b0.tar.xz
bootstrap-9a93671b75dda49421cb20e43eaa7281ceac61b0.zip
Move box-shadow and transition mixins out of the main mixins file and into their own files
-rw-r--r--scss/_mixins.scss18
-rw-r--r--scss/mixins/_box-shadow.scss5
-rw-r--r--scss/mixins/_transition.scss9
3 files changed, 16 insertions, 16 deletions
diff --git a/scss/_mixins.scss b/scss/_mixins.scss
index da4738297..13aad2487 100644
--- a/scss/_mixins.scss
+++ b/scss/_mixins.scss
@@ -2,22 +2,6 @@
//
// Used in conjunction with global variables to enable certain theme features.
-@mixin box-shadow($shadow...) {
- @if $enable-shadows {
- box-shadow: $shadow;
- }
-}
-
-@mixin transition($transition...) {
- @if $enable-transitions {
- @if length($transition) == 0 {
- transition: $transition-base;
- } @else {
- transition: $transition;
- }
- }
-}
-
// Utilities
@import "mixins/breakpoints";
@import "mixins/hover";
@@ -47,7 +31,9 @@
// // Skins
@import "mixins/background-variant";
@import "mixins/border-radius";
+@import "mixins/box-shadow";
@import "mixins/gradients";
+@import "mixins/transition";
// // Layout
@import "mixins/clearfix";
diff --git a/scss/mixins/_box-shadow.scss b/scss/mixins/_box-shadow.scss
new file mode 100644
index 000000000..b2410e53a
--- /dev/null
+++ b/scss/mixins/_box-shadow.scss
@@ -0,0 +1,5 @@
+@mixin box-shadow($shadow...) {
+ @if $enable-shadows {
+ box-shadow: $shadow;
+ }
+}
diff --git a/scss/mixins/_transition.scss b/scss/mixins/_transition.scss
new file mode 100644
index 000000000..7e33dee31
--- /dev/null
+++ b/scss/mixins/_transition.scss
@@ -0,0 +1,9 @@
+@mixin transition($transition...) {
+ @if $enable-transitions {
+ @if length($transition) == 0 {
+ transition: $transition-base;
+ } @else {
+ transition: $transition;
+ }
+ }
+}