Skip to content

Commit 9cd1736

Browse files
committed
Merge branch 'release-0.1.2'
2 parents a7fb0ec + d9c597f commit 9cd1736

17 files changed

+1922
-404
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.1",
3+
"version": "0.1.2",
44
"homepage": "https://github.com/thingsym/flexbox-grid-mixins",
55
"author": "Thingsym",
66
"description": "Sass Mixins to generate Flexbox grid",

doc/css/example.css

Lines changed: 0 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -746,57 +746,6 @@ ul.grid li {
746746
margin: 0 1% 2%;
747747
}
748748

749-
.grid--unit-set {
750-
box-sizing: border-box;
751-
display: -webkit-flex;
752-
display: -ms-flexbox;
753-
display: flex;
754-
-webkit-flex-flow: row nowrap;
755-
-ms-flex-flow: row nowrap;
756-
flex-flow: row nowrap;
757-
margin: 0 -2.5%;
758-
}
759-
760-
.grid--unit-set .grid__col {
761-
box-sizing: border-box;
762-
-webkit-flex: 0 1 auto;
763-
-ms-flex: 0 1 auto;
764-
flex: 0 1 auto;
765-
margin: 0 1% 2%;
766-
}
767-
768-
.grid--unit-set .grid__col--200px {
769-
box-sizing: border-box;
770-
-webkit-flex: 0 1 200px;
771-
-ms-flex: 0 1 200px;
772-
flex: 0 1 200px;
773-
margin: 0 2.5% 5%;
774-
}
775-
776-
.grid--unit-set .grid__col--10em {
777-
box-sizing: border-box;
778-
-webkit-flex: 0 1 10em;
779-
-ms-flex: 0 1 10em;
780-
flex: 0 1 10em;
781-
margin: 0 2.5% 5%;
782-
}
783-
784-
.grid--unit-set .grid__col--20rem {
785-
box-sizing: border-box;
786-
-webkit-flex: 0 1 20rem;
787-
-ms-flex: 0 1 20rem;
788-
flex: 0 1 20rem;
789-
margin: 0 2.5% 5%;
790-
}
791-
792-
.grid--unit-set .grid__col--30per {
793-
box-sizing: border-box;
794-
-webkit-flex: 0 1 30%;
795-
-ms-flex: 0 1 30%;
796-
flex: 0 1 30%;
797-
margin: 0 2.5% 5%;
798-
}
799-
800749
.grid--row {
801750
box-sizing: border-box;
802751
display: -webkit-flex;

doc/css/margin-offset.css

Lines changed: 0 additions & 116 deletions
Original file line numberDiff line numberDiff line change
@@ -44,67 +44,6 @@ h2 {
4444
border-bottom: solid 1px #ccc;
4545
}
4646

47-
pre {
48-
overflow: auto;
49-
line-height: 1.45;
50-
background-color: #f7f7f7;
51-
padding: 1em;
52-
border-radius: .4em;
53-
}
54-
55-
pre.scrollable {
56-
max-height: 240px;
57-
overflow-y: scroll;
58-
}
59-
60-
pre > code {
61-
background: transparent;
62-
}
63-
64-
code {
65-
padding: .2em;
66-
background-color: rgba(0, 0, 0, 0.04);
67-
border-radius: .2em;
68-
}
69-
70-
.reference {
71-
background-color: #0466e0;
72-
color: #fff;
73-
padding: 1em;
74-
border-radius: .4em;
75-
}
76-
77-
.reference .small {
78-
font-size: 80%;
79-
font-weight: normal;
80-
}
81-
82-
.reference .big {
83-
font-size: 160%;
84-
}
85-
86-
table {
87-
border-collapse: collapse;
88-
border-spacing: 0;
89-
border: 2px solid #ccc;
90-
margin: 0 0 1.625em;
91-
width: 100%;
92-
}
93-
94-
th {
95-
border-top: 1px solid #ccc;
96-
border-right: 1px solid #ccc;
97-
padding: .2em;
98-
font-weight: bold;
99-
background-color: #eee;
100-
}
101-
102-
td {
103-
border-top: 1px solid #ccc;
104-
border-right: 1px solid #ccc;
105-
padding: .2em;
106-
}
107-
10847
.grid,
10948
[class*="grid--"] {
11049
background: #a5c3e2;
@@ -769,61 +708,6 @@ ul.grid li {
769708
margin-bottom: 2%;
770709
}
771710

772-
.grid--unit-set {
773-
box-sizing: border-box;
774-
display: -webkit-flex;
775-
display: -ms-flexbox;
776-
display: flex;
777-
-webkit-flex-flow: row nowrap;
778-
-ms-flex-flow: row nowrap;
779-
flex-flow: row nowrap;
780-
}
781-
782-
.grid--unit-set .grid__col {
783-
box-sizing: border-box;
784-
-webkit-flex: 0 1 auto;
785-
-ms-flex: 0 1 auto;
786-
flex: 0 1 auto;
787-
margin-right: 2%;
788-
margin-bottom: 2%;
789-
}
790-
791-
.grid--unit-set .grid__col--200px {
792-
box-sizing: border-box;
793-
-webkit-flex: 0 1 200px;
794-
-ms-flex: 0 1 200px;
795-
flex: 0 1 200px;
796-
margin-right: 5%;
797-
margin-bottom: 5%;
798-
}
799-
800-
.grid--unit-set .grid__col--10em {
801-
box-sizing: border-box;
802-
-webkit-flex: 0 1 10em;
803-
-ms-flex: 0 1 10em;
804-
flex: 0 1 10em;
805-
margin-right: 5%;
806-
margin-bottom: 5%;
807-
}
808-
809-
.grid--unit-set .grid__col--20rem {
810-
box-sizing: border-box;
811-
-webkit-flex: 0 1 20rem;
812-
-ms-flex: 0 1 20rem;
813-
flex: 0 1 20rem;
814-
margin-right: 5%;
815-
margin-bottom: 5%;
816-
}
817-
818-
.grid--unit-set .grid__col--30per {
819-
box-sizing: border-box;
820-
-webkit-flex: 0 1 30%;
821-
-ms-flex: 0 1 30%;
822-
flex: 0 1 30%;
823-
margin-right: 5%;
824-
margin-bottom: 5%;
825-
}
826-
827711
.grid--row {
828712
box-sizing: border-box;
829713
display: -webkit-flex;

0 commit comments

Comments
 (0)