Merge branch 'stage-v3.6.0' into gh-pages

chharvey · Feb 13, 2016 · 2fc655a · 2fc655a
2 parents 44b0757 + f8cabe4
commit 2fc655a
Show file tree

Hide file tree

Showing 9 changed files with 34 additions and 10 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "xmeter",
-  "version": "3.5.0",
+  "version": "3.6.0",
   "description": "A default stylesheet with a set of tools that make designing with vertical rhythm easy.",
   "main": "xmeter.css",
   "dependencies": {

diff --git a/src/__tool.fallback.column-count.less b/src/__tool.fallback.column-count.less
@@ -13,7 +13,7 @@
   // ^author
   // : Chris Harvey
   // ^updated
-  // : 2014-10-23
+  // : 2015-10-23
   .column-count(@n) {
     -webkit-column-count: @n;
        -moz-column-count: @n;

diff --git a/src/__tool.fallback.column-width.less b/src/__tool.fallback.column-width.less
@@ -0,0 +1,22 @@
+
+/*################################*\
+    xmeter  |  __tool.fallback.column-width.less
+\*################################*/
+
+
+#XMETER {
+  // Sets the width of columns of text.
+  // See [MDN](https://developer.mozilla.org/en-US/docs/Web/CSS/column-width) for more info.
+  //
+  // @n - a positive integer indicating the number of columns, or
+  //    - auto (initial) - indicates the width of columns should be determined by the `column-count` property
+  // ^author
+  // : Chris Harvey
+  // ^updated
+  // : 2016-02-08
+  .column-width(@n) {
+    -webkit-column-width: @n;
+       -moz-column-width: @n;
+            column-width: @n;
+  }
+}
diff --git a/src/__tool.fallback.flexbox.less b/src/__tool.fallback.flexbox.less
@@ -91,7 +91,7 @@
             justify-content: @justify;
   }
 
-  // Aligns a flex container's lines when there is empty space in the cross-axis.
+  // Aligns a flex container’s lines when there is empty space in the cross-axis.
   // (align vertically for `flex-direction: row` or horizontally for `flex-direction: column`)
   //
   // @align - how content is aligned

diff --git a/src/__tool.module.clearfix.less b/src/__tool.module.clearfix.less
@@ -11,11 +11,12 @@
   // ^author
   // : Chris Harevy
   // ^updated
-  // : 2014-05-12
+  // : 2016-02-08
   .clearfix() {
     &::after {
-      display: table;
-      content:' ';
+      content: ' '; // older browsers do not support empty content ('')
+      display: block;
+      height: 0;
       clear: both;
     }
   }

diff --git a/src/__tool.module.fontsize.less b/src/__tool.module.fontsize.less
@@ -19,6 +19,7 @@
   // : Chris Harvey
   // ^updated
   // : 2016-01-08
+  #XMETER .VARS();
   .font-size-block(@ratio; @line_height_orig: @xmeter_line_height; @lines: 1) {
     #XMETER .VARS();
     font-size: (@ratio * @1rem); // legacy browsers (see __settings for more info)

diff --git a/src/__tool.module.sprite.less b/src/__tool.module.sprite.less
@@ -18,13 +18,13 @@
   .sprite(horizontal; @position; @iconsize; @iconpadd) when (@position > 1) {
     background-position: ((@position - 1) * -(@iconsize + @iconpadd)) 0;
   }
-  .sprite(horizontal; @position; @iconsize; @iconpadd) when (@position == 1) {
+  .sprite(horizontal; @position; @iconsize; @iconpadd) when (@position = 1) {
     background-position: 0 0;
   }
   .sprite(vertical; @position; @iconsize; @iconpadd) when (@position > 1) {
     background-position: 0 ((@position - 1) * -(@iconsize + @iconpadd));
   }
-  .sprite(vertical; @position; @iconsize; @iconpadd) when (@position == 1) {
+  .sprite(vertical; @position; @iconsize; @iconpadd) when (@position = 1) {
     background-position: 0 0;
   }
 }
diff --git a/xmeter.css b/xmeter.css
@@ -1,6 +1,6 @@
 /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*\
     xmeter
-    Version: 3.5.0
+    Version: 3.6.0
     Licence: MIT
     Repo   : https://github.com/chharvey/xmeter.git
     Home   : https://chharvey.github.io/xmeter/

diff --git a/xmeter.less b/xmeter.less
@@ -1,7 +1,7 @@
 
 /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*\
     xmeter
-    Version: 3.5.0
+    Version: 3.6.0
     Licence: MIT
     Repo   : https://github.com/chharvey/xmeter.git
     Home   : https://chharvey.github.io/xmeter/