Merge branch 'fix' into gh-pages ; tag: v4.0.1

chharvey · Mar 26, 2016 · fe806e1 · fe806e1
2 parents 53d04a4 + c68aad3
commit fe806e1
Show file tree

Hide file tree

Showing 17 changed files with 156 additions and 254 deletions.
diff --git a/README.md b/README.md
@@ -52,7 +52,7 @@ at the top of your stylesheet. Then when you want to “call” the mixin, do
 }
 ```
 
-To use the xmeter variables, import the `__settings` stylesheet.
+To use the Xmeter global variables, import the `__settings` stylesheet.
 
 ```less
 @import (reference) url('/node_modules/xmeter/src/__settings.less');

diff --git a/doc/styles/doc.css b/doc/styles/doc.css
@@ -0,0 +1,30 @@
+/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*\
+    xmeter
+\*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
+/*================================*\
+    doc.less
+\*================================*/
+body {
+  background-image: url('https://chharvey.github.io/core/images/crossgrid-lined.svg');
+  background-size: 1px 24px;
+  background-repeat: repeat;
+  background-position: left top;
+}
+.x-c-Code {
+  padding: 1px 2px;
+  border-radius: 3px;
+  background-color: #f4f8f0;
+  color: #008080;
+}
+.x-c-Fig {
+  margin-left: 1rem;
+  margin-right: 1rem;
+  padding: 0.75rem 0.5rem;
+  border-width: 1px;
+  margin-top: -2px;
+  border-style: solid;
+  border-color: #e5eaef;
+  border-radius: 8px;
+  position: relative;
+  background: rgba(245, 250, 255, 0.5);
+}
diff --git a/doc/styles/doc.less b/doc/styles/doc.less
@@ -1,5 +1,3 @@
-@import (reference) url('../../src/__settings.less');
-@import (reference) url('../../src/__tool.module.borders.less');
 
 /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*\
     xmeter
@@ -9,6 +7,8 @@
 /*================================*\
     doc.less
 \*================================*/
+@import (reference) url('../../src/__settings.less');
+@import (reference) url('../../src/__tool.module.borders.less');
 
 
 // Stylesheet for Xmeter documentation files.
@@ -18,7 +18,7 @@ body {
   background-image: url('https://chharvey.github.io/core/images/crossgrid-lined.svg');
   background-size: 1px 24px;
   background-repeat: repeat;
-  background-position: left bottom;
+  background-position: left top;
 }
 .x-c-Code {
   padding: 1px 2px;

diff --git a/doc/test.html b/doc/test.html
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "xmeter",
-  "version": "4.0.0",
+  "version": "4.0.1",
   "description": "A default stylesheet with a set of tools that make designing with vertical rhythm easy.",
   "main": "xmeter.css",
   "dependencies": {},

diff --git a/src/__settings.less b/src/__settings.less
@@ -16,7 +16,6 @@
 // - IE9 and IE10 on the `font` shorthand property and on pseudo-elements/classes
 
 @g-font_size: 100%; // defined by user agent
-@g-font_size: @g-1rem; // HACK fixes Chrome inheritance bug
 @g-line_height: 1.5;
 @g-vru_px: (@g-line_height * @g-1rem); // fallback for @g-vru, which is in rems
 @g-vru:    (@g-line_height *  1rem);

diff --git a/src/_base.forms.less b/src/_base.forms.less
@@ -9,7 +9,7 @@
 
 
 @p-color_gray_fb: #c0c0c0; // fallback
-@p-color_gray:    fadeout(#000, 75%);
+@p-color_gray: fadeout(#000, 75%);
 
 // consistent borders for all
 fieldset,

diff --git a/src/_base.generic.less b/src/_base.generic.less
@@ -24,12 +24,6 @@
   }
 }
 
-// [1] addresses support for `rem` units (otherwise these would be in `body` selector)
-html {
-  font-size: @g-font_size;     // [1]
-  line-height: @g-line_height; // [1]
-}
-
 // Vertical spacing between typographical blocks
 h1, h2, h3, h4, h5, h6,
 p, pre, figure, blockquote,
@@ -51,25 +45,22 @@ span, br,
 em, strong, i, mark, u, small,
 dfn, b, abbr, var, q, cite, sup, sub,
 data, time, code, kbd, samp {
-  display: inline;
   line-height: 0;
 }
 
 // Elements with a transparent content model
-// should inherit their display and line-height, except
-// if they are inside an element containing
-// only text and/or other inline elements.
-// This behavior may be overrided with classes/inline styles.
+// should display what their contents display.
 a, s, ins, del {
-  display: inherit;
-  line-height: inherit;
-  h1 > &, h2 > &, h3 > &, h4 > &, h5 > &, h6 > &,
-  p > &, pre > &,
-  figure > &, figcaption > &, blockquote > &,
-  li > &, dt > &, dd > &,
-  caption > &, th > &, td > &,
-  legend > &, summary > & {
-    display: inline;
-    line-height: 0;
-  }
+  // display: inherit;
+  // line-height: inherit;
+  // h1 > &, h2 > &, h3 > &, h4 > &, h5 > &, h6 > &,
+  // p > &, pre > &,
+  // figure > &, figcaption > &, blockquote > &,
+  // li > &, dt > &, dd > &,
+  // caption > &, th > &, td > &,
+  // legend > &, summary > & {
+  //   display: inline;
+  //   line-height: 0;
+  // }
+  display: contents;
 }
diff --git a/src/_base.grouping.less b/src/_base.grouping.less
@@ -6,3 +6,7 @@
 
 div {
 }
+
+hr {
+  display: none;
+}
diff --git a/src/_base.grouping.paras.less b/src/_base.grouping.paras.less
@@ -7,7 +7,6 @@
 p {
 }
 pre {
-  // makes block code look pretty
   text-align: left;
   text-indent: 0;
   white-space: pre;

diff --git a/src/_base.sections.less b/src/_base.sections.less
@@ -7,6 +7,17 @@
 @import (reference) url('__tool.module.fontsize.less');
 
 
+html,
+body {
+  width: 100%;
+  height: 100%;
+}
+html {
+  // addresses support for `rem` units (otherwise these would be in `body` selector)
+  font-size: @g-font_size;
+  font-size: @g-1rem; // HACK fixes Chrome inheritance bug
+  line-height: @g-line_height;
+}
 body {
 }
 main {
@@ -41,9 +52,5 @@ h1 {
   .spacing-top(@g-vru);
 }
 
-hr {
-  display: none;
-}
-
 address {
 }
diff --git a/src/_base.text.doctext.less b/src/_base.text.doctext.less
@@ -5,108 +5,34 @@
 @import (reference) url('__tool.module.delims.less');
 
 
-// A span or block of text that has been inserted into a document.
-// This is used to explicitly indicate that the text has been intentionally inserted.
-//
-// ^author
-// : Chris Harvey
-// ^updated
-// : 2014-06-13
 ins {
   background: #a6f3a6; // GitHub-flavored
   // background: #d1e1ad; // StackOverflow-flavored
 }
-// A span or block of text that has been deleted from a document.
-// This is used to explicitly indicate that the text has been intentionally deleted.
-//
-// ^author
-// : Chris Harvey
-// ^updated
-// : 2014-06-13
 del {
   background: #f8cbcb; // GitHub-flavored
   // background: #e5bdb2; // StackOverflow-flavored
 }
-// A vocabulary term.
-// Every `dfn` should have an `id` attribute, thus there must only be one `dfn` per page that
-// contains a given term in question. Furthermore, hyperlinks can point to the defining instance
-// of the term.
-//
-// ^author
-// : Chris Harvey
-// ^updated
-// : 2015-02-10
 dfn {
   font-style: inherit; // undo Normalize
   font-weight: 700;
 }
-// A keyword, technical or specific term, or key phrase
-// A `b` Element is any generic keyword or term, whose definition is not present. If the term is
-// being defined, use the `dfn` Element.
-//
-// ^author
-// : Chris Harvey
-// ^updated
-// : 2015-11-05
 b {
   font-weight: 700;
 }
-// An abbreviation or acronym.
-// The `[title]` attribute should contain the expanded term.
-// ```
-// <abbr title="United States of America">U.S.A.</abbr>
-// ```
-//
-// ^author
-// : Chris Harvey
-// ^updated
-// : 2015-03-07
 abbr {
   &[title] {
     cursor: help;
     border-bottom: 0; // undo Normalize
   }
 }
-// A placeholder for some textual element. Could be a filename, etc.
-// This does *not* represent a variable in a `code`, e.g., the following HTML would be incorrect:
-// ```
-// <code>String <var>$welcome</var> = "Hello world!";</code>
-// ```
-// It would be better to use a `span` with a class for syntax coloring.
-//
-// Rather, the `var` Element represents a placeholder of text. The following HTML is correct:
-// ```
-// <p>The following git commmand shows you diff:
-// <code>$ git diff <var>filepath</var></code>
-// where <var>filepath</var> is the path or name of the file you want to see the diff for.</p>
-// ```
-//
-// ^author
-// : Chris Harvey
-// ^updated
-// : 2014-07-21
 var {
   font-style: italic;
 }
-// An inline quotation: a span of text that is taken directly from another source
-// (real or fictional).
-//
-// ^author
-// : Chris Harvey
-// ^updated
-// : 2014-11-05
 q {
   .quotes-double(); // fallback for `initial`
   quotes: initial;
 }
-// Represents a placeholder reference to a name or title of a heading, section, figure,
-// table (or column in a table), or creative work.
-// This Object may also represent a proper noun traditionally italicized, e.g. periodical name or ship name.
-//
-// ^author
-// : Chris Harvey
-// ^updated
-// : 2015-02-10
 cite {
   font-style: italic;
 }

diff --git a/src/_base.text.links.less b/src/_base.text.links.less
@@ -8,9 +8,6 @@ a {
   color: #00e;       // default :link
   // color: #551a8b; // default :visited
   // color: #f00;    // default :active
-  // NOTE: these used to be under `a[href]`, which selected both `a:link` and `a:visited`,
-  // in order to override browser default styles. However for some reason this works,
-  // so keeping it under `a`.
 }
 a:not([href]) {
   @media screen {

diff --git a/src/_base.text.stress.less b/src/_base.text.stress.less
@@ -4,75 +4,24 @@
 \*################################*/
 
 
-// Emphasized text represents words or phrases that are stressed, as if the tone of voice would be
-// affected. More importantly, **the placement of stress should affect the meaning of the passage**.
-// If the emphasis were to be removed or relocated, the passage’s meaning should change.
-//
-// ^author
-// : Chris Harvey
-// ^updated
-// : 2015-02-10
 em {
   font-style: italic;
 }
-// Strong text has a level of importance. Important text does not necessarily affect tone of voice
-// (although it may), but rather upsets the normal prose by causing the reader to examine the text
-// more carefully. The placement of importance should not affect the meaning of the passage.
-//
-// ^author
-// : Chris Harvey
-// ^updated
-// : 2015-11-05
 strong {
   font-weight: 700;
 }
-// A phrase interpreted in an alternate voice or mood, without carrying extra emphasis,
-// such as scare quotes and mentions.
-// Or a phrase in a foreign language, such as the taxonomic classification (in Latin) of an organism.
-// (If a foreign language, be sure to add the `[lang]` attribute.)
-//
-// ^author
-// : Chris Harvey
-// ^updated
-// : 2015-07-23
 i {
   font-style: italic;
 }
-// A span of text that is relevant in some context. It is advisable to use the `[class]` attribute
-// to indicate the context in which the span is relevant.
-//
-// ^author
-// : Chris Harvey
-// ^updated
-// : 2014-08-05
 mark {
 }
-// A span of text to which the reader’s attention should be brought for purposes of illustration.
-// This span is typically in a figure or example.
-//
-// ^author
-// : Chris Harvey
-// ^updated
-// : 2014-08-05
 u {
   text-decoration: underline;
   color: #080;
 }
-// side comments.
-//
-// ^author
-// : Chris Harvey
-// ^updated
-// : 2015-02-10
 small {
   font-size: 0.75em;
 }
-// text that is shown to be no longer relevant.
-//
-// ^author
-// : Chris Harvey
-// ^updated
-// : 2015-02-10
 s {
   text-decoration: line-through;
   color: #b00;