Merge branch 'fix'; tag v6.1.1

chharvey · Nov 1, 2017 · d3991d3 · d3991d3 · chharvey · Nov 1, 2017
2 parents 4d0a6ac + 94f78f5
commit d3991d3
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 17 deletions.
diff --git a/css/src/_base.less b/css/src/_base.less
@@ -281,14 +281,7 @@ br {
     font-style: italic;
   }
   mark {
-    // let ins = Color.fromString('#acf2bd') // GitHub-flavored green
-    // let del = Color.fromString('#fdb8c0') // GitHub-flavored red
-    // let mark = Color.fromHSL(...[
-    //   (ins.hslHue + del.hslHue)/2,
-    //   (ins.hslSat + del.hslSat)/2,
-    //   (ins.hslLum + del.hslLum)/2,
-    // ]).invert()
-    background-color: #f3f8b1;
+    background-color: fadeout(#ffe168, 50%); // Google-flavored comments in Google Docs
   }
   u {
     text-decoration: underline; // HACK fallback
@@ -309,10 +302,10 @@ br {
   //    ## Documentation
   //--------------------------------//
   ins {
-    background-color: #acf2bd; // GitHub-flavored
+    background-color: #acf2bd; // GitHub-flavored diff
   }
   del {
-    background-color: #fdb8c0; // GitHub-flavored
+    background-color: #fdb8c0; // GitHub-flavored diff
   }
   dfn {
     font-style: inherit; // undo Normalize

diff --git a/css/src/_o-Tablist.less b/css/src/_o-Tablist.less
@@ -1,6 +1,6 @@
 
 /*################################*\
-    neo  |  _o-Tablist.less
+    xmeter  |  _o-Tablist.less
 \*################################*/
 
 
@@ -69,6 +69,10 @@
 //
 // Styleguide Objects.Tablist
 .o-Tablist {
+  display: contents;
+  width: 100%; // FIXME HTML Spec bug: <https://thatemil.com/blog/2017/07/01/fixing-fieldsets/>
+
+  //---- if `display:contents` is not supported, unset all box styles: ----//
   margin-top  : 0; margin-top  : initial; // HACK fallbacks
   margin-left : 0; margin-left : initial; // HACK fallbacks
   margin-right: 0; margin-right: initial; // HACK fallbacks

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

diff --git a/css/xmeter.css b/css/xmeter.css
diff --git a/css/xmeter.css.map b/css/xmeter.css.map
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "xmeter",
-  "version": "6.1.0",
+  "version": "6.1.1",
   "description": "A default stylesheet with a set of tools that make designing with vertical rhythm easy.",
   "main": "index.js",
   "dependencies": {

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