Skip to content

Commit 2fc655a

Browse files
author
Chris Harvey
committed
Merge branch 'stage-v3.6.0' into gh-pages
2 parents 44b0757 + f8cabe4 commit 2fc655a

9 files changed

+34
-10
lines changed

Diff for: package.json

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

Diff for: src/__tool.fallback.column-count.less

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
// ^author
1414
// : Chris Harvey
1515
// ^updated
16-
// : 2014-10-23
16+
// : 2015-10-23
1717
.column-count(@n) {
1818
-webkit-column-count: @n;
1919
-moz-column-count: @n;

Diff for: src/__tool.fallback.column-width.less

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
2+
/*################################*\
3+
xmeter | __tool.fallback.column-width.less
4+
\*################################*/
5+
6+
7+
#XMETER {
8+
// Sets the width of columns of text.
9+
// See [MDN](https://developer.mozilla.org/en-US/docs/Web/CSS/column-width) for more info.
10+
//
11+
// @n - a positive integer indicating the number of columns, or
12+
// - auto (initial) - indicates the width of columns should be determined by the `column-count` property
13+
// ^author
14+
// : Chris Harvey
15+
// ^updated
16+
// : 2016-02-08
17+
.column-width(@n) {
18+
-webkit-column-width: @n;
19+
-moz-column-width: @n;
20+
column-width: @n;
21+
}
22+
}

Diff for: src/__tool.fallback.flexbox.less

+1-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@
9191
justify-content: @justify;
9292
}
9393

94-
// Aligns a flex container's lines when there is empty space in the cross-axis.
94+
// Aligns a flex containers lines when there is empty space in the cross-axis.
9595
// (align vertically for `flex-direction: row` or horizontally for `flex-direction: column`)
9696
//
9797
// @align - how content is aligned

Diff for: src/__tool.module.clearfix.less

+4-3
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,12 @@
1111
// ^author
1212
// : Chris Harevy
1313
// ^updated
14-
// : 2014-05-12
14+
// : 2016-02-08
1515
.clearfix() {
1616
&::after {
17-
display: table;
18-
content:' ';
17+
content: ' '; // older browsers do not support empty content ('')
18+
display: block;
19+
height: 0;
1920
clear: both;
2021
}
2122
}

Diff for: src/__tool.module.fontsize.less

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
// : Chris Harvey
2020
// ^updated
2121
// : 2016-01-08
22+
#XMETER .VARS();
2223
.font-size-block(@ratio; @line_height_orig: @xmeter_line_height; @lines: 1) {
2324
#XMETER .VARS();
2425
font-size: (@ratio * @1rem); // legacy browsers (see __settings for more info)

Diff for: src/__tool.module.sprite.less

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@
1818
.sprite(horizontal; @position; @iconsize; @iconpadd) when (@position > 1) {
1919
background-position: ((@position - 1) * -(@iconsize + @iconpadd)) 0;
2020
}
21-
.sprite(horizontal; @position; @iconsize; @iconpadd) when (@position == 1) {
21+
.sprite(horizontal; @position; @iconsize; @iconpadd) when (@position = 1) {
2222
background-position: 0 0;
2323
}
2424
.sprite(vertical; @position; @iconsize; @iconpadd) when (@position > 1) {
2525
background-position: 0 ((@position - 1) * -(@iconsize + @iconpadd));
2626
}
27-
.sprite(vertical; @position; @iconsize; @iconpadd) when (@position == 1) {
27+
.sprite(vertical; @position; @iconsize; @iconpadd) when (@position = 1) {
2828
background-position: 0 0;
2929
}
3030
}

Diff for: xmeter.css

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*\
22
xmeter
3-
Version: 3.5.0
3+
Version: 3.6.0
44
Licence: MIT
55
Repo : https://github.com/chharvey/xmeter.git
66
Home : https://chharvey.github.io/xmeter/

Diff for: xmeter.less

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*\
33
xmeter
4-
Version: 3.5.0
4+
Version: 3.6.0
55
Licence: MIT
66
Repo : https://github.com/chharvey/xmeter.git
77
Home : https://chharvey.github.io/xmeter/

0 commit comments

Comments
 (0)