Skip to content

Commit bc671bf

Browse files
committed
Merge pull request #12 from afonsopacifer/remove-universal-selector
Remove universal selector and update from v 1.2.0
2 parents 1ae7069 + 7f020a7 commit bc671bf

8 files changed

Lines changed: 16 additions & 18 deletions

File tree

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[<img src="https://rawgit.com/afonsopacifer/flex-grid-framework/master/readme-cover.svg" alt="Flex Grid Framework">](http://flexgridframework.com/)
22

33
[![license mit](https://img.shields.io/badge/licence-MIT-yellow.svg)](https://github.com/afonsopacifer/flex-grid-framework/blob/master/license.md)
4-
[![release](https://img.shields.io/badge/release-v1.1.1-yellow.svg)](https://github.com/afonsopacifer/flex-grid-framework/archive/1.1.1.zip)
4+
[![release](https://img.shields.io/badge/release-v1.2.0-yellow.svg)](https://github.com/afonsopacifer/flex-grid-framework/archive/1.2.0.zip)
55

66
# [FlexGridFramework.com](http://flexgridframework.com/)
77

_flex-grid-framework.scss

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Website:
88
http://flexgridframework.com/
99
Author:
1010
Afonso Pacifer (afonsopacifer.com)
11-
Version: 1.1.1
11+
Version: 1.2.0
1212
Licence:
1313
MIT - https://github.com/afonsopacifer/flex-grid-framework/blob/master/licence.md
1414
* /
@@ -24,12 +24,6 @@ $column_width: 7.29177%;
2424
margin-left: $margin;
2525
}
2626

27-
/* Box Model
28-
------------------------------------------------*/
29-
* {
30-
box-sizing: border-box;
31-
}
32-
3327
/* Row
3428
------------------------------------------------*/
3529
%row {
@@ -44,6 +38,7 @@ $column_width: 7.29177%;
4438
-webkit-flex-wrap: wrap;
4539
-ms-flex-wrap: wrap;
4640
flex-wrap: wrap;
41+
box-sizing: border-box;
4742
}
4843

4944
/* Columns
@@ -62,6 +57,7 @@ $column_width: 7.29177%;
6257
}
6358

6459
@extend %margin;
60+
box-sizing: border-box;
6561
}
6662

6763
// extends the mixin :)

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "flex-grid-framework",
3-
"version": "1.1.1",
3+
"version": "1.2.0",
44
"homepage": "http://flexgridframework.com/",
55
"authors": [
66
"afonsopacifer <afonsopacifer@live.com>"

changelog.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
# Changelog
22

3+
## v 1.2.0
4+
- Universal selector for `box-sizing` removed
5+
6+
> Thanks to [Alexey Taktarov](https://github.com/molefrog)
7+
38
## v 1.1.1
49
- Fix margin-left bug in sass version
510

flex-grid-framework.styl

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Website:
88
http://flexgridframework.com/
99
Author:
1010
Afonso Pacifer (afonsopacifer.com)
11-
Version: 1.1.1
11+
Version: 1.2.0
1212
Licence:
1313
MIT - https://github.com/afonsopacifer/flex-grid-framework/blob/master/licence.md
1414
* /
@@ -23,11 +23,6 @@ $margin
2323
margin-right margin
2424
margin-left margin
2525

26-
/* Box Model
27-
------------------------------------------------*/
28-
*
29-
box-sizing border-box
30-
3126
/* Row
3227
------------------------------------------------*/
3328
$row
@@ -42,6 +37,7 @@ $row
4237
-webkit-flex-wrap wrap
4338
-ms-flex-wrap wrap
4439
flex-wrap wrap
40+
box-sizing border-box
4541

4642
/* Columns
4743
------------------------------------------------*/
@@ -59,6 +55,7 @@ col(number-of-cols)
5955
flex auto
6056

6157
@extend $margin
58+
box-sizing border-box
6259

6360
// extends the mixin :)
6461
$col-flex

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "flex-grid-framework",
3-
"version": "1.1.1",
3+
"version": "1.2.0",
44
"description": "The Flex Semantic Grid focusing on performance for Stylus and Sass.",
55
"license": "MIT",
66
"author": {

site/assets/css/style.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

site/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ <h2 class="title-lv2">
6767
</pre>
6868
</div>
6969

70-
<a href="https://github.com/afonsopacifer/flex-grid-framework/archive/1.1.1.zip" class="btn">Download v1.1.1</a>
70+
<a href="https://github.com/afonsopacifer/flex-grid-framework/archive/1.2.0.zip" class="btn">Download v1.2.0</a>
7171

7272
</div>
7373
</header>

0 commit comments

Comments
 (0)