Skip to content

Commit eed06a5

Browse files
committed
align-content added in vertical-align
1 parent c852f07 commit eed06a5

2 files changed

Lines changed: 26 additions & 5 deletions

File tree

flex-grid-framework.styl

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ Afonso Pacifer (afonsopacifer.com.br)
99
Licence:
1010
MIT - https://github.com/afonsopacifer/flex-grid-framework/blob/master/licence.md
1111
* /
12+
1213
/* Configs
1314
------------------------------------------------*/
1415
max-width = 1200px
@@ -42,11 +43,11 @@ col(number-of-cols = flex)
4243
width (number-of-cols * column) + (((number-of-cols - 1) * 2) * margin)
4344

4445
if (number-of-cols == flex)
45-
-webkit-box-flex: auto;
46-
-moz-box-flex: auto;
47-
-webkit-flex: auto;
48-
-ms-flex: auto;
49-
flex: auto;
46+
-webkit-box-flex auto
47+
-moz-box-flex auto
48+
-webkit-flex auto
49+
-ms-flex auto
50+
flex auto
5051

5152
margin-right margin
5253
margin-left margin
@@ -96,15 +97,25 @@ vertical-align(vertical-value)
9697
-webkit-align-items flex-start
9798
-ms-flex-align start
9899
align-items flex-start
100+
-webkit-align-content flex-start
101+
-ms-flex-line-pack start
102+
align-content flex-start
99103

100104
if (vertical-value == middle)
101105
-webkit-box-align center
102106
-webkit-align-items center
103107
-ms-flex-align center
104108
align-items center
109+
flex-start
110+
-webkit-align-content center
111+
-ms-flex-line-pack center
112+
align-content center
105113

106114
if (vertical-value == bottom)
107115
-webkit-box-align end
108116
-webkit-align-items flex-end
109117
-ms-flex-align end
110118
align-items flex-end
119+
-webkit-align-content flex-end
120+
-ms-flex-line-pack end
121+
align-content flex-end

site/assets/css/style.css

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -211,18 +211,28 @@ _____________________________________________________ */
211211
-webkit-align-items: flex-start;
212212
-ms-flex-align: start;
213213
align-items: flex-start;
214+
-webkit-align-content: flex-start;
215+
-ms-flex-line-pack: start;
216+
align-content: flex-start;
214217
}
215218
.v-align-middle {
216219
-webkit-box-align: center;
217220
-webkit-align-items: center;
218221
-ms-flex-align: center;
219222
align-items: center;
223+
flex-start
224+
-webkit-align-content: center;
225+
-ms-flex-line-pack: center;
226+
align-content: center;
220227
}
221228
.v-align-bottom {
222229
-webkit-box-align: end;
223230
-webkit-align-items: flex-end;
224231
-ms-flex-align: end;
225232
align-items: flex-end;
233+
-webkit-align-content: flex-end;
234+
-ms-flex-line-pack: end;
235+
align-content: flex-end;
226236
}
227237
/* Code block
228238
_____________________________________________________ */

0 commit comments

Comments
 (0)