Skip to content

Commit

Permalink
Merge pull request kristoferjoseph#125 from ckuijjer/col-offset-0
Browse files Browse the repository at this point in the history
Col offset 0
  • Loading branch information
kristoferjoseph committed Dec 17, 2015
2 parents 164b2f8 + d33574e commit 6b1ecaa
Show file tree
Hide file tree
Showing 6 changed files with 64 additions and 24 deletions.
2 changes: 1 addition & 1 deletion css/index.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion css/index.min.css

Large diffs are not rendered by default.

60 changes: 40 additions & 20 deletions dist/flexboxgrid.css
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@
.col-xs-10,
.col-xs-11,
.col-xs-12,
.col-xs-offset-0,
.col-xs-offset-1,
.col-xs-offset-2,
.col-xs-offset-3,
Expand Down Expand Up @@ -100,10 +101,10 @@
}

.col-xs-2 {
-webkit-flex-basis: 16.667%;
-ms-flex-preferred-size: 16.667%;
flex-basis: 16.667%;
max-width: 16.667%;
-webkit-flex-basis: 16.666%;
-ms-flex-preferred-size: 16.666%;
flex-basis: 16.666%;
max-width: 16.666%;
}

.col-xs-3 {
Expand Down Expand Up @@ -176,12 +177,16 @@
max-width: 100%;
}

.col-xs-offset-0 {
margin-left: 0;
}

.col-xs-offset-1 {
margin-left: 8.333%;
}

.col-xs-offset-2 {
margin-left: 16.667%;
margin-left: 16.666%;
}

.col-xs-offset-3 {
Expand Down Expand Up @@ -310,6 +315,7 @@
.col-sm-10,
.col-sm-11,
.col-sm-12,
.col-sm-offset-0,
.col-sm-offset-1,
.col-sm-offset-2,
.col-sm-offset-3,
Expand Down Expand Up @@ -350,10 +356,10 @@
}

.col-sm-2 {
-webkit-flex-basis: 16.667%;
-ms-flex-preferred-size: 16.667%;
flex-basis: 16.667%;
max-width: 16.667%;
-webkit-flex-basis: 16.666%;
-ms-flex-preferred-size: 16.666%;
flex-basis: 16.666%;
max-width: 16.666%;
}

.col-sm-3 {
Expand Down Expand Up @@ -426,12 +432,16 @@
max-width: 100%;
}

.col-sm-offset-0 {
margin-left: 0;
}

.col-sm-offset-1 {
margin-left: 8.333%;
}

.col-sm-offset-2 {
margin-left: 16.667%;
margin-left: 16.666%;
}

.col-sm-offset-3 {
Expand Down Expand Up @@ -561,6 +571,7 @@
.col-md-10,
.col-md-11,
.col-md-12,
.col-md-offset-0,
.col-md-offset-1,
.col-md-offset-2,
.col-md-offset-3,
Expand Down Expand Up @@ -601,10 +612,10 @@
}

.col-md-2 {
-webkit-flex-basis: 16.667%;
-ms-flex-preferred-size: 16.667%;
flex-basis: 16.667%;
max-width: 16.667%;
-webkit-flex-basis: 16.666%;
-ms-flex-preferred-size: 16.666%;
flex-basis: 16.666%;
max-width: 16.666%;
}

.col-md-3 {
Expand Down Expand Up @@ -677,12 +688,16 @@
max-width: 100%;
}

.col-md-offset-0 {
margin-left: 0;
}

.col-md-offset-1 {
margin-left: 8.333%;
}

.col-md-offset-2 {
margin-left: 16.667%;
margin-left: 16.666%;
}

.col-md-offset-3 {
Expand Down Expand Up @@ -812,6 +827,7 @@
.col-lg-10,
.col-lg-11,
.col-lg-12,
.col-lg-offset-0,
.col-lg-offset-1,
.col-lg-offset-2,
.col-lg-offset-3,
Expand Down Expand Up @@ -852,10 +868,10 @@
}

.col-lg-2 {
-webkit-flex-basis: 16.667%;
-ms-flex-preferred-size: 16.667%;
flex-basis: 16.667%;
max-width: 16.667%;
-webkit-flex-basis: 16.666%;
-ms-flex-preferred-size: 16.666%;
flex-basis: 16.666%;
max-width: 16.666%;
}

.col-lg-3 {
Expand Down Expand Up @@ -928,12 +944,16 @@
max-width: 100%;
}

.col-lg-offset-0 {
margin-left: 0;
}

.col-lg-offset-1 {
margin-left: 8.333%;
}

.col-lg-offset-2 {
margin-left: 16.667%;
margin-left: 16.666%;
}

.col-lg-offset-3 {
Expand Down
2 changes: 1 addition & 1 deletion dist/flexboxgrid.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion index.html

Large diffs are not rendered by default.

20 changes: 20 additions & 0 deletions src/css/flexboxgrid.css
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@
.col-xs-10,
.col-xs-11,
.col-xs-12,
.col-xs-offset-0,
.col-xs-offset-1,
.col-xs-offset-2,
.col-xs-offset-3,
Expand Down Expand Up @@ -145,6 +146,10 @@
max-width: 100%;
}

.col-xs-offset-0 {
margin-left: 0;
}

.col-xs-offset-1 {
margin-left: 8.333%;
}
Expand Down Expand Up @@ -250,6 +255,7 @@
.col-sm-10,
.col-sm-11,
.col-sm-12,
.col-sm-offset-0,
.col-sm-offset-1,
.col-sm-offset-2,
.col-sm-offset-3,
Expand Down Expand Up @@ -334,6 +340,10 @@
max-width: 100%;
}

.col-sm-offset-0 {
margin-left: 0;
}

.col-sm-offset-1 {
margin-left: 8.333%;
}
Expand Down Expand Up @@ -440,6 +450,7 @@
.col-md-10,
.col-md-11,
.col-md-12,
.col-md-offset-0,
.col-md-offset-1,
.col-md-offset-2,
.col-md-offset-3,
Expand Down Expand Up @@ -524,6 +535,10 @@
max-width: 100%;
}

.col-md-offset-0 {
margin-left: 0;
}

.col-md-offset-1 {
margin-left: 8.333%;
}
Expand Down Expand Up @@ -630,6 +645,7 @@
.col-lg-10,
.col-lg-11,
.col-lg-12,
.col-lg-offset-0,
.col-lg-offset-1,
.col-lg-offset-2,
.col-lg-offset-3,
Expand Down Expand Up @@ -714,6 +730,10 @@
max-width: 100%;
}

.col-lg-offset-0 {
margin-left: 0;
}

.col-lg-offset-1 {
margin-left: 8.333%;
}
Expand Down

0 comments on commit 6b1ecaa

Please sign in to comment.