Ything-RepoMirrors/flexboxgrid
1
0
Fork 0
mirror of https://github.com/kristoferjoseph/flexboxgrid.git synced 2026-01-24 23:16:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merges in some PRs

Browse Source
This commit is contained in:
Kristofer Joseph
2016-08-12 10:07:18 -07:00
parent c79a893a9e
commit 6762e02b3d
10 changed files with 139 additions and 348 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@@ -15,7 +15,7 @@ Install
### cdn
```
<link rel="stylesheet" href="https://cdn.jsdelivr.net/flexboxgrid/6.3.0/flexboxgrid.min.css" type="text/css" >
<link rel="stylesheet" href="https://cdn.jsdelivr.net/flexboxgrid/6.3.1/flexboxgrid.min.css" type="text/css" >
```
### css

2
bower.json
View File

@@ -1,6 +1,6 @@
{
"name": "flexboxgrid",
"version": "6.2.0",
"version": "6.3.1",
"license": "Apache 2",
"homepage": "https://github.com/kristoferjoseph/flexboxgrid",
"authors": [

102
css/flexboxgrid.css
View File

@@ -9,20 +9,16 @@
.row {
box-sizing: border-box;
display: -webkit-flex;
display: -ms-flexbox;
display: -webkit-box;
display: flex;
-webkit-flex: 0 1 auto;
-ms-flex: 0 1 auto;
-webkit-box-flex: 0;
flex: 0 1 auto;
-webkit-flex-direction: row;
-ms-flex-direction: row;
-webkit-box-orient: horizontal;
-webkit-box-direction: normal;
flex-direction: row;
-webkit-flex-wrap: wrap;
-ms-flex-wrap: wrap;
flex-wrap: wrap;
margin-right: -1rem;
@@ -30,7 +26,6 @@
}
.row.reverse {
-webkit-flex-direction: row-reverse;
-ms-flex-direction: row-reverse;
-webkit-box-orient: horizontal;
-webkit-box-direction: reverse;
@@ -38,7 +33,6 @@
}
.col.reverse {
-webkit-flex-direction: column-reverse;
-ms-flex-direction: column-reverse;
-webkit-box-orient: vertical;
-webkit-box-direction: reverse;
@@ -59,7 +53,6 @@
.col-xs-11,
.col-xs-12 {
box-sizing: border-box;
-webkit-flex: 0 0 auto;
-ms-flex: 0 0 auto;
-webkit-box-flex: 0;
flex: 0 0 auto;
@@ -73,91 +66,78 @@
-webkit-box-flex: 1;
flex-grow: 1;
-ms-flex-preferred-size: 0;
-webkit-flex-basis: 0;
flex-basis: 0;
max-width: 100%;
}
.col-xs-1 {
-ms-flex-preferred-size: 8.333%;
-webkit-flex-basis: 8.333%;
flex-basis: 8.333%;
max-width: 8.333%;
}
.col-xs-2 {
-ms-flex-preferred-size: 16.667%;
-webkit-flex-basis: 16.667%;
flex-basis: 16.667%;
max-width: 16.667%;
}
.col-xs-3 {
-ms-flex-preferred-size: 25%;
-webkit-flex-basis: 25%;
flex-basis: 25%;
max-width: 25%;
}
.col-xs-4 {
-ms-flex-preferred-size: 33.333%;
-webkit-flex-basis: 33.333%;
flex-basis: 33.333%;
max-width: 33.333%;
}
.col-xs-5 {
-ms-flex-preferred-size: 41.667%;
-webkit-flex-basis: 41.667%;
flex-basis: 41.667%;
max-width: 41.667%;
}
.col-xs-6 {
-ms-flex-preferred-size: 50%;
-webkit-flex-basis: 50%;
flex-basis: 50%;
max-width: 50%;
}
.col-xs-7 {
-ms-flex-preferred-size: 58.333%;
-webkit-flex-basis: 58.333%;
flex-basis: 58.333%;
max-width: 58.333%;
}
.col-xs-8 {
-ms-flex-preferred-size: 66.667%;
-webkit-flex-basis: 66.667%;
flex-basis: 66.667%;
max-width: 66.667%;
}
.col-xs-9 {
-ms-flex-preferred-size: 75%;
-webkit-flex-basis: 75%;
flex-basis: 75%;
max-width: 75%;
}
.col-xs-10 {
-ms-flex-preferred-size: 83.333%;
-webkit-flex-basis: 83.333%;
flex-basis: 83.333%;
max-width: 83.333%;
}
.col-xs-11 {
-ms-flex-preferred-size: 91.667%;
-webkit-flex-basis: 91.667%;
flex-basis: 91.667%;
max-width: 91.667%;
}
.col-xs-12 {
-ms-flex-preferred-size: 100%;
-webkit-flex-basis: 100%;
flex-basis: 100%;
max-width: 100%;
}
@@ -207,7 +187,6 @@
}
.start-xs {
-webkit-justify-content: flex-start;
-ms-flex-pack: start;
-webkit-box-pack: start;
justify-content: flex-start;
@@ -215,7 +194,6 @@
}
.center-xs {
-webkit-justify-content: center;
-ms-flex-pack: center;
-webkit-box-pack: center;
justify-content: center;
@@ -223,7 +201,6 @@
}
.end-xs {
-webkit-justify-content: flex-end;
-ms-flex-pack: end;
-webkit-box-pack: end;
justify-content: flex-end;
@@ -231,48 +208,41 @@
}
.top-xs {
-webkit-align-items: flex-start;
-ms-flex-align: start;
-webkit-box-align: start;
align-items: flex-start;
}
.middle-xs {
-webkit-align-items: center;
-ms-flex-align: center;
-webkit-box-align: center;
align-items: center;
}
.bottom-xs {
-webkit-align-items: flex-end;
-ms-flex-align: end;
-webkit-box-align: end;
align-items: flex-end;
}
.around-xs {
-webkit-justify-content: space-around;
-ms-flex-pack: distribute;
justify-content: space-around;
}
.between-xs {
-webkit-justify-content: space-between;
-ms-flex-pack: justify;
-webkit-box-pack: justify;
justify-content: space-between;
}
.first-xs {
-webkit-order: -1;
-ms-flex-order: -1;
-webkit-box-ordinal-group: 0;
order: -1;
}
.last-xs {
-webkit-order: 1;
-ms-flex-order: 1;
-webkit-box-ordinal-group: 2;
order: 1;
@@ -297,7 +267,6 @@
.col-sm-11,
.col-sm-12 {
box-sizing: border-box;
-webkit-flex: 0 0 auto;
-ms-flex: 0 0 auto;
-webkit-box-flex: 0;
flex: 0 0 auto;
@@ -311,91 +280,78 @@
-webkit-box-flex: 1;
flex-grow: 1;
-ms-flex-preferred-size: 0;
-webkit-flex-basis: 0;
flex-basis: 0;
max-width: 100%;
}
.col-sm-1 {
-ms-flex-preferred-size: 8.333%;
-webkit-flex-basis: 8.333%;
flex-basis: 8.333%;
max-width: 8.333%;
}
.col-sm-2 {
-ms-flex-preferred-size: 16.667%;
-webkit-flex-basis: 16.667%;
flex-basis: 16.667%;
max-width: 16.667%;
}
.col-sm-3 {
-ms-flex-preferred-size: 25%;
-webkit-flex-basis: 25%;
flex-basis: 25%;
max-width: 25%;
}
.col-sm-4 {
-ms-flex-preferred-size: 33.333%;
-webkit-flex-basis: 33.333%;
flex-basis: 33.333%;
max-width: 33.333%;
}
.col-sm-5 {
-ms-flex-preferred-size: 41.667%;
-webkit-flex-basis: 41.667%;
flex-basis: 41.667%;
max-width: 41.667%;
}
.col-sm-6 {
-ms-flex-preferred-size: 50%;
-webkit-flex-basis: 50%;
flex-basis: 50%;
max-width: 50%;
}
.col-sm-7 {
-ms-flex-preferred-size: 58.333%;
-webkit-flex-basis: 58.333%;
flex-basis: 58.333%;
max-width: 58.333%;
}
.col-sm-8 {
-ms-flex-preferred-size: 66.667%;
-webkit-flex-basis: 66.667%;
flex-basis: 66.667%;
max-width: 66.667%;
}
.col-sm-9 {
-ms-flex-preferred-size: 75%;
-webkit-flex-basis: 75%;
flex-basis: 75%;
max-width: 75%;
}
.col-sm-10 {
-ms-flex-preferred-size: 83.333%;
-webkit-flex-basis: 83.333%;
flex-basis: 83.333%;
max-width: 83.333%;
}
.col-sm-11 {
-ms-flex-preferred-size: 91.667%;
-webkit-flex-basis: 91.667%;
flex-basis: 91.667%;
max-width: 91.667%;
}
.col-sm-12 {
-ms-flex-preferred-size: 100%;
-webkit-flex-basis: 100%;
flex-basis: 100%;
max-width: 100%;
}
@@ -445,7 +401,6 @@
}
.start-sm {
-webkit-justify-content: flex-start;
-ms-flex-pack: start;
-webkit-box-pack: start;
justify-content: flex-start;
@@ -453,7 +408,6 @@
}
.center-sm {
-webkit-justify-content: center;
-ms-flex-pack: center;
-webkit-box-pack: center;
justify-content: center;
@@ -461,7 +415,6 @@
}
.end-sm {
-webkit-justify-content: flex-end;
-ms-flex-pack: end;
-webkit-box-pack: end;
justify-content: flex-end;
@@ -469,48 +422,41 @@
}
.top-sm {
-webkit-align-items: flex-start;
-ms-flex-align: start;
-webkit-box-align: start;
align-items: flex-start;
}
.middle-sm {
-webkit-align-items: center;
-ms-flex-align: center;
-webkit-box-align: center;
align-items: center;
}
.bottom-sm {
-webkit-align-items: flex-end;
-ms-flex-align: end;
-webkit-box-align: end;
align-items: flex-end;
}
.around-sm {
-webkit-justify-content: space-around;
-ms-flex-pack: distribute;
justify-content: space-around;
}
.between-sm {
-webkit-justify-content: space-between;
-ms-flex-pack: justify;
-webkit-box-pack: justify;
justify-content: space-between;
}
.first-sm {
-webkit-order: -1;
-ms-flex-order: -1;
-webkit-box-ordinal-group: 0;
order: -1;
}
.last-sm {
-webkit-order: 1;
-ms-flex-order: 1;
-webkit-box-ordinal-group: 2;
order: 1;
@@ -536,7 +482,6 @@
.col-md-11,
.col-md-12 {
box-sizing: border-box;
-webkit-flex: 0 0 auto;
-ms-flex: 0 0 auto;
-webkit-box-flex: 0;
flex: 0 0 auto;
@@ -550,91 +495,78 @@
-webkit-box-flex: 1;
flex-grow: 1;
-ms-flex-preferred-size: 0;
-webkit-flex-basis: 0;
flex-basis: 0;
max-width: 100%;
}
.col-md-1 {
-ms-flex-preferred-size: 8.333%;
-webkit-flex-basis: 8.333%;
flex-basis: 8.333%;
max-width: 8.333%;
}
.col-md-2 {
-ms-flex-preferred-size: 16.667%;
-webkit-flex-basis: 16.667%;
flex-basis: 16.667%;
max-width: 16.667%;
}
.col-md-3 {
-ms-flex-preferred-size: 25%;
-webkit-flex-basis: 25%;
flex-basis: 25%;
max-width: 25%;
}
.col-md-4 {
-ms-flex-preferred-size: 33.333%;
-webkit-flex-basis: 33.333%;
flex-basis: 33.333%;
max-width: 33.333%;
}
.col-md-5 {
-ms-flex-preferred-size: 41.667%;
-webkit-flex-basis: 41.667%;
flex-basis: 41.667%;
max-width: 41.667%;
}
.col-md-6 {
-ms-flex-preferred-size: 50%;
-webkit-flex-basis: 50%;
flex-basis: 50%;
max-width: 50%;
}
.col-md-7 {
-ms-flex-preferred-size: 58.333%;
-webkit-flex-basis: 58.333%;
flex-basis: 58.333%;
max-width: 58.333%;
}
.col-md-8 {
-ms-flex-preferred-size: 66.667%;
-webkit-flex-basis: 66.667%;
flex-basis: 66.667%;
max-width: 66.667%;
}
.col-md-9 {
-ms-flex-preferred-size: 75%;
-webkit-flex-basis: 75%;
flex-basis: 75%;
max-width: 75%;
}
.col-md-10 {
-ms-flex-preferred-size: 83.333%;
-webkit-flex-basis: 83.333%;
flex-basis: 83.333%;
max-width: 83.333%;
}
.col-md-11 {
-ms-flex-preferred-size: 91.667%;
-webkit-flex-basis: 91.667%;
flex-basis: 91.667%;
max-width: 91.667%;
}
.col-md-12 {
-ms-flex-preferred-size: 100%;
-webkit-flex-basis: 100%;
flex-basis: 100%;
max-width: 100%;
}
@@ -684,7 +616,6 @@
}
.start-md {
-webkit-justify-content: flex-start;
-ms-flex-pack: start;
-webkit-box-pack: start;
justify-content: flex-start;
@@ -692,7 +623,6 @@
}
.center-md {
-webkit-justify-content: center;
-ms-flex-pack: center;
-webkit-box-pack: center;
justify-content: center;
@@ -700,7 +630,6 @@
}
.end-md {
-webkit-justify-content: flex-end;
-ms-flex-pack: end;
-webkit-box-pack: end;
justify-content: flex-end;
@@ -708,48 +637,41 @@
}
.top-md {
-webkit-align-items: flex-start;
-ms-flex-align: start;
-webkit-box-align: start;
align-items: flex-start;
}
.middle-md {
-webkit-align-items: center;
-ms-flex-align: center;
-webkit-box-align: center;
align-items: center;
}
.bottom-md {
-webkit-align-items: flex-end;
-ms-flex-align: end;
-webkit-box-align: end;
align-items: flex-end;
}
.around-md {
-webkit-justify-content: space-around;
-ms-flex-pack: distribute;
justify-content: space-around;
}
.between-md {
-webkit-justify-content: space-between;
-ms-flex-pack: justify;
-webkit-box-pack: justify;
justify-content: space-between;
}
.first-md {
-webkit-order: -1;
-ms-flex-order: -1;
-webkit-box-ordinal-group: 0;
order: -1;
}
.last-md {
-webkit-order: 1;
-ms-flex-order: 1;
-webkit-box-ordinal-group: 2;
order: 1;
@@ -775,7 +697,6 @@
.col-lg-11,
.col-lg-12 {
box-sizing: border-box;
-webkit-flex: 0 0 auto;
-ms-flex: 0 0 auto;
-webkit-box-flex: 0;
flex: 0 0 auto;
@@ -789,91 +710,78 @@
-webkit-box-flex: 1;
flex-grow: 1;
-ms-flex-preferred-size: 0;
-webkit-flex-basis: 0;
flex-basis: 0;
max-width: 100%;
}
.col-lg-1 {
-ms-flex-preferred-size: 8.333%;
-webkit-flex-basis: 8.333%;
flex-basis: 8.333%;
max-width: 8.333%;
}
.col-lg-2 {
-ms-flex-preferred-size: 16.667%;
-webkit-flex-basis: 16.667%;
flex-basis: 16.667%;
max-width: 16.667%;
}
.col-lg-3 {
-ms-flex-preferred-size: 25%;
-webkit-flex-basis: 25%;
flex-basis: 25%;
max-width: 25%;
}
.col-lg-4 {
-ms-flex-preferred-size: 33.333%;
-webkit-flex-basis: 33.333%;
flex-basis: 33.333%;
max-width: 33.333%;
}
.col-lg-5 {
-ms-flex-preferred-size: 41.667%;
-webkit-flex-basis: 41.667%;
flex-basis: 41.667%;
max-width: 41.667%;
}
.col-lg-6 {
-ms-flex-preferred-size: 50%;
-webkit-flex-basis: 50%;
flex-basis: 50%;
max-width: 50%;
}
.col-lg-7 {
-ms-flex-preferred-size: 58.333%;
-webkit-flex-basis: 58.333%;
flex-basis: 58.333%;
max-width: 58.333%;
}
.col-lg-8 {
-ms-flex-preferred-size: 66.667%;
-webkit-flex-basis: 66.667%;
flex-basis: 66.667%;
max-width: 66.667%;
}
.col-lg-9 {
-ms-flex-preferred-size: 75%;
-webkit-flex-basis: 75%;
flex-basis: 75%;
max-width: 75%;
}
.col-lg-10 {
-ms-flex-preferred-size: 83.333%;
-webkit-flex-basis: 83.333%;
flex-basis: 83.333%;
max-width: 83.333%;
}
.col-lg-11 {
-ms-flex-preferred-size: 91.667%;
-webkit-flex-basis: 91.667%;
flex-basis: 91.667%;
max-width: 91.667%;
}
.col-lg-12 {
-ms-flex-preferred-size: 100%;
-webkit-flex-basis: 100%;
flex-basis: 100%;
max-width: 100%;
}
@@ -923,7 +831,6 @@
}
.start-lg {
-webkit-justify-content: flex-start;
-ms-flex-pack: start;
-webkit-box-pack: start;
justify-content: flex-start;
@@ -931,7 +838,6 @@
}
.center-lg {
-webkit-justify-content: center;
-ms-flex-pack: center;
-webkit-box-pack: center;
justify-content: center;
@@ -939,7 +845,6 @@
}
.end-lg {
-webkit-justify-content: flex-end;
-ms-flex-pack: end;
-webkit-box-pack: end;
justify-content: flex-end;
@@ -947,48 +852,41 @@
}
.top-lg {
-webkit-align-items: flex-start;
-ms-flex-align: start;
-webkit-box-align: start;
align-items: flex-start;
}
.middle-lg {
-webkit-align-items: center;
-ms-flex-align: center;
-webkit-box-align: center;
align-items: center;
}
.bottom-lg {
-webkit-align-items: flex-end;
-ms-flex-align: end;
-webkit-box-align: end;
align-items: flex-end;
}
.around-lg {
-webkit-justify-content: space-around;
-ms-flex-pack: distribute;
justify-content: space-around;
}
.between-lg {
-webkit-justify-content: space-between;
-ms-flex-pack: justify;
-webkit-box-pack: justify;
justify-content: space-between;
}
.first-lg {
-webkit-order: -1;
-ms-flex-order: -1;
-webkit-box-ordinal-group: 0;
order: -1;
}
.last-lg {
-webkit-order: 1;
-ms-flex-order: 1;
-webkit-box-ordinal-group: 2;
order: 1;

2
css/flexboxgrid.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
css/index.css
View File

File diff suppressed because one or more lines are too long

2
css/index.min.css vendored
View File

File diff suppressed because one or more lines are too long

362
dist/flexboxgrid.css vendored
View File

File diff suppressed because it is too large Load Diff

2
dist/flexboxgrid.min.css vendored
View File

File diff suppressed because one or more lines are too long

8
index.html
View File

File diff suppressed because one or more lines are too long

3
src/index.html
View File

@@ -59,7 +59,7 @@
property.</p>
</div>
<div class="row center-xs">
<a class="button invisible-xs visible-md" href="https://github.com/kristoferjoseph/flexboxgrid/archive/v6.3.0.zip">Download</a>
<a class="button invisible-xs visible-md" href="https://github.com/kristoferjoseph/flexboxgrid/archive/v6.3.1.zip">Download</a>
<a class="button" href="https://github.com/kristoferjoseph/flexboxgrid">Github</a>
</div>
@@ -768,7 +768,6 @@
});
}());
</script>
<script src="//localhost:35729/livereload.js"></script>
</body>
</html>