Skip to content

Commit 316ff58

Browse files
author
Ryan A. Johnson
committed
refactor(grid): Update grid and docs based on feedback
* Added `*-xs-N` classes back. * `*-N` classes documented as shorthand for `*-xs-N` * Ensure that wrapped columns have vertical gutter between them. * Lots of updates to Grid documentation
1 parent ffe3249 commit 316ff58

File tree

5 files changed

+555
-281
lines changed

5 files changed

+555
-281
lines changed

source/components/grid/_explorer.less

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,18 @@
66
.hxCol,
77
[class*="hxCol-"] {
88
background-clip: content-box;
9-
background-color: fade(@cyan-900, 25%);
9+
background-color: fade(@green-700, 25%);
1010
font-size: 0.75rem;
1111
}
1212
}
1313

14+
.drop-cap {
15+
p::first-letter {
16+
font-size: 2em;
17+
font-weight: 700;
18+
}
19+
}
20+
1421
// Automatically Set Column Content based on breakpoint (lg-2, md-8, etc.)
1522
.demoColumns (@prefix, @n) when (@n > 0) and (@prefix = xs) {
1623
.demoCol.hxCol-@{n}::before {
@@ -62,3 +69,11 @@
6269
}
6370
.demoColumns(xl, @grid-column-count);
6471
}
72+
73+
.styled-container {
74+
background-color: @cyan-100;
75+
border-radius: 0;
76+
border: 1px solid @cyan-500;
77+
height: 100%;
78+
padding: 1em 0.5em;
79+
}

source/components/grid/_grid.less

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// ----- GRID MIXINS ----- //
22
//e.g. .hxCol-1, .hxCol-md-8, .hxCol-lg-12
33
.make-grid-columns (@prefix, @n) when (@n > 0) and (@prefix = xs) {
4+
.hxCol-@{prefix}-@{n},
45
.hxCol-@{n} {
56
@width: (@n * @grid-column-unit);
67
flex: 0 0 @width;
@@ -19,6 +20,7 @@
1920

2021
//e.g. .hxOffset-1, .hxOffset-md-3, .hxOffset-lg-0
2122
.make-grid-offsets (@prefix, @n) when (@n >= 0) and (@prefix = xs) {
23+
.hxOffset-@{prefix}-@{n},
2224
.hxOffset-@{n} {
2325
margin-left: (@n * @grid-column-unit) !important;
2426
}
@@ -33,6 +35,7 @@
3335

3436
//e.g. .hxOrder-1, .hxOrder-md-4
3537
.make-grid-orders (@prefix, @n) when (@n > 0) and (@prefix = xs) {
38+
.hxOrder-@{prefix}-@{n},
3639
.hxOrder-@{n} {
3740
order: @n;
3841
}
@@ -56,10 +59,11 @@
5659
//end:mixins
5760

5861
/* ===== GRID ===== */
59-
@col-padding: (@grid-gutter-width * 0.5);
62+
@col-padding: (@grid-gutter-size * 0.5);
6063
@row-margin: -(@col-padding);
6164

62-
.hxCol {
65+
.hxCol,
66+
[class*="hxCol-"] {
6367
display: flex;
6468
flex-direction: column;
6569
flex-grow: 1;
@@ -68,14 +72,13 @@
6872
border: 0;
6973
display: flex;
7074
flex-wrap: wrap;
71-
margin-left: @row-margin;
72-
margin-right: @row-margin;
75+
margin: 0 @row-margin -(@grid-gutter-size);
7376
padding: 0;
7477

7578
.hxCol,
7679
[class*="hxCol-"] {
7780
padding: 0 @col-padding;
78-
margin: 0;
81+
margin: 0 0 @grid-gutter-size;
7982
}
8083

8184
&.no-gutters {

0 commit comments

Comments
 (0)