Move mixins to the top of the files for consistency

18smlee · Oct 21, 2020 · 3ab266c · 3ab266c
1 parent cc78ed3
commit 3ab266c
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 36 deletions.
diff --git a/dist/cerulean/_bootswatch.scss b/dist/cerulean/_bootswatch.scss
@@ -2,12 +2,16 @@
 // Bootswatch
 
 
+// Variables ===================================================================
+
+$text-shadow: 0 1px 0 rgba(0, 0, 0, .05) !default;
+
+// Mixins ======================================================================
+
 @mixin btn-shadow($color){
   @include gradient-y-three-colors(lighten($color, 8%), $color, 60%, darken($color, 4%));
 }
 
-$text-shadow: 0 1px 0 rgba(0, 0, 0, .05) !default;
-
 // Navbar ======================================================================
 
 .bg-primary {

diff --git a/dist/lumen/_bootswatch.scss b/dist/lumen/_bootswatch.scss
@@ -7,6 +7,8 @@
 $web-font-path: "https://fonts.googleapis.com/css2?family=Source+Sans+Pro:ital,wght@0,300;0,400;0,700;1,400&display=swap" !default;
 @import url($web-font-path);
 
+// Mixins ======================================================================
+
 @mixin shadow($width: 4px){
   border-style: solid;
   border-width: 0 1px $width 1px;

diff --git a/dist/materia/_bootswatch.scss b/dist/materia/_bootswatch.scss
@@ -7,7 +7,7 @@
 $web-font-path: "https://fonts.googleapis.com/css2?family=Roboto:wght@300;400;500;700&display=swap" !default;
 @import url($web-font-path);
 
-// Effects =====================================================================
+// Mixins ======================================================================
 
 @mixin ripple($color){
   position: relative;
@@ -44,6 +44,30 @@ $web-font-path: "https://fonts.googleapis.com/css2?family=Roboto:wght@300;400;50
   }
 }
 
+@mixin btn($class,$bg,$color){
+  .btn-#{$class} {
+    &:focus {
+      background-color: $bg;
+      box-shadow: 0 0 0 2px rgba(204, 204, 204, .5);
+    }
+
+    &:hover,
+    &:active:hover {
+      background-color: darken($bg, 6%);
+    }
+
+    &:active {
+      box-shadow: 2px 2px 4px rgba(0, 0, 0, .4);
+    }
+
+    @include ripple($color);
+  }
+
+  .btn-outline-#{$class} {
+    @include ripple($color);
+  }
+}
+
 .dropdown-toggle::after,
 .dropup .dropdown-toggle::after,
 .dropright .dropdown-toggle::after,
@@ -89,38 +113,14 @@ $web-font-path: "https://fonts.googleapis.com/css2?family=Roboto:wght@300;400;50
 
 // Buttons =====================================================================
 
-@mixin btn($class,$bg,$color){
-  .btn-#{$class} {
-    &:focus {
-      background-color: $bg;
-      box-shadow: 0 0 0 2px rgba(204, 204, 204, .5);
-    }
-
-    &:hover,
-    &:active:hover {
-      background-color: darken($bg, 6%);
-    }
-
-    &:active {
-      box-shadow: 2px 2px 4px rgba(0, 0, 0, .4);
-    }
-
-    @include ripple($color);
-  }
-
-  .btn-outline-#{$class} {
-    @include ripple($color);
-  }
-}
-
-@include btn(primary,$primary,$white);
-@include btn(secondary,$secondary,$gray-500);
-@include btn(success,$success,$white);
-@include btn(info,$info,$white);
-@include btn(warning,$warning,$white);
-@include btn(danger,$danger,$white);
-@include btn(dark,$dark,$white);
-@include btn(light,$light,$white);
+@include btn(primary, $primary, $white);
+@include btn(secondary, $secondary, $gray-500);
+@include btn(success, $success, $white);
+@include btn(info, $info, $white);
+@include btn(warning, $warning, $white);
+@include btn(danger, $danger, $white);
+@include btn(dark, $dark, $white);
+@include btn(light, $light, $white);
 
 .btn {
   text-transform: uppercase;

diff --git a/dist/simplex/_bootswatch.scss b/dist/simplex/_bootswatch.scss
@@ -7,6 +7,8 @@
 $web-font-path: "https://fonts.googleapis.com/css2?family=Open+Sans:wght@400;700&display=swap" !default;
 @import url($web-font-path);
 
+// Mixins ======================================================================
+
 @mixin btn-shadow($color){
   @include gradient-y-three-colors(lighten($color, 3%), $color, 6%, darken($color, 3%));
   filter: none;

diff --git a/dist/slate/_bootswatch.scss b/dist/slate/_bootswatch.scss
@@ -2,7 +2,7 @@
 // Bootswatch
 
 
-// Variables ===================================================================
+// Mixins ======================================================================
 
 @mixin btn-shadow($color){
   @include gradient-y-three-colors(lighten($color, 6%), $color, 60%, darken($color, 4%));

diff --git a/dist/spacelab/_bootswatch.scss b/dist/spacelab/_bootswatch.scss
@@ -7,6 +7,8 @@
 $web-font-path: "https://fonts.googleapis.com/css2?family=Open+Sans:ital,wght@0,400;0,700;1,400;1,700&display=swap" !default;
 @import url($web-font-path);
 
+// Mixins ======================================================================
+
 @mixin btn-shadow($color){
   @include gradient-y-three-colors(lighten($color, 15%), $color, 50%, darken($color, 4%));
   filter: none;