Merge branch 'fix'; tag v5.7.2

chharvey · Jul 26, 2017 · ea96028 · ea96028 · chharvey · Jul 26, 2017
2 parents 045c9cb + 3f96c04
commit ea96028
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 10 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "xmeter",
-  "version": "5.7.1",
+  "version": "5.7.2",
   "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.fontsize.less b/src/__tool.fontsize.less
@@ -3,6 +3,7 @@
     xmeter  |  __tool.fontsize.less
 \*################################*/
 @import (reference) url('__settings.less');
+@import (reference) url('__tool.vertspacing.less');
 
 
 // Sets the font size of a module while preserving vertical rhythm.

diff --git a/src/_base.less b/src/_base.less
@@ -353,9 +353,13 @@ br {
   code, kbd, samp {
     font-size: (@g-font_size_mill * 1em);
     white-space: nowrap;
-    code, kbd, samp {
+    & & {
       font-size: inherit; // undo compounding font sizes
     }
+    pre & {
+      white-space: inherit; // HACK fallback
+      white-space: unset; // sometimes people put a `code` in a `pre` // override `nowrap` above
+    }
   }
   code {
   }
@@ -406,6 +410,10 @@ textarea {
   .font-size-mod(@g-font_size_mill);
 }
 
+input[type="button"],
+input[type="reset"],
+input[type="submit"],
+button,
 label {
   cursor: pointer;
 }

diff --git a/xmeter.css b/xmeter.css
@@ -1,6 +1,6 @@
 /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*\
     xmeter
-    Version: 5.7.1
+    Version: 5.7.2
     Licence: MIT
     Repo   : https://github.com/chharvey/xmeter.git
     Home   : https://github.com/chharvey/xmeter#readme
@@ -803,16 +803,22 @@ samp {
   white-space: nowrap;
 }
 code code,
-kbd code,
-samp code,
 code kbd,
-kbd kbd,
-samp kbd,
 code samp,
+kbd code,
+kbd kbd,
 kbd samp,
+samp code,
+samp kbd,
 samp samp {
   font-size: inherit;
 }
+pre code,
+pre kbd,
+pre samp {
+  white-space: inherit;
+  white-space: unset;
+}
 fieldset {
   padding: 0 1rem;
 }
@@ -872,6 +878,10 @@ textarea h1 {
   padding-top: 1.125rem;
   padding-top: var(--vru);
 }
+input[type="button"],
+input[type="reset"],
+input[type="submit"],
+button,
 label {
   cursor: pointer;
 }

diff --git a/xmeter.less b/xmeter.less
@@ -1,7 +1,7 @@
 
 /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*\
     xmeter
-    Version: 5.7.1
+    Version: 5.7.2
     Licence: MIT
     Repo   : https://github.com/chharvey/xmeter.git
     Home   : https://github.com/chharvey/xmeter#readme

diff --git a/xmeter.min.css b/xmeter.min.css
diff --git a/xmeter.min.css.map b/xmeter.min.css.map