Merge pull request #534 from twbs/prop-order

Property order

Author: connors

sass/bars.scss

@@ -10,8 +10,8 @@
   height: $bar-base-height;
   padding-right: $bar-side-spacing;
   padding-left: $bar-side-spacing;
-  border-bottom: $border-default;
   background-color: $chrome-color;
+  border-bottom: $border-default;
 }
 
 // Modifier class to dock any bar below .bar-nav
@@ -38,8 +38,8 @@
 .bar-footer,
 .bar-footer-secondary,
 .bar-footer-secondary-tab {
-  border-bottom: 0;
   border-top: $border-default;
+  border-bottom: 0;
 }
 
 
@@ -83,18 +83,18 @@
   width: 100%;
   height: $bar-tab-height;
   padding: 0;
+  table-layout: fixed;
   border-top: $border-default;
   border-bottom: 0;
-  table-layout: fixed;
 
   // Navigational tab (Nested to be more specific for the icons in tab-items)
   .tab-item {
     display: table-cell;
     width: 1%;
     height: $bar-tab-height;
-    vertical-align: middle;
     color: #929292;
     text-align: center;
+    vertical-align: middle;
 
     // Active states for the tab bar
     &.active,
@@ -144,8 +144,8 @@
   top: 0;
   padding: 0;
   font-size: 16px;
-  color: $primary-color;
   line-height: $bar-base-height;
+  color: $primary-color;
   border: 0;
 
   &:active,

sass/buttons.scss

@@ -12,8 +12,8 @@
   line-height: 1;
   color: #333;
   text-align: center;
-  vertical-align: top;
   white-space: nowrap;
+  vertical-align: top;
   cursor: pointer;
   background-color: $chrome-color;
   border: 1px solid #ccc;
@@ -40,42 +40,42 @@
 // Primary button (Default color is blue)
 .btn-primary {
   color: #fff;
-  border: 1px solid $primary-color;
   background-color: $primary-color;
+  border: 1px solid $primary-color;
 
   &:active,
   &.active {
     color: #fff;
-    border: 1px solid darken($primary-color, 10%);
     background-color: darken($primary-color, 10%);
+    border: 1px solid darken($primary-color, 10%);
   }
 }
 
 // Positive button (Default color is green)
 .btn-positive {
   color: #fff;
-  border: 1px solid $positive-color;
   background-color: $positive-color;
+  border: 1px solid $positive-color;
 
   &:active,
   &.active {
     color: #fff;
-    border: 1px solid darken($positive-color, 10%);
     background-color: darken($positive-color, 10%);
+    border: 1px solid darken($positive-color, 10%);
   }
 }
 
 // Negative button (Default color is red)
 .btn-negative {
   color: #fff;
-  border: 1px solid $negative-color;
   background-color: $negative-color;
+  border: 1px solid $negative-color;
 
   &:active,
   &.active {
     color: #fff;
-    border: 1px solid darken($negative-color, 10%);
     background-color: darken($negative-color, 10%);
+    border: 1px solid darken($negative-color, 10%);
   }
 }
 
@@ -140,8 +140,8 @@ input[type="button"] {
 
 // Generic styles for all badges within default buttons
 .btn .badge {
-  font-size: 12px;
   margin: -2px -4px -2px 4px;
+  font-size: 12px;
   background-color: rgba(0,0,0,.15);
 }
 

sass/cards.scss

@@ -3,8 +3,8 @@
 // --------------------------------------------------
 
 .card {
-  overflow: hidden;
   margin: $bar-side-spacing;
+  overflow: hidden;
   background-color: $card-bg;
   border: $border-default;
   border-radius: $border-radius;
@@ -21,14 +21,14 @@
   // Rounding first divider on carded lists and remove border on the top
   .table-view-divider:first-child {
     top: 0;
-    border-top-right-radius: $border-radius;
     border-top-left-radius: $border-radius;
+    border-top-right-radius: $border-radius;
   }
 
   // Rounding last divider on carded table views
   .table-view-divider:last-child {
-    border-bottom-right-radius: $border-radius;
     border-bottom-left-radius: $border-radius;
+    border-bottom-right-radius: $border-radius;
   }
 }
 // Remove the bottom border from last table cell