Merge branch 'stage-v5.3.1'

NOTE: unusual branch name: staging branch for a minor version release
chharvey · Nov 22, 2016 · df47f00 · df47f00
2 parents ae28c86 + f43c30b
commit df47f00
Show file tree

Hide file tree

Showing 75 changed files with 2,075 additions and 58 deletions.
diff --git a/.gitignore b/.gitignore
@@ -30,4 +30,3 @@ node_modules
 .lock-wscript
 
 # Compiled source files
-build/
diff --git a/docs/_includes/atom.font-size.docs.jade → docs/_includes/_atom.font-size.jade b/docs/_includes/atom.font-size.docs.jade → docs/_includes/_atom.font-size.jade
diff --git a/docs/_includes/atom.margin-bottom.docs.jade → docs/_includes/_atom.margin-bottom.jade b/docs/_includes/atom.margin-bottom.docs.jade → docs/_includes/_atom.margin-bottom.jade
diff --git a/docs/_includes/atom.padding-top.docs.jade → docs/_includes/_atom.padding-top.jade b/docs/_includes/atom.padding-top.docs.jade → docs/_includes/_atom.padding-top.jade
diff --git a/docs/_includes/_base.jade b/docs/_includes/_base.jade
diff --git a/docs/_includes/h-Block.docs.jade → docs/_includes/_help.block.jade b/docs/_includes/h-Block.docs.jade → docs/_includes/_help.block.jade
diff --git a/docs/_includes/h-Clearfix.docs.jade → docs/_includes/_help.clearfix.jade b/docs/_includes/h-Clearfix.docs.jade → docs/_includes/_help.clearfix.jade
diff --git a/docs/_includes/h-Inline.docs.jade → docs/_includes/_help.inline.jade b/docs/_includes/h-Inline.docs.jade → docs/_includes/_help.inline.jade
diff --git a/docs/_includes/o-Flex.docs.jade → docs/_includes/_obj.flex-object.jade b/docs/_includes/o-Flex.docs.jade → docs/_includes/_obj.flex-object.jade
diff --git a/docs/_includes/o-Grid.docs.jade → docs/_includes/_obj.grid-object.jade b/docs/_includes/o-Grid.docs.jade → docs/_includes/_obj.grid-object.jade
diff --git a/docs/_includes/o-List.docs.jade → docs/_includes/_obj.list-object.jade b/docs/_includes/o-List.docs.jade → docs/_includes/_obj.list-object.jade
diff --git a/docs/_includes/base.docs.jade b/docs/_includes/base.docs.jade
@@ -1,3 +1,6 @@
+//--------------------------------
+//- CHANGED DEPRECATED Do Not Touch This File. leaving here until v6
+//--------------------------------
 - classname = classname || {}
 section#grouping-elements
   block groupingElements

diff --git a/docs/models/classes/Xmeter.class.js → docs/_models/classes/Xmeter.class.js b/docs/models/classes/Xmeter.class.js → docs/_models/classes/Xmeter.class.js
@@ -47,7 +47,7 @@ module.exports = (function () {
           .description('Somewhat explicit classes used for enhancing default styles.')
           .add(new Page({ name: 'Block'            , url: 'help.html#block' }))
           .add(new Page({ name: 'Inline'           , url: 'help.html#inline' }))
-          .add(new Page({ name: 'Clearfix'         , url: 'help.html#cleafix' }))
+          .add(new Page({ name: 'Clearfix'         , url: 'help.html#clearfix' }))
         )
         .add(new Page({ name: 'Atoms', url: 'atom.html' })
           .description('Very specific classes used for creating anomalies or fixing broken styles.')

diff --git a/docs/models/options.js → docs/_models/options.js b/docs/models/options.js → docs/_models/options.js
diff --git a/docs/atom.jade b/docs/atom.jade
@@ -5,8 +5,8 @@ block append vars
 
 block append main
   +newSection(2, Xmeter.DOCS.find('atom.html#margin-bottom'))
-    include _includes/atom.margin-bottom.docs.jade
+    include _includes/_atom.margin-bottom.jade
   +newSection(2, Xmeter.DOCS.find('atom.html#padding-top'))
-    include _includes/atom.padding-top.docs.jade
+    include _includes/_atom.padding-top.jade
   +newSection(2, Xmeter.DOCS.find('atom.html#font-size'))
-    include _includes/atom.font-size.docs.jade
+    include _includes/_atom.font-size.jade
diff --git a/docs/base.jade b/docs/base.jade
@@ -11,4 +11,4 @@ block append vars
     }
 
 block append main
-  include _includes/base.docs.jade
+  include _includes/_base.jade
diff --git a/docs/help.html b/docs/help.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html><html lang="en"><head><title>Helpers | Xmeter</title><meta charset="utf-8"><meta name="description" content="A demo of Xmeter styles."><meta name="viewport" content="width=device-width, initial-scale=1"><link rel="stylesheet" href="../xmeter.css"><link rel="stylesheet" href="styles/docs.css"></head><body class="docs-body"><main class="docs-main"><header><h1><a href="/docs/">Xmeter</a> &mdash; Helpers</h1><p>Somewhat explicit classes used for enhancing default styles.</p><nav><h2>Table of Contents</h2><ol><li><a href="help.html#block">Block</a></li><li><a href="help.html#inline">Inline</a></li><li><a href="help.html#cleafix">Clearfix</a></li></ol></nav></header><section id="block"><h2>Block <a class="docs-_fragid" href="#block"></a></h2><p>The Block Helper creates a blocky look,
+<!DOCTYPE html><html lang="en"><head><title>Helpers | Xmeter</title><meta charset="utf-8"><meta name="description" content="A demo of Xmeter styles."><meta name="viewport" content="width=device-width, initial-scale=1"><link rel="stylesheet" href="../xmeter.css"><link rel="stylesheet" href="styles/docs.css"></head><body class="docs-body"><main class="docs-main"><header><h1><a href="/docs/">Xmeter</a> &mdash; Helpers</h1><p>Somewhat explicit classes used for enhancing default styles.</p><nav><h2>Table of Contents</h2><ol><li><a href="help.html#block">Block</a></li><li><a href="help.html#inline">Inline</a></li><li><a href="help.html#clearfix">Clearfix</a></li></ol></nav></header><section id="block"><h2>Block <a class="docs-_fragid" href="#block"></a></h2><p>The Block Helper creates a blocky look,
 with an inherited line-height to maintain vertical rhythm.</p><figure class="docs-figure"><p>Albert Einstein was made famous by his equation
 <b class="h-Block" style="text-align:center">E = mc<sup>2</sup></b>
 which explains the relationship between energy and mass.</p><pre class="docs-pre">&lt;p&gt;... his famous equation
@@ -9,7 +9,7 @@
   &lt;li class="<u>h-Inline</u>"&gt;spacetime &lt;/li&gt;
   &lt;li class="<u>h-Inline</u>"&gt;black hole &lt;/li&gt;
   ...
-&lt;/ul&gt;</pre></figure></section><section id="cleafix"><h2>Clearfix <a class="docs-_fragid" href="#cleafix"></a></h2><p>The Clearfix Helper creates a line break after an element.
+&lt;/ul&gt;</pre></figure></section><section id="clearfix"><h2>Clearfix <a class="docs-_fragid" href="#clearfix"></a></h2><p>The Clearfix Helper creates a line break after an element.
 This could be a container of floats, or it could simply be an inline list item.
 Use this as an alternative to the <code class="docs-code">br</code> element.</p><figure class="docs-figure"><div class="h-Clearfix"><div style="font-weight: 700; float:  left">gravity</div><div style="font-weight: 700; float: right">supernova</div></div><div>spacetime black hole singularity</div><pre class="docs-pre">&lt;div class="<u>h-Clearfix</u>"&gt;
   &lt;div style="float:  left;"&gt;gravity&lt;/div&gt;

diff --git a/docs/help.jade b/docs/help.jade
@@ -5,8 +5,8 @@ block append vars
 
 block append main
   +newSection(2, Xmeter.DOCS.find('help.html#block'))
-    include _includes/h-Block.docs.jade
+    include _includes/_help.block.jade
   +newSection(2, Xmeter.DOCS.find('help.html#inline'))
-    include _includes/h-Inline.docs.jade
-  +newSection(2, Xmeter.DOCS.find('help.html#cleafix'))
-    include _includes/h-Clearfix.docs.jade
+    include _includes/_help.inline.jade
+  +newSection(2, Xmeter.DOCS.find('help.html#clearfix'))
+    include _includes/_help.clearfix.jade
diff --git a/docs/index.html b/docs/index.html
@@ -1 +1 @@
-<!DOCTYPE html><html lang="en"><head><title>Xmeter Style Guide</title><meta charset="utf-8"><meta name="description" content="A demo of Xmeter styles."><meta name="viewport" content="width=device-width, initial-scale=1"><link rel="stylesheet" href="../xmeter.css"><link rel="stylesheet" href="styles/docs.css"></head><body class="docs-body"><main class="docs-main"><header><h1>Xmeter Style Guide</h1><p>A demo of Xmeter styles.</p><nav><h2>Table of Contents</h2><ol><li><a href="index.html">Xmeter</a>: A demo of Xmeter styles.</li><li><a href="base.html">Base Typography</a>: Bare, unstyled HTML elements. No classes.<ol><li><a href="base.html#grouping-elements">Grouping Elements</a><ol><li><a href="base.html#headings-paragraphs">Headings &amp; Paragraphs</a></li><li><a href="base.html#lists">Lists</a></li><li><a href="base.html#tables">Tables</a></li></ol></li><li><a href="base.html#text-level-elements">Text-Level Elements</a><ol><li><a href="base.html#links">Links</a></li><li><a href="base.html#stress">Stress</a></li><li><a href="base.html#documentation">Documentation</a></li><li><a href="base.html#data">Data</a></li></ol></li><li><a href="base.html#forms">Forms</a></li><li><a href="base.html#embedded-elements">Embedded Elements</a></li><li><a href="base.html#interactive-elements">Interactive Elements</a></li></ol></li><li><a href="obj.html">Objects</a>: Patterns of structure that can be reused many times for many different purposes.<ol><li><a href="obj.html#list-object">The List Object</a></li><li><a href="obj.html#flex-object">The Flex Object</a></li><li><a href="obj.html#grid-object">The Grid Object</a></li></ol></li><li><a href="help.html">Helpers</a>: Somewhat explicit classes used for enhancing default styles.<ol><li><a href="help.html#block">Block</a></li><li><a href="help.html#inline">Inline</a></li><li><a href="help.html#cleafix">Clearfix</a></li></ol></li><li><a href="atom.html">Atoms</a>: Very specific classes used for creating anomalies or fixing broken styles.<ol><li><a href="atom.html#margin-bottom">margin-bottom</a></li><li><a href="atom.html#padding-top">padding-top</a></li><li><a href="atom.html#font-size">font-size</a></li></ol></li></ol></nav></header></main></body></html>
+<!DOCTYPE html><html lang="en"><head><title>Xmeter Style Guide</title><meta charset="utf-8"><meta name="description" content="A demo of Xmeter styles."><meta name="viewport" content="width=device-width, initial-scale=1"><link rel="stylesheet" href="../xmeter.css"><link rel="stylesheet" href="styles/docs.css"></head><body class="docs-body"><main class="docs-main"><header><h1>Xmeter Style Guide</h1><p>A demo of Xmeter styles.</p><nav><h2>Table of Contents</h2><ol><li><a href="index.html">Xmeter</a>: A demo of Xmeter styles.</li><li><a href="base.html">Base Typography</a>: Bare, unstyled HTML elements. No classes.<ol><li><a href="base.html#grouping-elements">Grouping Elements</a><ol><li><a href="base.html#headings-paragraphs">Headings &amp; Paragraphs</a></li><li><a href="base.html#lists">Lists</a></li><li><a href="base.html#tables">Tables</a></li></ol></li><li><a href="base.html#text-level-elements">Text-Level Elements</a><ol><li><a href="base.html#links">Links</a></li><li><a href="base.html#stress">Stress</a></li><li><a href="base.html#documentation">Documentation</a></li><li><a href="base.html#data">Data</a></li></ol></li><li><a href="base.html#forms">Forms</a></li><li><a href="base.html#embedded-elements">Embedded Elements</a></li><li><a href="base.html#interactive-elements">Interactive Elements</a></li></ol></li><li><a href="obj.html">Objects</a>: Patterns of structure that can be reused many times for many different purposes.<ol><li><a href="obj.html#list-object">The List Object</a></li><li><a href="obj.html#flex-object">The Flex Object</a></li><li><a href="obj.html#grid-object">The Grid Object</a></li></ol></li><li><a href="help.html">Helpers</a>: Somewhat explicit classes used for enhancing default styles.<ol><li><a href="help.html#block">Block</a></li><li><a href="help.html#inline">Inline</a></li><li><a href="help.html#clearfix">Clearfix</a></li></ol></li><li><a href="atom.html">Atoms</a>: Very specific classes used for creating anomalies or fixing broken styles.<ol><li><a href="atom.html#margin-bottom">margin-bottom</a></li><li><a href="atom.html#padding-top">padding-top</a></li><li><a href="atom.html#font-size">font-size</a></li></ol></li></ol></nav></header></main></body></html>
diff --git a/docs/obj.jade b/docs/obj.jade
@@ -5,8 +5,8 @@ block append vars
 
 block append main
   +newSection(2, Xmeter.DOCS.find('obj.html#list-object'))
-    include _includes/o-List.docs.jade
+    include _includes/_obj.list-object.jade
   +newSection(2, Xmeter.DOCS.find('obj.html#flex-object'))
-    include _includes/o-Flex.docs.jade
+    include _includes/_obj.flex-object.jade
   +newSection(2, Xmeter.DOCS.find('obj.html#grid-object'))
-    include _includes/o-Grid.docs.jade
+    include _includes/_obj.grid-object.jade
diff --git a/docs/styles/docs.less b/docs/styles/docs.less
@@ -7,8 +7,8 @@
 /*================================*\
     docs.less
 \*================================*/
-@import (reference) url('../../src/__settings.less');
-@import (reference) url('../../src/__tool.borders.less');
+@import (reference) url('../../styles/__settings.less');
+@import (reference) url('../../styles/__tool.borders.less');
 
 
 // Stylesheet for Xmeter documentation files.

diff --git a/package.json b/package.json
@@ -1,27 +1,26 @@
 {
   "name": "xmeter",
-  "version": "5.3.0",
+  "version": "5.3.1",
   "description": "A default stylesheet with a set of tools that make designing with vertical rhythm easy.",
   "main": "xmeter.css",
   "dependencies": {},
   "devDependencies": {
     "clean-css": "^3.4.17",
     "jade": "^1.11.0",
     "less": "^2.7.1",
-    "lessc-each": "^1.1.0",
     "normalize.css": "^5.0.0",
     "pug-cli": "^1.0.0-alpha6",
     "sitepage": "^1.0.0"
   },
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
-    "jade:docs": "pug -O docs/models/options.js docs/{index,base,obj,help,atom}.jade",
+    "jade:docs": "pug -O docs/_models/options.js docs/{index,base,obj,help,atom}.jade",
     "jade:all": "jade index.jade  &&  npm run jade:docs",
     "lessc:docs": "lessc docs/styles/docs.less docs/styles/docs.css",
-    "lessc:xmeter": "lessc-each src/ build/  &&  lessc xmeter.less xmeter.css",
+    "lessc:xmeter": "lessc xmeter.less xmeter.css",
     "lessc:all": "npm run lessc:docs  &&  npm run lessc:xmeter",
     "minify": "cleancss xmeter.css -o xmeter.min.css",
-    "unbuild": "rm docs/{index,base,obj,help,atom}.html {docs/styles/docs,xmeter,xmeter.min}.css  &&  rm -r build/",
+    "unbuild": "rm docs/{index,base,obj,help,atom}.html {docs/styles/docs,xmeter,xmeter.min}.css",
     "build": "npm run jade:all  &&  npm run lessc:all  &&  npm run minify"
   },
   "repository": {

diff --git a/src/README.md b/src/README.md
@@ -0,0 +1,7 @@
+**IMPORTANT**
+
+This folder, `/src/`, is *DEPRECATED* and left here for backwards-compatibility.
+Do not reference or `@import` any files from this folder.
+Instead, reference files in `/styles/`.
+
+This folder will be DELETED in v6.
Original file line number	Diff line number	Diff line change
Expand Up		@@ -30,4 +30,3 @@ node_modules
		.lock-wscript

		# Compiled source files
		build/
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<!DOCTYPE html><html lang="en"><head><title>Xmeter Style Guide</title><meta charset="utf-8"><meta name="description" content="A demo of Xmeter styles."><meta name="viewport" content="width=device-width, initial-scale=1"><link rel="stylesheet" href="../xmeter.css"><link rel="stylesheet" href="styles/docs.css"></head><body class="docs-body"><main class="docs-main"><header><h1>Xmeter Style Guide</h1><p>A demo of Xmeter styles.</p><nav><h2>Table of Contents</h2><ol><li><a href="index.html">Xmeter</a>: A demo of Xmeter styles.</li><li><a href="base.html">Base Typography</a>: Bare, unstyled HTML elements. No classes.<ol><li><a href="base.html#grouping-elements">Grouping Elements</a><ol><li><a href="base.html#headings-paragraphs">Headings & Paragraphs</a></li><li><a href="base.html#lists">Lists</a></li><li><a href="base.html#tables">Tables</a></li></ol></li><li><a href="base.html#text-level-elements">Text-Level Elements</a><ol><li><a href="base.html#links">Links</a></li><li><a href="base.html#stress">Stress</a></li><li><a href="base.html#documentation">Documentation</a></li><li><a href="base.html#data">Data</a></li></ol></li><li><a href="base.html#forms">Forms</a></li><li><a href="base.html#embedded-elements">Embedded Elements</a></li><li><a href="base.html#interactive-elements">Interactive Elements</a></li></ol></li><li><a href="obj.html">Objects</a>: Patterns of structure that can be reused many times for many different purposes.<ol><li><a href="obj.html#list-object">The List Object</a></li><li><a href="obj.html#flex-object">The Flex Object</a></li><li><a href="obj.html#grid-object">The Grid Object</a></li></ol></li><li><a href="help.html">Helpers</a>: Somewhat explicit classes used for enhancing default styles.<ol><li><a href="help.html#block">Block</a></li><li><a href="help.html#inline">Inline</a></li><li><a href="help.html#cleafix">Clearfix</a></li></ol></li><li><a href="atom.html">Atoms</a>: Very specific classes used for creating anomalies or fixing broken styles.<ol><li><a href="atom.html#margin-bottom">margin-bottom</a></li><li><a href="atom.html#padding-top">padding-top</a></li><li><a href="atom.html#font-size">font-size</a></li></ol></li></ol></nav></header></main></body></html>
		<!DOCTYPE html><html lang="en"><head><title>Xmeter Style Guide</title><meta charset="utf-8"><meta name="description" content="A demo of Xmeter styles."><meta name="viewport" content="width=device-width, initial-scale=1"><link rel="stylesheet" href="../xmeter.css"><link rel="stylesheet" href="styles/docs.css"></head><body class="docs-body"><main class="docs-main"><header><h1>Xmeter Style Guide</h1><p>A demo of Xmeter styles.</p><nav><h2>Table of Contents</h2><ol><li><a href="index.html">Xmeter</a>: A demo of Xmeter styles.</li><li><a href="base.html">Base Typography</a>: Bare, unstyled HTML elements. No classes.<ol><li><a href="base.html#grouping-elements">Grouping Elements</a><ol><li><a href="base.html#headings-paragraphs">Headings & Paragraphs</a></li><li><a href="base.html#lists">Lists</a></li><li><a href="base.html#tables">Tables</a></li></ol></li><li><a href="base.html#text-level-elements">Text-Level Elements</a><ol><li><a href="base.html#links">Links</a></li><li><a href="base.html#stress">Stress</a></li><li><a href="base.html#documentation">Documentation</a></li><li><a href="base.html#data">Data</a></li></ol></li><li><a href="base.html#forms">Forms</a></li><li><a href="base.html#embedded-elements">Embedded Elements</a></li><li><a href="base.html#interactive-elements">Interactive Elements</a></li></ol></li><li><a href="obj.html">Objects</a>: Patterns of structure that can be reused many times for many different purposes.<ol><li><a href="obj.html#list-object">The List Object</a></li><li><a href="obj.html#flex-object">The Flex Object</a></li><li><a href="obj.html#grid-object">The Grid Object</a></li></ol></li><li><a href="help.html">Helpers</a>: Somewhat explicit classes used for enhancing default styles.<ol><li><a href="help.html#block">Block</a></li><li><a href="help.html#inline">Inline</a></li><li><a href="help.html#clearfix">Clearfix</a></li></ol></li><li><a href="atom.html">Atoms</a>: Very specific classes used for creating anomalies or fixing broken styles.<ol><li><a href="atom.html#margin-bottom">margin-bottom</a></li><li><a href="atom.html#padding-top">padding-top</a></li><li><a href="atom.html#font-size">font-size</a></li></ol></li></ol></nav></header></main></body></html>