update

dnomak · Feb 9, 2015 · 032c7ef · 032c7ef
1 parent e1b6d34
commit 032c7ef
Show file tree

Hide file tree

Showing 13 changed files with 108 additions and 117 deletions.
diff --git a/css/flexiblegs.css b/css/flexiblegs.css
@@ -1,4 +1,4 @@
-/*! Flexible Grid System 2.4.3 | CSS | MIT License | flexible.gs */
+/*! Flexible Grid System 2.5.0 | CSS | MIT License | flexible.gs */
 
 /* wrap · flexbox */
 /* xl · lg · md · sm · xs */
@@ -16,9 +16,6 @@
     -moz-box-sizing: border-box;
     box-sizing: border-box;
   }
-  @-ms-viewport {
-    width: device-width;
-  }
   .wrap {
     font-size: 0;
     text-align: center;
@@ -422,15 +419,6 @@
   .bottom-xs > * {
     vertical-align: bottom;
   }
-  [class^="reverse-"] {
-    -webkit-box-direction: normal;
-    -webkit-flex-direction: row;
-    -ms-flex-direction: row;
-    flex-direction: row;
-    -webkit-flex-wrap: wrap;
-    -ms-flex-wrap: wrap;
-    flex-wrap: wrap;
-  }
   .reverse-xs {
     -webkit-box-direction: reverse;
     -webkit-flex-direction: row-reverse;
@@ -440,12 +428,14 @@
     -ms-flex-wrap: wrap-reverse;
     flex-wrap: wrap-reverse;
   }
-  [class^="first-"], [class^="last-"] {
-    -webkit-box-ordinal-group: 0;
-    -moz-box-ordinal-group: 0;
-    -ms-flex-order: 0;
-    -webkit-order: 0;
-    order: 0;
+  .not-reverse-xs {
+    -webkit-box-direction: normal;
+    -webkit-flex-direction: row;
+    -ms-flex-direction: row;
+    flex-direction: row;
+    -webkit-flex-wrap: wrap;
+    -ms-flex-wrap: wrap;
+    flex-wrap: wrap;
   }
   .first-xs {
     -webkit-box-ordinal-group: -1;
@@ -461,6 +451,13 @@
     -webkit-order: 1;
     order: 1;
   }
+  .not-first-xs, .not-last-xs {
+    -webkit-box-ordinal-group: 0;
+    -moz-box-ordinal-group: 0;
+    -ms-flex-order: 0;
+    -webkit-order: 0;
+    order: 0;
+  }
 
 /* sm */
 
@@ -835,15 +832,6 @@
     .bottom-sm > * {
       vertical-align: bottom;
     }
-    [class^="reverse-"] {
-      -webkit-box-direction: normal;
-      -webkit-flex-direction: row;
-      -ms-flex-direction: row;
-      flex-direction: row;
-      -webkit-flex-wrap: wrap;
-      -ms-flex-wrap: wrap;
-      flex-wrap: wrap;
-    }
     .reverse-sm {
       -webkit-box-direction: reverse;
       -webkit-flex-direction: row-reverse;
@@ -853,12 +841,14 @@
       -ms-flex-wrap: wrap-reverse;
       flex-wrap: wrap-reverse;
     }
-    [class^="first-"], [class^="last-"] {
-      -webkit-box-ordinal-group: 0;
-      -moz-box-ordinal-group: 0;
-      -ms-flex-order: 0;
-      -webkit-order: 0;
-      order: 0;
+    .not-reverse-sm {
+      -webkit-box-direction: normal;
+      -webkit-flex-direction: row;
+      -ms-flex-direction: row;
+      flex-direction: row;
+      -webkit-flex-wrap: wrap;
+      -ms-flex-wrap: wrap;
+      flex-wrap: wrap;
     }
     .first-sm {
       -webkit-box-ordinal-group: -1;
@@ -874,6 +864,13 @@
       -webkit-order: 1;
       order: 1;
     }
+    .not-first-sm, .not-last-sm {
+      -webkit-box-ordinal-group: 0;
+      -moz-box-ordinal-group: 0;
+      -ms-flex-order: 0;
+      -webkit-order: 0;
+      order: 0;
+    }
   }
 
 /* md */
@@ -1249,15 +1246,6 @@
     .bottom-md > * {
       vertical-align: bottom;
     }
-    [class^="reverse-"] {
-      -webkit-box-direction: normal;
-      -webkit-flex-direction: row;
-      -ms-flex-direction: row;
-      flex-direction: row;
-      -webkit-flex-wrap: wrap;
-      -ms-flex-wrap: wrap;
-      flex-wrap: wrap;
-    }
     .reverse-md {
       -webkit-box-direction: reverse;
       -webkit-flex-direction: row-reverse;
@@ -1267,12 +1255,14 @@
       -ms-flex-wrap: wrap-reverse;
       flex-wrap: wrap-reverse;
     }
-    [class^="first-"], [class^="last-"] {
-      -webkit-box-ordinal-group: 0;
-      -moz-box-ordinal-group: 0;
-      -ms-flex-order: 0;
-      -webkit-order: 0;
-      order: 0;
+    .not-reverse-md {
+      -webkit-box-direction: normal;
+      -webkit-flex-direction: row;
+      -ms-flex-direction: row;
+      flex-direction: row;
+      -webkit-flex-wrap: wrap;
+      -ms-flex-wrap: wrap;
+      flex-wrap: wrap;
     }
     .first-md {
       -webkit-box-ordinal-group: -1;
@@ -1288,6 +1278,13 @@
       -webkit-order: 1;
       order: 1;
     }
+    .not-first-md, .not-last-md {
+      -webkit-box-ordinal-group: 0;
+      -moz-box-ordinal-group: 0;
+      -ms-flex-order: 0;
+      -webkit-order: 0;
+      order: 0;
+    }
   }
 
 /* lg */
@@ -1663,15 +1660,6 @@
     .bottom-lg > * {
       vertical-align: bottom;
     }
-    [class^="reverse-"] {
-      -webkit-box-direction: normal;
-      -webkit-flex-direction: row;
-      -ms-flex-direction: row;
-      flex-direction: row;
-      -webkit-flex-wrap: wrap;
-      -ms-flex-wrap: wrap;
-      flex-wrap: wrap;
-    }
     .reverse-lg {
       -webkit-box-direction: reverse;
       -webkit-flex-direction: row-reverse;
@@ -1681,12 +1669,14 @@
       -ms-flex-wrap: wrap-reverse;
       flex-wrap: wrap-reverse;
     }
-    [class^="first-"], [class^="last-"] {
-      -webkit-box-ordinal-group: 0;
-      -moz-box-ordinal-group: 0;
-      -ms-flex-order: 0;
-      -webkit-order: 0;
-      order: 0;
+    .not-reverse-lg {
+      -webkit-box-direction: normal;
+      -webkit-flex-direction: row;
+      -ms-flex-direction: row;
+      flex-direction: row;
+      -webkit-flex-wrap: wrap;
+      -ms-flex-wrap: wrap;
+      flex-wrap: wrap;
     }
     .first-lg {
       -webkit-box-ordinal-group: -1;
@@ -1702,6 +1692,13 @@
       -webkit-order: 1;
       order: 1;
     }
+    .not-first-lg, .not-last-lg {
+      -webkit-box-ordinal-group: 0;
+      -moz-box-ordinal-group: 0;
+      -ms-flex-order: 0;
+      -webkit-order: 0;
+      order: 0;
+    }
   }
 
 /* xl */
@@ -2077,15 +2074,6 @@
     .bottom-xl > * {
       vertical-align: bottom;
     }
-    [class^="reverse-"] {
-      -webkit-box-direction: normal;
-      -webkit-flex-direction: row;
-      -ms-flex-direction: row;
-      flex-direction: row;
-      -webkit-flex-wrap: wrap;
-      -ms-flex-wrap: wrap;
-      flex-wrap: wrap;
-    }
     .reverse-xl {
       -webkit-box-direction: reverse;
       -webkit-flex-direction: row-reverse;
@@ -2095,12 +2083,14 @@
       -ms-flex-wrap: wrap-reverse;
       flex-wrap: wrap-reverse;
     }
-    [class^="first-"], [class^="last-"] {
-      -webkit-box-ordinal-group: 0;
-      -moz-box-ordinal-group: 0;
-      -ms-flex-order: 0;
-      -webkit-order: 0;
-      order: 0;
+    .not-reverse-xl {
+      -webkit-box-direction: normal;
+      -webkit-flex-direction: row;
+      -ms-flex-direction: row;
+      flex-direction: row;
+      -webkit-flex-wrap: wrap;
+      -ms-flex-wrap: wrap;
+      flex-wrap: wrap;
     }
     .first-xl {
       -webkit-box-ordinal-group: -1;
@@ -2116,4 +2106,11 @@
       -webkit-order: 1;
       order: 1;
     }
+    .not-first-xl, .not-last-xl {
+      -webkit-box-ordinal-group: 0;
+      -moz-box-ordinal-group: 0;
+      -ms-flex-order: 0;
+      -webkit-order: 0;
+      order: 0;
+    }
   }
diff --git a/css/flexiblegs.min.css b/css/flexiblegs.min.css
diff --git a/flexiblegs.core.json b/flexiblegs.core.json
@@ -1,6 +1,6 @@
 {
   "name": "Flexible Grid System | CSS · Sass · Less · Stylus",
-  "version": "2.4.3",
+  "version": "2.5.0",
   "formats": [
     "css", "sass", "less", "stylus"
   ],
@@ -10,6 +10,7 @@
   "gutter-name": "gutter",
   "align-name": "align",
   "flexbox-name": "flexbox",
+  "layout-name": "size",
   "sizes": [
     {
       "name": "xl",
@@ -46,5 +47,6 @@
   "bottom-name": "bottom",
   "reverse-name": "reverse",
   "first-name": "first",
-  "last-name": "last"
+  "last-name": "last",
+  "not-name": "not"
 }
diff --git a/less/flexiblegs.less b/less/flexiblegs.less
@@ -1,4 +1,4 @@
-// Flexible Grid System 2.4.2 | Less | MIT License | flexible.gs
+// Flexible Grid System 2.5.0 | Less | MIT License | flexible.gs
 
 // Mixins
 

diff --git a/less/flexiblegs/layout.less b/less/flexiblegs/layout.less
@@ -7,10 +7,7 @@
   -moz-box-sizing: border-box;
   box-sizing: border-box;
 }
-@-ms-viewport {
-  width: device-width;
-}
-@sm: ~"(min-width: 415px)";
-@md: ~"(min-width: 668px)";
-@lg: ~"(min-width: 769px)";
-@xl: ~"(min-width: 1025px)";
+@size-sm: ~"(min-width: 415px)";
+@size-md: ~"(min-width: 668px)";
+@size-lg: ~"(min-width: 769px)";
+@size-xl: ~"(min-width: 1025px)";
diff --git a/less/flexiblegs/mixins/flexbox.less b/less/flexiblegs/mixins/flexbox.less
@@ -33,7 +33,7 @@
   -ms-flex-wrap: wrap-reverse;
   flex-wrap: wrap-reverse;
 }
-.flexbox(@flexbox) when (@flexbox = no-reverse) {
+.flexbox(@flexbox) when (@flexbox = not-reverse) {
   -webkit-box-direction: normal;
   -webkit-flex-direction: row;
   -ms-flex-direction: row;
@@ -45,12 +45,12 @@
 .flexbox(@flexbox) when (@flexbox = first) {
   .order(-1);
 }
-.flexbox(@flexbox) when (@flexbox = no-first) {
+.flexbox(@flexbox) when (@flexbox = not-first) {
   .order;
 }
 .flexbox(@flexbox) when (@flexbox = last) {
   .order(1);
 }
-.flexbox(@flexbox) when (@flexbox = no-last) {
+.flexbox(@flexbox) when (@flexbox = not-last) {
   .order;
 }
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "flexiblegs",
-  "version": "2.4.3",
+  "version": "2.5.0",
   "description": "Flexible Grid System is a Responsive CSS Framework (Sass, Less and Stylus)",
   "homepage": "http://flexible.gs",
   "author": {

diff --git a/sass/_flexiblegs.scss b/sass/_flexiblegs.scss
@@ -1,4 +1,4 @@
-// Flexible Grid System 2.4.2 | Sass | MIT License | flexible.gs
+// Flexible Grid System 2.5.0 | Sass | MIT License | flexible.gs
 
 // Mixins
 

diff --git a/sass/flexiblegs/_layout.scss b/sass/flexiblegs/_layout.scss
@@ -7,26 +7,23 @@
   -moz-box-sizing: border-box;
   box-sizing: border-box;
 }
-@-ms-viewport {
-  width: device-width;
-}
-@mixin size($class) {
-  @if $class == sm {
+@mixin size($size) {
+  @if $size == sm {
     @media (min-width: 415px) {
       @content;
     }
   }
-  @else if $class == md {
+  @else if $size == md {
     @media (min-width: 668px) {
       @content;
     }
   }
-  @else if $class == lg {
+  @else if $size == lg {
     @media (min-width: 769px) {
       @content;
     }
   }
-  @else if $class == xl {
+  @else if $size == xl {
     @media (min-width: 1025px) {
       @content;
     }