Skip to content

Commit 1c49d7a

Browse files
committed
Merge branch 'release-0.3.2'
2 parents dc47704 + ce7eae9 commit 1c49d7a

15 files changed

+4477
-3138
lines changed

.github/workflows/lint.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ on:
1313
jobs:
1414
lint:
1515
runs-on: ubuntu-18.04
16+
timeout-minutes: 10
17+
1618
steps:
1719
- uses: actions/checkout@v2
1820

.github/workflows/npm-publish.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ jobs:
99
publish:
1010
name: Publish to npm registry
1111
runs-on: ubuntu-18.04
12+
timeout-minutes: 10
1213

1314
steps:
1415
- uses: actions/checkout@v2

README.md

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -226,13 +226,11 @@ See Flexbox Grid Mixins documentation: [http://thingsym.github.io/flexbox-grid-m
226226
## Development
227227

228228
1. run ```$ sudo yum install nodejs npm```
229-
2. run ```$ sudo npm install --global gulp-cli```
230-
3. run ```$ sudo npm install --global npm-check-updates``` (optional)
231-
4. Forking on GitHub
232-
5. run ```$ cd /path/to/flexbox-grid-mixins```
233-
6. run ```$ npm install```
234-
7. run ```$ gulp serve```
235-
8. Access URL http://localhost:3000
229+
2. Forking on GitHub
230+
3. run ```$ cd /path/to/flexbox-grid-mixins```
231+
4. run ```$ npm install```
232+
5. run ```$ npm run serve```
233+
6. Access URL http://localhost:3000
236234

237235
## Contribution
238236

@@ -248,6 +246,11 @@ Small patches and bug reports can be submitted a issue tracker in Github. Forkin
248246

249247
## Changelog
250248

249+
* Version 0.3.2
250+
* fix gulp-sass compiler
251+
* update package.json
252+
* fix Deprecation Warning: Using / for division is deprecated and will be removed in Dart Sass 2.0.0.
253+
* add timeout-minutes to workflows
251254
* Version 0.3.1
252255
* update example
253256
* fix items row/column alignment example

dart-sass/_flexbox-grid-mixins.scss

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// ===================================================================
22
// Flexbox Grid Mixins (Dart Sass)
3-
// Version 0.3.1
3+
// Version 0.3.2
44
// Description: Sass Mixins to generate Flexbox grid
55
// Author: thingsym
66
// GitHub: https://github.com/thingsym/flexbox-grid-mixins
@@ -72,21 +72,21 @@ $flexbox-grid-mixins-stack: margin-bottom !default;
7272
@if $gutter and math.unit($gutter) == '%' {
7373
$flex-basis: $flex-basis - $gutter;
7474
} @else if $gutter and math.is-unitless($gutter) == false {
75-
$flex-basis: calc( #{$flex-basis} - #{$gutter});
75+
$flex-basis: calc( #{$flex-basis} - #{$gutter} );
7676
}
7777

7878
} @else if $flexbox-grid-mixins-grid-type == margin-offset {
7979
@if $gutter and math.unit($gutter) == '%' {
8080
$flex-basis: math.div(100% - ($gutter * (math.div($grid-columns, $col) - 1)), math.div($grid-columns, $col));
8181
} @else if $gutter and math.is-unitless($gutter) == false {
82-
$flex-basis: calc( #{$flex-basis} - #{$gutter * math.div(math.div($grid-columns, $col) - 1, math.div($grid-columns, $col))});
82+
$flex-basis: calc( #{$flex-basis} - #{$gutter * math.div(math.div($grid-columns, $col) - 1, math.div($grid-columns, $col))} );
8383
}
8484
}
8585

8686
@if $col-offset and math.unit($col-offset) == '%' {
8787
$flex-basis: $flex-basis + $col-offset;
8888
} @else if $col-offset and math.is-unitless($col-offset) == false {
89-
$flex-basis: calc( #{$flex-basis} + #{$col-offset});
89+
$flex-basis: calc( #{$flex-basis} + #{$col-offset} );
9090
}
9191
} @else if meta.type-of($col) == number and math.is-unitless($col) == false {
9292
$flex-grow: 0;

docs/css-dart-sass/box-sizing-null.css

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
11
.grid--null {
2+
-webkit-box-sizing: border-box;
3+
box-sizing: border-box;
24
display: -webkit-box;
35
display: -ms-flexbox;
46
display: flex;
57
margin-left: -1%;
68
margin-right: -1%;
79
}
810
.grid--null > .grid__col-1 {
11+
-webkit-box-sizing: border-box;
12+
box-sizing: border-box;
913
-webkit-box-flex: 0;
1014
-ms-flex: 0 0 6.3333333333%;
1115
flex: 0 0 6.3333333333%;
@@ -14,6 +18,8 @@
1418
margin-bottom: 2%;
1519
}
1620
.grid--null > .grid__col-2 {
21+
-webkit-box-sizing: border-box;
22+
box-sizing: border-box;
1723
-webkit-box-flex: 0;
1824
-ms-flex: 0 0 14.6666666667%;
1925
flex: 0 0 14.6666666667%;
@@ -22,6 +28,8 @@
2228
margin-bottom: 2%;
2329
}
2430
.grid--null > .grid__col-3 {
31+
-webkit-box-sizing: border-box;
32+
box-sizing: border-box;
2533
-webkit-box-flex: 0;
2634
-ms-flex: 0 0 23%;
2735
flex: 0 0 23%;
@@ -30,6 +38,8 @@
3038
margin-bottom: 2%;
3139
}
3240
.grid--null > .grid__col-4 {
41+
-webkit-box-sizing: border-box;
42+
box-sizing: border-box;
3343
-webkit-box-flex: 0;
3444
-ms-flex: 0 0 31.3333333333%;
3545
flex: 0 0 31.3333333333%;
@@ -38,6 +48,8 @@
3848
margin-bottom: 2%;
3949
}
4050
.grid--null > .grid__col-5 {
51+
-webkit-box-sizing: border-box;
52+
box-sizing: border-box;
4153
-webkit-box-flex: 0;
4254
-ms-flex: 0 0 39.6666666667%;
4355
flex: 0 0 39.6666666667%;
@@ -46,6 +58,8 @@
4658
margin-bottom: 2%;
4759
}
4860
.grid--null > .grid__col-6 {
61+
-webkit-box-sizing: border-box;
62+
box-sizing: border-box;
4963
-webkit-box-flex: 0;
5064
-ms-flex: 0 0 48%;
5165
flex: 0 0 48%;
@@ -54,6 +68,8 @@
5468
margin-bottom: 2%;
5569
}
5670
.grid--null > .grid__col-7 {
71+
-webkit-box-sizing: border-box;
72+
box-sizing: border-box;
5773
-webkit-box-flex: 0;
5874
-ms-flex: 0 0 56.3333333333%;
5975
flex: 0 0 56.3333333333%;
@@ -62,6 +78,8 @@
6278
margin-bottom: 2%;
6379
}
6480
.grid--null > .grid__col-8 {
81+
-webkit-box-sizing: border-box;
82+
box-sizing: border-box;
6583
-webkit-box-flex: 0;
6684
-ms-flex: 0 0 64.6666666667%;
6785
flex: 0 0 64.6666666667%;
@@ -70,6 +88,8 @@
7088
margin-bottom: 2%;
7189
}
7290
.grid--null > .grid__col-9 {
91+
-webkit-box-sizing: border-box;
92+
box-sizing: border-box;
7393
-webkit-box-flex: 0;
7494
-ms-flex: 0 0 73%;
7595
flex: 0 0 73%;
@@ -78,6 +98,8 @@
7898
margin-bottom: 2%;
7999
}
80100
.grid--null > .grid__col-10 {
101+
-webkit-box-sizing: border-box;
102+
box-sizing: border-box;
81103
-webkit-box-flex: 0;
82104
-ms-flex: 0 0 81.3333333333%;
83105
flex: 0 0 81.3333333333%;
@@ -86,6 +108,8 @@
86108
margin-bottom: 2%;
87109
}
88110
.grid--null > .grid__col-11 {
111+
-webkit-box-sizing: border-box;
112+
box-sizing: border-box;
89113
-webkit-box-flex: 0;
90114
-ms-flex: 0 0 89.6666666667%;
91115
flex: 0 0 89.6666666667%;
@@ -94,6 +118,8 @@
94118
margin-bottom: 2%;
95119
}
96120
.grid--null > .grid__col-12 {
121+
-webkit-box-sizing: border-box;
122+
box-sizing: border-box;
97123
-webkit-box-flex: 0;
98124
-ms-flex: 0 0 98%;
99125
flex: 0 0 98%;

docs/css-dart-sass/default.css

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,6 @@ td.example {
148148
}
149149

150150
.grid,
151-
.grid-global,
152151
.grid-3-columns,
153152
.grid-24-columns,
154153
[class*=grid--] {

0 commit comments

Comments
 (0)