Skip to content

Commit 8fae85e

Browse files
committed
fix(grid): Correct responsive grid breaks for col-XX, closes #803
1 parent aa30faf commit 8fae85e

File tree

2 files changed

+11
-14
lines changed

2 files changed

+11
-14
lines changed

scss/_mixins.scss

+4-2
Original file line numberDiff line numberDiff line change
@@ -619,9 +619,11 @@
619619
-ms-flex-direction: column;
620620
flex-direction: column;
621621

622-
.col {
623-
width: 100%;
622+
.col, .col-10, .col-20, .col-25, .col-33, .col-34, .col-50, .col-66, .col-67, .col-75, .col-80, .col-90 {
623+
@include flex(1);
624624
margin-bottom: ($grid-padding-width * 3) / 2;
625+
max-width: 100%;
626+
width: 100%;
625627
}
626628
}
627629
}

test/html/grid.html

+7-12
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ <h3>.row</h3>
8989
<div class="row">
9090
<div class="col col-25">
9191
<div>
92-
.col.col-25
92+
.col.col-25
9393
</div>
9494
</div>
9595
<div class="col col-25 col-offset-25">
@@ -261,24 +261,19 @@ <h3>.row</h3>
261261
</div>
262262

263263
<div class="row responsive-lg">
264-
<div class="col">
265-
<div>
266-
.responsive-lg .col
267-
</div>
268-
</div>
269-
<div class="col">
264+
<div class="col col-50">
270265
<div>
271-
.responsive-lg .col
266+
.responsive-lg .col.col-50
272267
</div>
273268
</div>
274-
<div class="col">
269+
<div class="col col-25">
275270
<div>
276-
.responsive-lg .col
271+
.responsive-lg .col.col-25
277272
</div>
278273
</div>
279-
<div class="col">
274+
<div class="col col-25">
280275
<div>
281-
.responsive-lg .col
276+
.responsive-lg .col.col-25
282277
</div>
283278
</div>
284279
</div>

0 commit comments

Comments
 (0)