From 630c6481ff0b70ba1497dc2bb4352656156b190b Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Wed, 19 Mar 2014 12:39:01 -0500
Subject: [PATCH] csscomb mixins

---
 scss/_mixins.scss | 39 ++++++++++++++++++---------------------
 1 file changed, 18 insertions(+), 21 deletions(-)

diff --git a/scss/_mixins.scss b/scss/_mixins.scss
index fe3b112c25..b4e3a64eb7 100644
--- a/scss/_mixins.scss
+++ b/scss/_mixins.scss
@@ -3,9 +3,9 @@
 // --------------------------------------------------
 
 @mixin button-style($bg-color, $border-color, $active-bg-color, $active-border-color, $color) {
-  color: $color;
-  background-color: $bg-color;
   border-color: $border-color;
+  background-color: $bg-color;
+  color: $color;
 
   // Give desktop users something to play with
   &:hover {
@@ -13,41 +13,41 @@
     text-decoration: none;
   }
   &.active {
+    border-color: $active-border-color;
     background-color: $active-bg-color;
     box-shadow: inset 0px 1px 3px rgba(0,0,0,0.15);
-    border-color: $active-border-color;
   }
 }
 
 @mixin button-clear($color, $font-size:"") {
   &.button-clear {
-    color: $color;
-    background: none;
     border-color: transparent;
+    background: none;
     box-shadow: none;
+    color: $color;
 
     @if $font-size != "" {
       font-size: $font-size;
     }
   }
   &.button-icon {
-    background: none;
     border-color: transparent;
+    background: none;
   }
 }
 
 @mixin button-outline($color, $text-color:"") {
   &.button-outline {
-    background: transparent;
     border-color: $color;
+    background: transparent;
     @if $text-color == "" {
       $text-color: $color;
     }
     color: $text-color;
     &.active {
       background-color: $color;
-      color: #fff;
       box-shadow: none;
+      color: #fff;
     }
   }
 }
@@ -57,10 +57,9 @@
 // --------------------------------------------------
 
 @mixin bar-style($bg-color, $border-color, $color) {
-  background-color: $bg-color;
   border-color: $border-color;
+  background-color: $bg-color;
   background-image: linear-gradient(0deg, $border-color, $border-color 50%, transparent 50%);
-
   color: $color;
 
   .title {
@@ -73,9 +72,9 @@
 // --------------------------------------------------
 
 @mixin tab-style($bg-color, $border-color, $color) {
+  border-color: $border-color;
   background-color: $bg-color;
   background-image: linear-gradient(0deg, $border-color, $border-color 50%, transparent 50%);
-  border-color: $border-color;
   color: $color;
 }
 
@@ -91,14 +90,14 @@
 // --------------------------------------------------
 
 @mixin item-style($bg-color, $border-color, $color) {
-  color: $color;
-  background-color: $bg-color;
   border-color: $border-color;
+  background-color: $bg-color;
+  color: $color;
 }
 
 @mixin item-active-style($active-bg-color, $active-border-color) {
-  background-color: $active-bg-color;
   border-color: $active-border-color;
+  background-color: $active-bg-color;
 }
 
 
@@ -157,8 +156,6 @@
   &:after {
     display: table;
     content: "";
-    // Fixes Opera/contenteditable bug:
-    // http://nicolasgallagher.com/micro-clearfix-hack/#comment-36952
     line-height: 0;
   }
   &:after {
@@ -213,8 +210,8 @@
   font-family: $mono-font-family;
 }
 @mixin font-shorthand($size: $base-font-size, $weight: normal, $line-height: $base-line-height) {
-  font-size: $size;
   font-weight: $weight;
+  font-size: $size;
   line-height: $line-height;
 }
 @mixin font-serif($size: $base-font-size, $weight: normal, $line-height: $base-line-height) {
@@ -240,8 +237,8 @@
 
 @mixin appearance($val) {
   -webkit-appearance: $val;
-  -moz-appearance: $val;
-  appearance: $val;
+     -moz-appearance: $val;
+          appearance: $val;
 }
 
 
@@ -378,7 +375,7 @@
  -webkit-animation-iteration-count: $count;
     -moz-animation-iteration-count: $count;
          animation-iteration-count: $count;
- }
+}
 
 
 // Transformation Mixins
@@ -627,9 +624,9 @@
       .col, .col-10, .col-20, .col-25, .col-33, .col-34, .col-50, .col-66, .col-67, .col-75, .col-80, .col-90 {
         @include flex(1);
         margin-bottom: ($grid-padding-width * 3) / 2;
+        margin-left: 0;
         max-width: 100%;
         width: 100%;
-        margin-left: 0;
       }
     }
   }