Skip to content
This repository was archived by the owner on Mar 25, 2019. It is now read-only.

Commit 979d6fa

Browse files
committed
Removed @extend inside @media block
1 parent d053d54 commit 979d6fa

File tree

2 files changed

+14
-3
lines changed

2 files changed

+14
-3
lines changed

docs/css/docs.css

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -427,7 +427,7 @@ math {
427427
.grid-container:after {
428428
clear: both; }
429429

430-
.grid-column, .one-half, .one-third, .two-thirds, .one-quarter, .three-quarters, .grid-module-container .grid-module {
430+
.grid-column, .one-half, .one-third, .two-thirds, .one-quarter, .three-quarters {
431431
float: left;
432432
vertical-align: top;
433433
-webkit-box-sizing: border-box;
@@ -475,6 +475,13 @@ math {
475475
max-width: 25.275em;
476476
padding: 3.4em 1.275em; }
477477
.grid-module-container .grid-module {
478+
float: left;
479+
vertical-align: top;
480+
-webkit-box-sizing: border-box;
481+
-moz-box-sizing: border-box;
482+
box-sizing: border-box;
483+
padding-left: 1.275em;
484+
padding-right: 1.275em;
478485
width: 25.275em; } }
479486
@media screen and (min-width: 53.1em) {
480487
.grid-module-container {

terrain/layout/_grid.scss

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,18 @@
1616
width: 100% / $total * $span;
1717
}
1818

19-
.grid-column {
19+
@mixin grid-column {
2020
float: left;
2121
vertical-align: top;
2222
box-sizing: border-box;
2323
padding-left: $gutter / 2;
2424
padding-right: $gutter / 2;
2525
}
2626

27+
.grid-column {
28+
@include grid-column();
29+
}
30+
2731

2832
// Percentage-based grid
2933

@@ -99,7 +103,7 @@ $grid-module-width: $max-width / 2 + $gutter / 2 !default;
99103
padding: $page-margin $gutter / 2;
100104

101105
.grid-module {
102-
@extend .grid-column;
106+
@include grid-column();
103107
width: $grid-module-width;
104108
}
105109
}

0 commit comments

Comments
 (0)