Skip to content

Commit ae28c86

Browse files
author
Chris Harvey
committed
Merge branch 'stage-v5.3.0'
2 parents 0659e0e + 128eb91 commit ae28c86

33 files changed

+1645
-543
lines changed

‎docs/includes/_atom.font-size.docs.jade renamed to ‎docs/_includes/atom.font-size.docs.jade

File renamed without changes.

‎docs/includes/_atom.margin-bottom.docs.jade renamed to ‎docs/_includes/atom.margin-bottom.docs.jade

File renamed without changes.

‎docs/includes/_atom.padding-top.docs.jade renamed to ‎docs/_includes/atom.padding-top.docs.jade

File renamed without changes.

‎docs/_includes/base.docs.jade

+338
Large diffs are not rendered by default.

‎docs/includes/_h-Block.docs.jade renamed to ‎docs/_includes/h-Block.docs.jade

File renamed without changes.

‎docs/includes/_h-Clearfix.docs.jade renamed to ‎docs/_includes/h-Clearfix.docs.jade

File renamed without changes.

‎docs/includes/_h-Inline.docs.jade renamed to ‎docs/_includes/h-Inline.docs.jade

File renamed without changes.

‎docs/includes/_o-Flex.docs.jade renamed to ‎docs/_includes/o-Flex.docs.jade

File renamed without changes.

‎docs/includes/_o-Grid.docs.jade renamed to ‎docs/_includes/o-Grid.docs.jade

File renamed without changes.

‎docs/includes/_o-List.docs.jade renamed to ‎docs/_includes/o-List.docs.jade

File renamed without changes.

‎docs/atom.jade

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ block append vars
55

66
block append main
77
+newSection(2, Xmeter.DOCS.find('atom.html#margin-bottom'))
8-
include includes/_atom.margin-bottom.docs.jade
8+
include _includes/atom.margin-bottom.docs.jade
99
+newSection(2, Xmeter.DOCS.find('atom.html#padding-top'))
10-
include includes/_atom.padding-top.docs.jade
10+
include _includes/atom.padding-top.docs.jade
1111
+newSection(2, Xmeter.DOCS.find('atom.html#font-size'))
12-
include includes/_atom.font-size.docs.jade
12+
include _includes/atom.font-size.docs.jade

‎docs/base.jade

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ block append vars
1111
}
1212
1313
block append main
14-
include includes/_base.docs.jade
14+
include _includes/base.docs.jade

‎docs/help.jade

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ block append vars
55

66
block append main
77
+newSection(2, Xmeter.DOCS.find('help.html#block'))
8-
include includes/_h-Block.docs.jade
8+
include _includes/h-Block.docs.jade
99
+newSection(2, Xmeter.DOCS.find('help.html#inline'))
10-
include includes/_h-Inline.docs.jade
10+
include _includes/h-Inline.docs.jade
1111
+newSection(2, Xmeter.DOCS.find('help.html#cleafix'))
12-
include includes/_h-Clearfix.docs.jade
12+
include _includes/h-Clearfix.docs.jade

‎docs/includes/_base.docs.jade

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
//--------------------------------
2+
//- CHANGED DEPRECATED Do Not Touch This File. leaving here until v6
3+
//--------------------------------
14
- classname = classname || {}
25
section#grouping-elements
36
block groupingElements

‎docs/models/classes/Xmeter.class.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ module.exports = (function () {
99
// STATIC MEMBERS
1010
/**
1111
* The style guide site for this project.
12-
* @type {StyleGuide}
12+
* @type {Page}
1313
*/
1414
Xmeter.DOCS = (function () {
1515
var docs = new Page({ name: 'Xmeter', url: '/docs/' })

‎docs/obj.jade

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ block append vars
55

66
block append main
77
+newSection(2, Xmeter.DOCS.find('obj.html#list-object'))
8-
include includes/_o-List.docs.jade
8+
include _includes/o-List.docs.jade
99
+newSection(2, Xmeter.DOCS.find('obj.html#flex-object'))
10-
include includes/_o-Flex.docs.jade
10+
include _includes/o-Flex.docs.jade
1111
+newSection(2, Xmeter.DOCS.find('obj.html#grid-object'))
12-
include includes/_o-Grid.docs.jade
12+
include _includes/o-Grid.docs.jade

‎docs/tools.md

+16-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,22 @@ Watch out for changes.
4444

4545
### The Flexbox Tools
4646
```less
47-
.content { --status: 'coming soon...'; }
47+
.your-flex-container {
48+
.flexbox(); // display: flex;
49+
.flex-direction(!row | column | row-reverse | column-reverse);
50+
.flex-wrap(!nowrap | wrap | wrap-reverse);
51+
.flex-justify-content(!flex-start | flex-end | center | space-between | space-around);
52+
.flex-align-content(!stretch | flex-start | flex-end | center | space-between | space-around);
53+
.flex-align-items(!stretch | flex-start | flex-end | center | baseline);
54+
}
55+
.your-flex-item {
56+
.flex-align-self(!auto | strecth | flex-start | flex-end | center | baseline);
57+
.flex-order(<integer>?:0);
58+
.flex(none | [ <number>:0 <number>?:1 || <length>:auto ]);
59+
.flex-grow(<number>?:0);
60+
.flex-shrink(<number>?:1);
61+
.flex-basis(!auto | content | <length>);
62+
}
4863
```
4964

5065
### transform

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "xmeter",
3-
"version": "5.2.0",
3+
"version": "5.3.0",
44
"description": "A default stylesheet with a set of tools that make designing with vertical rhythm easy.",
55
"main": "xmeter.css",
66
"dependencies": {},

‎src/__fallback.flexbox.less

+8-1
Original file line numberDiff line numberDiff line change
@@ -202,11 +202,18 @@
202202
// the flex item is set to its content width, but
203203
// will either grow or shrink, based on
204204
// whether there is extra or not enough space in the container.
205+
// - `flex: 0;` (unitless zero) == `flex: 0 1 0%;`
206+
// The flex item starts at 0% or as close to it as possible.
207+
// It will not grow into extra space, if any.
208+
// If all items have `flex:0;`, they will be sized as small as possible.
205209
// - `flex: 1;` == `flex: 1 1 0%;`
206210
// The flex item starts at 0% but grows or shrinks as necessary
207211
// with the other items to fill or reduce the extra space.
208212
// If all items have `flex: 1` then they will be equal.
209213
// (If there are 4 items then they will all be 25%.)
214+
// - `flex: 0%;` (zero with unit) == `flex: 1 1 0%;`
215+
// Equivalent to `flex: 1;`.
216+
// Same as specifying `flex: 0px;`, `flex: 0rem;`, `flex: 0em;`, or any length 0 with unit.
210217
// - `flex: 50%;` == `flex: 1 1 50%;`
211218
// The flex item starts at 50% but grows or shrinks as necessary.
212219
//
@@ -217,7 +224,7 @@
217224
// : Chris Harvey
218225
// ^updated
219226
// : 2015-09-03
220-
.flex(@arg: initial) {
227+
.flex(@arg: 0 1 auto) {
221228
-webkit-box-flex: @arg;
222229
-moz-box-flex: @arg;
223230
-webkit-flex: @arg;

‎src/_atom.font-size.less

+61
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
2+
/*################################*\
3+
xmeter | _atom.font-size.less
4+
\*################################*/
5+
@import (reference) url('__settings.less');
6+
@import (reference) url('__tool.fontsize.less');
7+
8+
9+
// Sets font-size properties.
10+
// First group sets only font-size in ems;
11+
// second group uses the `.font-size-el()` mixin for vertical rhythm.
12+
// See `__tool.fontsize.less` for more info.
13+
//
14+
// ^author
15+
// : Chris Harvey
16+
// ^updated
17+
// : 2016-08-17
18+
.-fz-micr { font-size: @g-font_size_micr * 1em !important; }
19+
.-fz-mill { font-size: @g-font_size_mill * 1em !important; }
20+
.-fz-norm { font-size: @g-font_size_norm * 1em !important; }
21+
.-fz-kilo { font-size: @g-font_size_kilo * 1em !important; }
22+
.-fz-mega { font-size: @g-font_size_mega * 1em !important; }
23+
.-fz-giga { font-size: @g-font_size_giga * 1em !important; }
24+
.-fz-tera { font-size: @g-font_size_tera * 1em !important; }
25+
.-fz-peta { font-size: @g-font_size_peta * 1em !important; }
26+
27+
@media screen { .-fz-micr-s { .-fz-micr; } .-fz-mill-s { .-fz-mill; } .-fz-norm-s { .-fz-norm; } .-fz-kilo-s { .-fz-kilo; } .-fz-mega-s { .-fz-mega; } .-fz-giga-s { .-fz-giga; } .-fz-tera-s { .-fz-tera; } .-fz-peta-s { .-fz-peta; } }
28+
@media print { .-fz-micr-p { .-fz-micr; } .-fz-mill-p { .-fz-mill; } .-fz-norm-p { .-fz-norm; } .-fz-kilo-p { .-fz-kilo; } .-fz-mega-p { .-fz-mega; } .-fz-giga-p { .-fz-giga; } .-fz-tera-p { .-fz-tera; } .-fz-peta-p { .-fz-peta; } }
29+
@media screen and (min-width: 30em) { .-fz-micr-sK { .-fz-micr; } .-fz-mill-sK { .-fz-mill; } .-fz-norm-sK { .-fz-norm; } .-fz-kilo-sK { .-fz-kilo; } .-fz-mega-sK { .-fz-mega; } .-fz-giga-sK { .-fz-giga; } .-fz-tera-sK { .-fz-tera; } .-fz-peta-sK { .-fz-peta; } }
30+
@media screen and (min-width: 45em) { .-fz-micr-sM { .-fz-micr; } .-fz-mill-sM { .-fz-mill; } .-fz-norm-sM { .-fz-norm; } .-fz-kilo-sM { .-fz-kilo; } .-fz-mega-sM { .-fz-mega; } .-fz-giga-sM { .-fz-giga; } .-fz-tera-sM { .-fz-tera; } .-fz-peta-sM { .-fz-peta; } }
31+
@media screen and (min-width: 60em) { .-fz-micr-sG { .-fz-micr; } .-fz-mill-sG { .-fz-mill; } .-fz-norm-sG { .-fz-norm; } .-fz-kilo-sG { .-fz-kilo; } .-fz-mega-sG { .-fz-mega; } .-fz-giga-sG { .-fz-giga; } .-fz-tera-sG { .-fz-tera; } .-fz-peta-sG { .-fz-peta; } }
32+
@media screen and (min-width: 75em) { .-fz-micr-sT { .-fz-micr; } .-fz-mill-sT { .-fz-mill; } .-fz-norm-sT { .-fz-norm; } .-fz-kilo-sT { .-fz-kilo; } .-fz-mega-sT { .-fz-mega; } .-fz-giga-sT { .-fz-giga; } .-fz-tera-sT { .-fz-tera; } .-fz-peta-sT { .-fz-peta; } }
33+
@media screen and (min-width: 90em) { .-fz-micr-sP { .-fz-micr; } .-fz-mill-sP { .-fz-mill; } .-fz-norm-sP { .-fz-norm; } .-fz-kilo-sP { .-fz-kilo; } .-fz-mega-sP { .-fz-mega; } .-fz-giga-sP { .-fz-giga; } .-fz-tera-sP { .-fz-tera; } .-fz-peta-sP { .-fz-peta; } }
34+
@media not all and (min-width: 30em) { .-fz-micr-nsK { .-fz-micr; } .-fz-mill-nsK { .-fz-mill; } .-fz-norm-nsK { .-fz-norm; } .-fz-kilo-nsK { .-fz-kilo; } .-fz-mega-nsK { .-fz-mega; } .-fz-giga-nsK { .-fz-giga; } .-fz-tera-nsK { .-fz-tera; } .-fz-peta-nsK { .-fz-peta; } }
35+
@media not all and (min-width: 45em) { .-fz-micr-nsM { .-fz-micr; } .-fz-mill-nsM { .-fz-mill; } .-fz-norm-nsM { .-fz-norm; } .-fz-kilo-nsM { .-fz-kilo; } .-fz-mega-nsM { .-fz-mega; } .-fz-giga-nsM { .-fz-giga; } .-fz-tera-nsM { .-fz-tera; } .-fz-peta-nsM { .-fz-peta; } }
36+
@media not all and (min-width: 60em) { .-fz-micr-nsG { .-fz-micr; } .-fz-mill-nsG { .-fz-mill; } .-fz-norm-nsG { .-fz-norm; } .-fz-kilo-nsG { .-fz-kilo; } .-fz-mega-nsG { .-fz-mega; } .-fz-giga-nsG { .-fz-giga; } .-fz-tera-nsG { .-fz-tera; } .-fz-peta-nsG { .-fz-peta; } }
37+
@media not all and (min-width: 75em) { .-fz-micr-nsT { .-fz-micr; } .-fz-mill-nsT { .-fz-mill; } .-fz-norm-nsT { .-fz-norm; } .-fz-kilo-nsT { .-fz-kilo; } .-fz-mega-nsT { .-fz-mega; } .-fz-giga-nsT { .-fz-giga; } .-fz-tera-nsT { .-fz-tera; } .-fz-peta-nsT { .-fz-peta; } }
38+
@media not all and (min-width: 90em) { .-fz-micr-nsP { .-fz-micr; } .-fz-mill-nsP { .-fz-mill; } .-fz-norm-nsP { .-fz-norm; } .-fz-kilo-nsP { .-fz-kilo; } .-fz-mega-nsP { .-fz-mega; } .-fz-giga-nsP { .-fz-giga; } .-fz-tera-nsP { .-fz-tera; } .-fz-peta-nsP { .-fz-peta; } }
39+
40+
41+
.-fz-el-micr { .font-size-el(@g-font_size_micr ) !important; }
42+
.-fz-el-mill { .font-size-el(@g-font_size_mill ) !important; }
43+
.-fz-el-norm { .font-size-el(@g-font_size_norm ) !important; }
44+
.-fz-el-kilo { .font-size-el(@g-font_size_kilo ) !important; }
45+
.-fz-el-mega { .font-size-el(@g-font_size_mega; 2) !important; }
46+
.-fz-el-giga { .font-size-el(@g-font_size_giga; 2) !important; }
47+
.-fz-el-tera { .font-size-el(@g-font_size_tera; 3) !important; }
48+
.-fz-el-peta { .font-size-el(@g-font_size_peta; 4) !important; }
49+
50+
@media screen { .-fz-el-micr-s { .-fz-el-micr; } .-fz-el-mill-s { .-fz-el-mill; } .-fz-el-norm-s { .-fz-el-norm; } .-fz-el-kilo-s { .-fz-el-kilo; } .-fz-el-mega-s { .-fz-el-mega; } .-fz-el-giga-s { .-fz-el-giga; } .-fz-el-tera-s { .-fz-el-tera; } .-fz-el-peta-s { .-fz-el-peta; } }
51+
@media print { .-fz-el-micr-p { .-fz-el-micr; } .-fz-el-mill-p { .-fz-el-mill; } .-fz-el-norm-p { .-fz-el-norm; } .-fz-el-kilo-p { .-fz-el-kilo; } .-fz-el-mega-p { .-fz-el-mega; } .-fz-el-giga-p { .-fz-el-giga; } .-fz-el-tera-p { .-fz-el-tera; } .-fz-el-peta-p { .-fz-el-peta; } }
52+
@media screen and (min-width: 30em) { .-fz-el-micr-sK { .-fz-el-micr; } .-fz-el-mill-sK { .-fz-el-mill; } .-fz-el-norm-sK { .-fz-el-norm; } .-fz-el-kilo-sK { .-fz-el-kilo; } .-fz-el-mega-sK { .-fz-el-mega; } .-fz-el-giga-sK { .-fz-el-giga; } .-fz-el-tera-sK { .-fz-el-tera; } .-fz-el-peta-sK { .-fz-el-peta; } }
53+
@media screen and (min-width: 45em) { .-fz-el-micr-sM { .-fz-el-micr; } .-fz-el-mill-sM { .-fz-el-mill; } .-fz-el-norm-sM { .-fz-el-norm; } .-fz-el-kilo-sM { .-fz-el-kilo; } .-fz-el-mega-sM { .-fz-el-mega; } .-fz-el-giga-sM { .-fz-el-giga; } .-fz-el-tera-sM { .-fz-el-tera; } .-fz-el-peta-sM { .-fz-el-peta; } }
54+
@media screen and (min-width: 60em) { .-fz-el-micr-sG { .-fz-el-micr; } .-fz-el-mill-sG { .-fz-el-mill; } .-fz-el-norm-sG { .-fz-el-norm; } .-fz-el-kilo-sG { .-fz-el-kilo; } .-fz-el-mega-sG { .-fz-el-mega; } .-fz-el-giga-sG { .-fz-el-giga; } .-fz-el-tera-sG { .-fz-el-tera; } .-fz-el-peta-sG { .-fz-el-peta; } }
55+
@media screen and (min-width: 75em) { .-fz-el-micr-sT { .-fz-el-micr; } .-fz-el-mill-sT { .-fz-el-mill; } .-fz-el-norm-sT { .-fz-el-norm; } .-fz-el-kilo-sT { .-fz-el-kilo; } .-fz-el-mega-sT { .-fz-el-mega; } .-fz-el-giga-sT { .-fz-el-giga; } .-fz-el-tera-sT { .-fz-el-tera; } .-fz-el-peta-sT { .-fz-el-peta; } }
56+
@media screen and (min-width: 90em) { .-fz-el-micr-sP { .-fz-el-micr; } .-fz-el-mill-sP { .-fz-el-mill; } .-fz-el-norm-sP { .-fz-el-norm; } .-fz-el-kilo-sP { .-fz-el-kilo; } .-fz-el-mega-sP { .-fz-el-mega; } .-fz-el-giga-sP { .-fz-el-giga; } .-fz-el-tera-sP { .-fz-el-tera; } .-fz-el-peta-sP { .-fz-el-peta; } }
57+
@media not all and (min-width: 30em) { .-fz-el-micr-nsK { .-fz-el-micr; } .-fz-el-mill-nsK { .-fz-el-mill; } .-fz-el-norm-nsK { .-fz-el-norm; } .-fz-el-kilo-nsK { .-fz-el-kilo; } .-fz-el-mega-nsK { .-fz-el-mega; } .-fz-el-giga-nsK { .-fz-el-giga; } .-fz-el-tera-nsK { .-fz-el-tera; } .-fz-el-peta-nsK { .-fz-el-peta; } }
58+
@media not all and (min-width: 45em) { .-fz-el-micr-nsM { .-fz-el-micr; } .-fz-el-mill-nsM { .-fz-el-mill; } .-fz-el-norm-nsM { .-fz-el-norm; } .-fz-el-kilo-nsM { .-fz-el-kilo; } .-fz-el-mega-nsM { .-fz-el-mega; } .-fz-el-giga-nsM { .-fz-el-giga; } .-fz-el-tera-nsM { .-fz-el-tera; } .-fz-el-peta-nsM { .-fz-el-peta; } }
59+
@media not all and (min-width: 60em) { .-fz-el-micr-nsG { .-fz-el-micr; } .-fz-el-mill-nsG { .-fz-el-mill; } .-fz-el-norm-nsG { .-fz-el-norm; } .-fz-el-kilo-nsG { .-fz-el-kilo; } .-fz-el-mega-nsG { .-fz-el-mega; } .-fz-el-giga-nsG { .-fz-el-giga; } .-fz-el-tera-nsG { .-fz-el-tera; } .-fz-el-peta-nsG { .-fz-el-peta; } }
60+
@media not all and (min-width: 75em) { .-fz-el-micr-nsT { .-fz-el-micr; } .-fz-el-mill-nsT { .-fz-el-mill; } .-fz-el-norm-nsT { .-fz-el-norm; } .-fz-el-kilo-nsT { .-fz-el-kilo; } .-fz-el-mega-nsT { .-fz-el-mega; } .-fz-el-giga-nsT { .-fz-el-giga; } .-fz-el-tera-nsT { .-fz-el-tera; } .-fz-el-peta-nsT { .-fz-el-peta; } }
61+
@media not all and (min-width: 90em) { .-fz-el-micr-nsP { .-fz-el-micr; } .-fz-el-mill-nsP { .-fz-el-mill; } .-fz-el-norm-nsP { .-fz-el-norm; } .-fz-el-kilo-nsP { .-fz-el-kilo; } .-fz-el-mega-nsP { .-fz-el-mega; } .-fz-el-giga-nsP { .-fz-el-giga; } .-fz-el-tera-nsP { .-fz-el-tera; } .-fz-el-peta-nsP { .-fz-el-peta; } }

‎src/_atom.less

-213
This file was deleted.

0 commit comments

Comments
 (0)