Skip to content

Commit 27beab1

Browse files
thingsymthingsym
committed
Merge branch 'release-0.1.3'
2 parents 9cd1736 + ed87826 commit 27beab1

29 files changed

+68
-229
lines changed

‎bower.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "flexbox-grid-mixins",
3-
"version": "0.1.2",
3+
"version": "0.1.3",
44
"homepage": "https://github.com/thingsym/flexbox-grid-mixins",
55
"author": "Thingsym",
66
"description": "Sass Mixins to generate Flexbox grid",

‎doc/css/example.css‎ renamed to ‎docs/css/example.css‎

Lines changed: 6 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,12 @@ body {
5555
color: #fff;
5656
}
5757

58+
.header .btn {
59+
padding: .8em;
60+
border: solid rgba(255, 255, 255, 0.4) 1px;
61+
border-radius: .4em;
62+
}
63+
5864
h2 {
5965
border-bottom: solid 1px #ccc;
6066
}
@@ -138,9 +144,6 @@ td {
138144
display: -webkit-flex;
139145
display: -ms-flexbox;
140146
display: flex;
141-
-webkit-flex-flow: row nowrap;
142-
-ms-flex-flow: row nowrap;
143-
flex-flow: row nowrap;
144147
margin: 0 -1%;
145148
}
146149

@@ -428,9 +431,6 @@ ul.grid li {
428431
display: -webkit-flex;
429432
display: -ms-flexbox;
430433
display: flex;
431-
-webkit-flex-flow: row nowrap;
432-
-ms-flex-flow: row nowrap;
433-
flex-flow: row nowrap;
434434
}
435435

436436
.grid--no-margin .grid__col {
@@ -529,9 +529,6 @@ ul.grid li {
529529
display: -webkit-flex;
530530
display: -ms-flexbox;
531531
display: flex;
532-
-webkit-flex-flow: row nowrap;
533-
-ms-flex-flow: row nowrap;
534-
flex-flow: row nowrap;
535532
margin: 0 -1%;
536533
}
537534

@@ -891,9 +888,6 @@ ul.grid li {
891888
display: -webkit-flex;
892889
display: -ms-flexbox;
893890
display: flex;
894-
-webkit-flex-flow: row nowrap;
895-
-ms-flex-flow: row nowrap;
896-
flex-flow: row nowrap;
897891
-webkit-justify-content: flex-start;
898892
-ms-flex-pack: start;
899893
justify-content: flex-start;
@@ -929,9 +923,6 @@ ul.grid li {
929923
display: -webkit-flex;
930924
display: -ms-flexbox;
931925
display: flex;
932-
-webkit-flex-flow: row nowrap;
933-
-ms-flex-flow: row nowrap;
934-
flex-flow: row nowrap;
935926
-webkit-justify-content: center;
936927
-ms-flex-pack: center;
937928
justify-content: center;
@@ -967,9 +958,6 @@ ul.grid li {
967958
display: -webkit-flex;
968959
display: -ms-flexbox;
969960
display: flex;
970-
-webkit-flex-flow: row nowrap;
971-
-ms-flex-flow: row nowrap;
972-
flex-flow: row nowrap;
973961
-webkit-justify-content: flex-end;
974962
-ms-flex-pack: end;
975963
justify-content: flex-end;
@@ -1005,9 +993,6 @@ ul.grid li {
1005993
display: -webkit-flex;
1006994
display: -ms-flexbox;
1007995
display: flex;
1008-
-webkit-flex-flow: row nowrap;
1009-
-ms-flex-flow: row nowrap;
1010-
flex-flow: row nowrap;
1011996
-webkit-justify-content: space-between;
1012997
-ms-flex-pack: justify;
1013998
justify-content: space-between;
@@ -1043,9 +1028,6 @@ ul.grid li {
10431028
display: -webkit-flex;
10441029
display: -ms-flexbox;
10451030
display: flex;
1046-
-webkit-flex-flow: row nowrap;
1047-
-ms-flex-flow: row nowrap;
1048-
flex-flow: row nowrap;
10491031
-webkit-justify-content: space-around;
10501032
-ms-flex-pack: distribute;
10511033
justify-content: space-around;
@@ -1081,9 +1063,6 @@ ul.grid li {
10811063
display: -webkit-flex;
10821064
display: -ms-flexbox;
10831065
display: flex;
1084-
-webkit-flex-flow: row nowrap;
1085-
-ms-flex-flow: row nowrap;
1086-
flex-flow: row nowrap;
10871066
-webkit-align-items: flex-start;
10881067
-ms-flex-align: start;
10891068
align-items: flex-start;
@@ -1119,9 +1098,6 @@ ul.grid li {
11191098
display: -webkit-flex;
11201099
display: -ms-flexbox;
11211100
display: flex;
1122-
-webkit-flex-flow: row nowrap;
1123-
-ms-flex-flow: row nowrap;
1124-
flex-flow: row nowrap;
11251101
-webkit-align-items: center;
11261102
-ms-flex-align: center;
11271103
align-items: center;
@@ -1157,9 +1133,6 @@ ul.grid li {
11571133
display: -webkit-flex;
11581134
display: -ms-flexbox;
11591135
display: flex;
1160-
-webkit-flex-flow: row nowrap;
1161-
-ms-flex-flow: row nowrap;
1162-
flex-flow: row nowrap;
11631136
-webkit-align-items: flex-end;
11641137
-ms-flex-align: end;
11651138
align-items: flex-end;
@@ -1195,9 +1168,6 @@ ul.grid li {
11951168
display: -webkit-flex;
11961169
display: -ms-flexbox;
11971170
display: flex;
1198-
-webkit-flex-flow: row nowrap;
1199-
-ms-flex-flow: row nowrap;
1200-
flex-flow: row nowrap;
12011171
-webkit-align-items: stretch;
12021172
-ms-flex-align: stretch;
12031173
align-items: stretch;
@@ -1233,9 +1203,6 @@ ul.grid li {
12331203
display: -webkit-flex;
12341204
display: -ms-flexbox;
12351205
display: flex;
1236-
-webkit-flex-flow: row nowrap;
1237-
-ms-flex-flow: row nowrap;
1238-
flex-flow: row nowrap;
12391206
-webkit-align-items: baseline;
12401207
-ms-flex-align: baseline;
12411208
align-items: baseline;
@@ -1271,9 +1238,6 @@ ul.grid li {
12711238
display: -webkit-flex;
12721239
display: -ms-flexbox;
12731240
display: flex;
1274-
-webkit-flex-flow: row nowrap;
1275-
-ms-flex-flow: row nowrap;
1276-
flex-flow: row nowrap;
12771241
margin: 0 -1%;
12781242
}
12791243

@@ -1348,9 +1312,6 @@ ul.grid li {
13481312
display: -webkit-flex;
13491313
display: -ms-flexbox;
13501314
display: flex;
1351-
-webkit-flex-flow: row nowrap;
1352-
-ms-flex-flow: row nowrap;
1353-
flex-flow: row nowrap;
13541315
margin: 0 -1%;
13551316
}
13561317

‎doc/css/grid-type.css‎ renamed to ‎docs/css/grid-type.css‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,6 @@ h2 {
6060
display: -webkit-flex;
6161
display: -ms-flexbox;
6262
display: flex;
63-
-webkit-flex-flow: row nowrap;
64-
-ms-flex-flow: row nowrap;
65-
flex-flow: row nowrap;
6663
margin: 0 -1%;
6764
}
6865

@@ -209,9 +206,6 @@ h2 {
209206
display: -webkit-flex;
210207
display: -ms-flexbox;
211208
display: flex;
212-
-webkit-flex-flow: row nowrap;
213-
-ms-flex-flow: row nowrap;
214-
flex-flow: row nowrap;
215209
}
216210

217211
.grid-margin-offset > .grid__col-1 {

‎doc/css/holy-grail-layout.css‎ renamed to ‎docs/css/holy-grail-layout.css‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,6 @@ body {
3131
display: -webkit-flex;
3232
display: -ms-flexbox;
3333
display: flex;
34-
-webkit-flex-flow: row nowrap;
35-
-ms-flex-flow: row nowrap;
36-
flex-flow: row nowrap;
3734
-webkit-justify-content: space-between;
3835
-ms-flex-pack: justify;
3936
justify-content: space-between;

‎doc/css/margin-offset.css‎ renamed to ‎docs/css/margin-offset.css‎

Lines changed: 0 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,6 @@ h2 {
6262
display: -webkit-flex;
6363
display: -ms-flexbox;
6464
display: flex;
65-
-webkit-flex-flow: row nowrap;
66-
-ms-flex-flow: row nowrap;
67-
flex-flow: row nowrap;
6865
}
6966

7067
.grid .grid__col {
@@ -380,9 +377,6 @@ ul.grid li {
380377
display: -webkit-flex;
381378
display: -ms-flexbox;
382379
display: flex;
383-
-webkit-flex-flow: row nowrap;
384-
-ms-flex-flow: row nowrap;
385-
flex-flow: row nowrap;
386380
}
387381

388382
.grid--no-margin .grid__col {
@@ -481,9 +475,6 @@ ul.grid li {
481475
display: -webkit-flex;
482476
display: -ms-flexbox;
483477
display: flex;
484-
-webkit-flex-flow: row nowrap;
485-
-ms-flex-flow: row nowrap;
486-
flex-flow: row nowrap;
487478
}
488479

489480
.grid--condensed .grid__col {
@@ -861,9 +852,6 @@ ul.grid li {
861852
display: -webkit-flex;
862853
display: -ms-flexbox;
863854
display: flex;
864-
-webkit-flex-flow: row nowrap;
865-
-ms-flex-flow: row nowrap;
866-
flex-flow: row nowrap;
867855
-webkit-justify-content: flex-start;
868856
-ms-flex-pack: start;
869857
justify-content: flex-start;
@@ -901,9 +889,6 @@ ul.grid li {
901889
display: -webkit-flex;
902890
display: -ms-flexbox;
903891
display: flex;
904-
-webkit-flex-flow: row nowrap;
905-
-ms-flex-flow: row nowrap;
906-
flex-flow: row nowrap;
907892
-webkit-justify-content: center;
908893
-ms-flex-pack: center;
909894
justify-content: center;
@@ -941,9 +926,6 @@ ul.grid li {
941926
display: -webkit-flex;
942927
display: -ms-flexbox;
943928
display: flex;
944-
-webkit-flex-flow: row nowrap;
945-
-ms-flex-flow: row nowrap;
946-
flex-flow: row nowrap;
947929
-webkit-justify-content: flex-end;
948930
-ms-flex-pack: end;
949931
justify-content: flex-end;
@@ -981,9 +963,6 @@ ul.grid li {
981963
display: -webkit-flex;
982964
display: -ms-flexbox;
983965
display: flex;
984-
-webkit-flex-flow: row nowrap;
985-
-ms-flex-flow: row nowrap;
986-
flex-flow: row nowrap;
987966
-webkit-justify-content: space-between;
988967
-ms-flex-pack: justify;
989968
justify-content: space-between;
@@ -1021,9 +1000,6 @@ ul.grid li {
10211000
display: -webkit-flex;
10221001
display: -ms-flexbox;
10231002
display: flex;
1024-
-webkit-flex-flow: row nowrap;
1025-
-ms-flex-flow: row nowrap;
1026-
flex-flow: row nowrap;
10271003
-webkit-justify-content: space-around;
10281004
-ms-flex-pack: distribute;
10291005
justify-content: space-around;
@@ -1061,9 +1037,6 @@ ul.grid li {
10611037
display: -webkit-flex;
10621038
display: -ms-flexbox;
10631039
display: flex;
1064-
-webkit-flex-flow: row nowrap;
1065-
-ms-flex-flow: row nowrap;
1066-
flex-flow: row nowrap;
10671040
-webkit-align-items: flex-start;
10681041
-ms-flex-align: start;
10691042
align-items: flex-start;
@@ -1101,9 +1074,6 @@ ul.grid li {
11011074
display: -webkit-flex;
11021075
display: -ms-flexbox;
11031076
display: flex;
1104-
-webkit-flex-flow: row nowrap;
1105-
-ms-flex-flow: row nowrap;
1106-
flex-flow: row nowrap;
11071077
-webkit-align-items: center;
11081078
-ms-flex-align: center;
11091079
align-items: center;
@@ -1141,9 +1111,6 @@ ul.grid li {
11411111
display: -webkit-flex;
11421112
display: -ms-flexbox;
11431113
display: flex;
1144-
-webkit-flex-flow: row nowrap;
1145-
-ms-flex-flow: row nowrap;
1146-
flex-flow: row nowrap;
11471114
-webkit-align-items: flex-end;
11481115
-ms-flex-align: end;
11491116
align-items: flex-end;
@@ -1181,9 +1148,6 @@ ul.grid li {
11811148
display: -webkit-flex;
11821149
display: -ms-flexbox;
11831150
display: flex;
1184-
-webkit-flex-flow: row nowrap;
1185-
-ms-flex-flow: row nowrap;
1186-
flex-flow: row nowrap;
11871151
-webkit-align-items: stretch;
11881152
-ms-flex-align: stretch;
11891153
align-items: stretch;
@@ -1221,9 +1185,6 @@ ul.grid li {
12211185
display: -webkit-flex;
12221186
display: -ms-flexbox;
12231187
display: flex;
1224-
-webkit-flex-flow: row nowrap;
1225-
-ms-flex-flow: row nowrap;
1226-
flex-flow: row nowrap;
12271188
-webkit-align-items: baseline;
12281189
-ms-flex-align: baseline;
12291190
align-items: baseline;
@@ -1261,9 +1222,6 @@ ul.grid li {
12611222
display: -webkit-flex;
12621223
display: -ms-flexbox;
12631224
display: flex;
1264-
-webkit-flex-flow: row nowrap;
1265-
-ms-flex-flow: row nowrap;
1266-
flex-flow: row nowrap;
12671225
}
12681226

12691227
.grid--column-alignment > .grid__col {
@@ -1337,9 +1295,6 @@ ul.grid li {
13371295
display: -webkit-flex;
13381296
display: -ms-flexbox;
13391297
display: flex;
1340-
-webkit-flex-flow: row nowrap;
1341-
-ms-flex-flow: row nowrap;
1342-
flex-flow: row nowrap;
13431298
}
13441299

13451300
.grid--order > .grid__col-1 {

‎doc/css/responsive.css‎ renamed to ‎docs/css/responsive.css‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,6 @@ body {
3131
display: -webkit-flex;
3232
display: -ms-flexbox;
3333
display: flex;
34-
-webkit-flex-flow: row nowrap;
35-
-ms-flex-flow: row nowrap;
36-
flex-flow: row nowrap;
3734
-webkit-justify-content: space-between;
3835
-ms-flex-pack: justify;
3936
justify-content: space-between;

0 commit comments

Comments
 (0)