Merge branch 'develop'

perichus · Apr 26, 2016 · fa0d4a6 · fa0d4a6
2 parents 63b7973 + dc118d0
commit fa0d4a6
Show file tree

Hide file tree

Showing 8 changed files with 64 additions and 200 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "wire.css",
-  "version": "1.2.4",
+  "version": "1.2.5",
   "homepage": "http://wirecss.com",
   "authors": [
     "Pedro Garcia <pedro@pedrogarcia.me> (http://pedrogarcia.me)"

diff --git a/dist/_wire.scss b/dist/_wire.scss
@@ -1,6 +1,6 @@
 /**
  * wire.css
- * @version    1.2.4
+ * @version    1.2.5
  * @homepage   http://wirecss.com
  * @author     Pedro Garcia <pedro@pedrogarcia.me> (http://pedrogarcia.me)
  * @license    Licensed under MIT
@@ -22,7 +22,7 @@
 // To avoid conflicts, Wire used custom namespace,
 // Set 'wire-' to avoid conflicts with others frameworks. '' by default.
 // ----------------------
-$wire-namespace:     '' !default;
+$wire-namespace: '' !default;
 
 // ----------------------
 // Markup Mode
@@ -31,15 +31,15 @@ $wire-namespace:     '' !default;
 // the styles in Sass, set this in 'false'.
 // Set 'true' or 'false'. True by default.
 // ----------------------
-$wire-markup:        true !default;
+$wire-markup: true !default;
 
 // ----------------------
 // Debug Mode
 //
 // Highlight markup errors.
 // Set 'true' or 'false'. False by default.
 // ----------------------
-$wire-debug:         false !default;
+$wire-debug: false !default;
 
 
 
@@ -53,7 +53,6 @@ $wire-debug:         false !default;
 // ----------------------
 $wire-font-size-base: 16 !default;
 $wire-line-height-base: 1.45 !default;
-
 $wire-border-radius: 3px !default;
 
 // ----------------------
@@ -62,24 +61,19 @@ $wire-border-radius: 3px !default;
 // ----------------------
 // Brand Colors
 // ----------------------
-$wire-color-primary: #48A8CE !default;
-$wire-color-secundary: #7C7C7C !default;
-$wire-color-alt: #E0E0E0 !default;
-
+$wire-color-primary: #48a8ce !default;
+$wire-color-secundary: #7c7c7c !default;
+$wire-color-alt: #e0e0e0 !default;
 $wire-link-color: $wire-color-primary !default;
 $wire-link-color-hover: darken($wire-color-primary, 30%) !default;
-
 $wire-button-bg: $wire-color-primary !default;
-$wire-button-color: #FFF !default;
-
+$wire-button-color: #ffffff !default;
 $wire-button-alt-bg: $wire-color-alt !default;
 $wire-button-alt-color: $wire-color-secundary !default;
-
-$wire-form-input-border: #E0E0E0 !default;
-$wire-form-input-bg: #FFF !default;
-
-$wire-table-tr-even-bg: #E5E5E5 !default;
-$wire-table-border-color: #D2D2D2 !default;
+$wire-form-input-border: #e0e0e0 !default;
+$wire-form-input-bg: #ffffff !default;
+$wire-table-tr-even-bg: #e5e5e5 !default;
+$wire-table-border-color: #d2d2d2 !default;
 
 // ----------------------
 // Grid
@@ -1224,39 +1218,37 @@ body {
   }
 }
 
-@for $cols from 1 through ($wire-max-columns) {
+@for $col from 1 through ($wire-max-columns) {
   @each $breakpoint, $value in $wire-breakpoints {
     @include mq($breakpoint) {
       @if $wire-markup == true {
-        .#{$wire-namespace}col-#{$breakpoint}-#{$cols},
-        [data-col-#{$breakpoint}~="#{$cols}"] {
-          padding-left: ($wire-base-gutter / 2);
-          padding-right: ($wire-base-gutter / 2);
-          width: $cols * 100% / $wire-max-columns;
+        .#{$wire-namespace}col-#{$breakpoint}-#{$col},
+        [data-col-#{$breakpoint}~="#{$col}"] {
+          @include columns($col);
         }
       }
     }
   }
 }
 
-@for $cols from 1 through ($wire-max-columns) {
-  %col-offset-#{$cols} {
-    margin-left: $cols * 100% / $wire-max-columns;
+@for $col from 1 through ($wire-max-columns) {
+  %col-offset-#{$col} {
+    margin-left: $col * 100% / $wire-max-columns;
   }
 
   @if $wire-markup == true {
-    .#{$wire-namespace}col-offset-#{$cols} {
-      @extend %col-offset-#{$cols};
+    .#{$wire-namespace}col-offset-#{$col} {
+      @extend %col-offset-#{$col};
     }
   }
 }
 
-@for $cols from 1 through ($wire-max-columns) {
+@for $col from 1 through ($wire-max-columns) {
   @each $breakpoint, $value in $wire-breakpoints {
     @include mq($breakpoint) {
       @if $wire-markup == true {
-        .#{$wire-namespace}col-#{$breakpoint}-offset-#{$cols} {
-          margin-left: $cols * 100% / $wire-max-columns;
+        .#{$wire-namespace}col-#{$breakpoint}-offset-#{$col} {
+          margin-left: $col * 100% / $wire-max-columns;
         }
       }
     }