Skip to content

Commit 90f8680

Browse files
committed
fix(grid): changed margins, paddings, added flexbox alignment options
1 parent ea0b041 commit 90f8680

File tree

1 file changed

+48
-5
lines changed

1 file changed

+48
-5
lines changed

src/guidelines/_grid.scss

Lines changed: 48 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,24 +58,32 @@ $grid-max-width: #{map-get($min-screensize-map, l)}px;
5858
$min-screensize-map,
5959
$screensize
6060
) {
61+
/*
6162
@if $margin == auto {
6263
min-width: calc(#{$grid-max-width} - (#{$max-grid-h-margin} * 2));
6364
} @else {
6465
min-width: calc(
6566
#{map-get($min-screensize-map, $screensize)}px - (#{$margin} * 2)
6667
);
6768
}
69+
*/
6870

69-
margin-left: $margin;
70-
margin-right: $margin;
71+
//margin-left: $margin;
72+
//margin-right: $margin;
73+
padding-left: $margin;
74+
padding-right: $margin;
7175
}
7276

7377
.#{$prefix}grid {
78+
box-sizing: content-box;
7479
position: relative;
7580
display: flex;
7681
flex-direction: column;
77-
margin-left: $grid-h-margin;
78-
margin-right: $grid-h-margin;
82+
83+
padding-left: $grid-h-margin;
84+
padding-right: $grid-h-margin;
85+
margin-left: auto;
86+
margin-right: auto;
7987

8088
// set horizontal margin and width of grid container
8189
@each $screensize, $valuelist in $grid-values-map {
@@ -147,8 +155,14 @@ $grid-max-width: #{map-get($min-screensize-map, l)}px;
147155
}
148156

149157
.#{$prefix}grid__row {
158+
$half-grid-gutter: $grid-gutter / 2;
159+
// use negative margin to clear grid-gutter
160+
margin-left: -#{$half-grid-gutter};
161+
margin-right: -#{$half-grid-gutter};
162+
163+
align-items: stretch;
164+
150165
padding: 0;
151-
margin: 0;
152166
display: block;
153167
position: relative;
154168
display: flex;
@@ -175,6 +189,19 @@ $grid-max-width: #{map-get($min-screensize-map, l)}px;
175189
}
176190
}
177191

192+
.#{$prefix}grid__row--align-items-flex-start {
193+
align-items: flex-start;
194+
}
195+
.#{$prefix}grid__row--align-items-flex-end {
196+
align-items: flex-end;
197+
}
198+
.#{$prefix}grid__row--align-items-center {
199+
align-items: center;
200+
}
201+
.#{$prefix}grid__row--align-items-baseline {
202+
align-items: baseline;
203+
}
204+
178205
.#{$prefix}grid__col {
179206
// float is only for non flexbox browsers and overwritten by flex properties in modern browsers
180207
position: relative;
@@ -184,6 +211,22 @@ $grid-max-width: #{map-get($min-screensize-map, l)}px;
184211
border: 1px green solid;
185212
}
186213

214+
.#{$prefix}grid__col--align-self-flex-start {
215+
align-self: flex-start;
216+
}
217+
.#{$prefix}grid__col--align-self-flex-end {
218+
align-self: flex-end;
219+
}
220+
.#{$prefix}grid__col--align-self-center {
221+
align-self: center;
222+
}
223+
.#{$prefix}grid__col--align-self-baseline {
224+
align-self: baseline;
225+
}
226+
.#{$prefix}grid__col--align-self-stretch {
227+
align-self: stretch;
228+
}
229+
187230
// set col width for 12 col layout
188231
@for $i from 1 through $grid-max-cols {
189232
.#{$prefix}grid__col--#{$i}-#{$grid-max-cols} {

0 commit comments

Comments
 (0)