Skip to content

Commit 40c0dcf

Browse files
author
AMJones
committed
Fix for extraneous ; in variables.
1 parent 955a928 commit 40c0dcf

File tree

5 files changed

+85
-11
lines changed

5 files changed

+85
-11
lines changed

‎composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"css"
1212
],
1313
"homepage": "https://www.github.com/strapless/grid",
14-
"version": "1.0.3",
14+
"version": "1.0.4",
1515
"authors": [
1616
{
1717
"name": "Aaron M Jones",

‎dist/css/strapless-grid.css‎

Lines changed: 78 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Strapless Grid v1.0.1 (http://github.com/strapless/strapless)
2+
* Strapless Grid v1.0.4 (http://github.com/strapless/strapless)
33
* Influenced by Bootstrap (http://getbootstrap.com) and Flexbox Grid (http://flexboxgrid.com)
44
* Licensed under MIT (https://github.com/strapless/strapless/blob/master/LICENSE)
55
*/
@@ -61,9 +61,6 @@
6161
min-height: 1px;
6262
padding-right: 1rem;
6363
padding-left: 1rem;
64-
display: -webkit-flex;
65-
display: -ms-flexbox;
66-
display: flex;
6764
-webkit-flex-direction: column;
6865
-ms-flex-direction: column;
6966
flex-direction: column;
@@ -241,6 +238,23 @@
241238
padding-right: 0;
242239
}
243240

241+
[class*="col-xs-"].flex-xs-grow {
242+
max-width: 100%;
243+
-webkit-flex-grow: 1 !important;
244+
-ms-flex-positive: 1 !important;
245+
flex-grow: 1 !important;
246+
}
247+
248+
[class*="col-xs-"].flex-xs-shrink {
249+
-webkit-flex-shrink: 0 !important;
250+
-ms-flex-negative: 0 !important;
251+
flex-shrink: 0 !important;
252+
-webkit-flex-basis: auto !important;
253+
-ms-flex-preferred-size: auto !important;
254+
flex-basis: auto !important;
255+
width: auto;
256+
}
257+
244258
@media screen and (min-width: 576px) {
245259
.container-sm {
246260
max-width: 540px;
@@ -371,6 +385,21 @@
371385
-webkit-column-count: 2;
372386
column-count: 2;
373387
}
388+
[class*="col-sm-"].flex-sm-grow {
389+
max-width: 100%;
390+
-webkit-flex-grow: 1 !important;
391+
-ms-flex-positive: 1 !important;
392+
flex-grow: 1 !important;
393+
}
394+
[class*="col-sm-"].flex-sm-shrink {
395+
-webkit-flex-shrink: 0 !important;
396+
-ms-flex-negative: 0 !important;
397+
flex-shrink: 0 !important;
398+
-webkit-flex-basis: auto !important;
399+
-ms-flex-preferred-size: auto !important;
400+
flex-basis: auto !important;
401+
width: auto;
402+
}
374403
}
375404

376405
@media screen and (min-width: 768px) {
@@ -499,6 +528,21 @@
499528
.col-md-offset-11 {
500529
margin-left: 91.66667%;
501530
}
531+
[class*="col-md-"].flex-md-grow {
532+
max-width: 100%;
533+
-webkit-flex-grow: 1 !important;
534+
-ms-flex-positive: 1 !important;
535+
flex-grow: 1 !important;
536+
}
537+
[class*="col-md-"].flex-md-shrink {
538+
-webkit-flex-shrink: 0 !important;
539+
-ms-flex-negative: 0 !important;
540+
flex-shrink: 0 !important;
541+
-webkit-flex-basis: auto !important;
542+
-ms-flex-preferred-size: auto !important;
543+
flex-basis: auto !important;
544+
width: auto;
545+
}
502546
}
503547

504548
@media screen and (min-width: 992px) {
@@ -631,6 +675,21 @@
631675
-webkit-column-count: 3;
632676
column-count: 3;
633677
}
678+
[class*="col-lg-"].flex-lg-grow {
679+
max-width: 100%;
680+
-webkit-flex-grow: 1 !important;
681+
-ms-flex-positive: 1 !important;
682+
flex-grow: 1 !important;
683+
}
684+
[class*="col-lg-"].flex-lg-shrink {
685+
-webkit-flex-shrink: 0 !important;
686+
-ms-flex-negative: 0 !important;
687+
flex-shrink: 0 !important;
688+
-webkit-flex-basis: auto !important;
689+
-ms-flex-preferred-size: auto !important;
690+
flex-basis: auto !important;
691+
width: auto;
692+
}
634693
}
635694

636695
@media screen and (min-width: 1200px) {
@@ -763,4 +822,19 @@
763822
-webkit-column-count: 4;
764823
column-count: 4;
765824
}
825+
[class*="col-xl-"].flex-xl-grow {
826+
max-width: 100%;
827+
-webkit-flex-grow: 1 !important;
828+
-ms-flex-positive: 1 !important;
829+
flex-grow: 1 !important;
830+
}
831+
[class*="col-xl-"].flex-xl-shrink {
832+
-webkit-flex-shrink: 0 !important;
833+
-ms-flex-negative: 0 !important;
834+
flex-shrink: 0 !important;
835+
-webkit-flex-basis: auto !important;
836+
-ms-flex-preferred-size: auto !important;
837+
flex-basis: auto !important;
838+
width: auto;
839+
}
766840
}

‎dist/css/strapless-grid.min.css‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎scss/_grid-variables.scss‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ $column-lg-gap: $column-gap !default;
2020
$column-xl-gap: $column-gap !default;
2121

2222
$column-count: floor($grid-columns / ($grid-columns * .5)) !default; // 2
23-
$column-xs-count: floor($grid-columns / ($grid-columns * 1)) !default; // 1
23+
$column-xs-count: floor($grid-columns / ($grid-columns * 1)) !default; // 1
2424
$column-sm-count: $column-count !default;
25-
$column-lg-count: floor($grid-columns / ($grid-columns * .333333)); !default; // 3
26-
$column-xl-count: floor($grid-columns / ($grid-columns * .25)); // 4
25+
$column-lg-count: floor($grid-columns / ($grid-columns * .333333)) !default; // 3
26+
$column-xl-count: floor($grid-columns / ($grid-columns * .25)) !default; // 4
2727

2828
// endregion //////////////////////////////////////////////////////////// End Sizing and Spacing

‎scss/_grid.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
@if $enable-framework == false {
66
/*!
7-
* Strapless Grid v1.0.3 (http://github.com/strapless/strapless)
7+
* Strapless Grid v1.0.4 (http://github.com/strapless/strapless)
88
* Influenced by Bootstrap (http://getbootstrap.com) and Flexbox Grid (http://flexboxgrid.com)
99
* Licensed under MIT (https://github.com/strapless/strapless/blob/master/LICENSE)
1010
*/

0 commit comments

Comments
 (0)