From 97765451d022f527b7c0477aca69de412b56cfd8 Mon Sep 17 00:00:00 2001 From: Yan Zhu Date: Wed, 6 Apr 2016 18:58:35 +0800 Subject: update responsive grid system --- demo/index.html | 98 +++++++++++++++++++++++++++------------------ dist/spectre.css | 118 ++++++++++++++++++++++++++++++++++++------------------- src/forms.less | 52 ++++++++++++++---------- src/layout.less | 57 +++++++++++++++++++-------- 4 files changed, 209 insertions(+), 116 deletions(-) diff --git a/demo/index.html b/demo/index.html index cd247b4..ca36a6d 100644 --- a/demo/index.html +++ b/demo/index.html @@ -2,6 +2,9 @@ + + + Spectre, a lightweight and clean CSS framework for faster and extendable development. @@ -122,50 +125,68 @@
-
First column
+
1
-
Second column
+
2
-
Third column
+
3
-
Fourth column
+
4
-
Fifth column
+
5
-
Sixth column
+
6
+
+
+
7
+
+
+
8
+
+
+
9
+
+
+
10
+
+
+
11
+
+
+
12
-
-
First column
+
+
1
-
-
Second column
+
+
2
-
Third column
+
3
-
Fourth column
+
4
-
First column
+
1
-
Second column
+
2
-
Third column
+
3
-
Fourth column
+
4
@@ -224,8 +245,12 @@
+
+
+
+
@@ -238,16 +263,19 @@
- - - + -
+
+ +
+
- + + +
@@ -280,7 +308,7 @@

-
+
@@ -329,22 +357,21 @@
-
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -423,10 +450,10 @@

media

- +
- +
@@ -506,11 +533,6 @@ Yan Zhu
-
- - Yan Zhu - -
Yan Zhu diff --git a/dist/spectre.css b/dist/spectre.css index 622e322..eae9afa 100644 --- a/dist/spectre.css +++ b/dist/spectre.css @@ -572,6 +572,7 @@ ol ol { } } .columns { + display: block; margin-left: -1rem; margin-right: -1rem; } @@ -582,30 +583,30 @@ ol ol { flex: 1; padding: 1rem; } -@media screen and (min-width: 769px) { +.column.col-12, +.column.col-11, +.column.col-10, +.column.col-9, +.column.col-8, +.column.col-7, +.column.col-6, +.column.col-5, +.column.col-4, +.column.col-3, +.column.col-2, +.column.col-1 { + -webkit-box-flex: 0; + -webkit-flex: none; + -ms-flex: none; + flex: none; +} +@media screen and (min-width: 841px) { .columns { display: -webkit-box; display: -webkit-flex; display: -ms-flexbox; display: flex; } - .column.col-12, - .column.col-11, - .column.col-10, - .column.col-9, - .column.col-8, - .column.col-7, - .column.col-6, - .column.col-5, - .column.col-4, - .column.col-3, - .column.col-2, - .column.col-1 { - -webkit-box-flex: 0; - -webkit-flex: none; - -ms-flex: none; - flex: none; - } .col-12 { width: 100%; } @@ -643,6 +644,33 @@ ol ol { width: 8.33333333%; } } +@media screen and (min-width: 481px) and (max-width: 840px) { + .columns { + display: -webkit-box; + display: -webkit-flex; + display: -ms-flexbox; + display: flex; + -webkit-flex-wrap: wrap; + -ms-flex-wrap: wrap; + flex-wrap: wrap; + } + .col-12 { + width: 100%; + } + .col-11, + .col-10, + .col-9, + .col-8, + .col-7, + .col-6, + .col-5, + .col-4, + .col-3, + .col-2, + .col-1 { + width: 50%; + } +} @media screen and (max-width: 480px) { .hide-xs { display: none !important; @@ -873,29 +901,39 @@ ol ol { .form-group:not(:last-child) { margin-bottom: 1rem; } -.form-horizontal { - padding: 1rem; -} -.form-horizontal .col-12, -.form-horizontal .col-11, -.form-horizontal .col-10, -.form-horizontal .col-9, -.form-horizontal .col-8, -.form-horizontal .col-7, -.form-horizontal .col-6, -.form-horizontal .col-5, -.form-horizontal .col-4, -.form-horizontal .col-3, -.form-horizontal .col-2, -.form-horizontal .col-1 { - float: left; -} -.form-horizontal .form-label { - padding: .8rem .4rem; +@media screen and (min-width: 841px) { + .form-horizontal { + padding: 1rem; + } + .form-horizontal .form-group { + display: -webkit-box; + display: -webkit-flex; + display: -ms-flexbox; + display: flex; + } + .form-horizontal .form-label { + padding: .8rem .4rem; + } + .form-horizontal .form-checkbox, + .form-horizontal .form-radio { + margin: .5rem 0; + } } -.form-horizontal .form-checkbox, -.form-horizontal .form-radio { - margin: .5rem 0; +@media screen and (max-width: 840px) { + .form-horizontal .col-12, + .form-horizontal .col-11, + .form-horizontal .col-10, + .form-horizontal .col-9, + .form-horizontal .col-8, + .form-horizontal .col-7, + .form-horizontal .col-6, + .form-horizontal .col-5, + .form-horizontal .col-4, + .form-horizontal .col-3, + .form-horizontal .col-2, + .form-horizontal .col-1 { + width: 100%; + } } .form-input { position: relative; diff --git a/src/forms.less b/src/forms.less index 996056c..fd85f2c 100644 --- a/src/forms.less +++ b/src/forms.less @@ -2,29 +2,39 @@ .form-group:not(:last-child) { margin-bottom: 1rem; } -.form-horizontal { - padding: 1rem; - .col-12, - .col-11, - .col-10, - .col-9, - .col-8, - .col-7, - .col-6, - .col-5, - .col-4, - .col-3, - .col-2, - .col-1 { - float: left; - } - .form-label { - padding: .8rem .4rem; +@media screen and (min-width: 841px) { + .form-horizontal { + padding: 1rem; + + .form-group { + display: flex; + } + .form-label { + padding: .8rem .4rem; + } + .form-checkbox, + .form-radio { + margin: .5rem 0; + } } - .form-checkbox, - .form-radio { - margin: .5rem 0; +} +@media screen and (max-width: 840px) { + .form-horizontal { + .col-12, + .col-11, + .col-10, + .col-9, + .col-8, + .col-7, + .col-6, + .col-5, + .col-4, + .col-3, + .col-2, + .col-1 { + width: 100%; + } } } // Form element: Input boxes diff --git a/src/layout.less b/src/layout.less index ccdd609..9c6a4e5 100644 --- a/src/layout.less +++ b/src/layout.less @@ -22,7 +22,9 @@ } } +// Responsive grid system .columns { + display: block; margin-left: -1rem; margin-right: -1rem; &:extend(.clearfix all); @@ -30,27 +32,26 @@ .column { flex: 1; padding: 1rem; + + &.col-12, + &.col-11, + &.col-10, + &.col-9, + &.col-8, + &.col-7, + &.col-6, + &.col-5, + &.col-4, + &.col-3, + &.col-2, + &.col-1 { + flex: none; + } } -@media screen and (min-width: 769px) { +@media screen and (min-width: 841px) { .columns { display: flex; } - .column { - &.col-12, - &.col-11, - &.col-10, - &.col-9, - &.col-8, - &.col-7, - &.col-6, - &.col-5, - &.col-4, - &.col-3, - &.col-2, - &.col-1 { - flex: none; - } - } .col-12 { width: 100%; } @@ -88,6 +89,28 @@ width: 8.33333333%; } } +@media screen and (min-width: 481px) and (max-width: 840px) { + .columns { + display: flex; + flex-wrap: wrap; + } + .col-12 { + width: 100%; + } + .col-11, + .col-10, + .col-9, + .col-8, + .col-7, + .col-6, + .col-5, + .col-4, + .col-3, + .col-2, + .col-1 { + width: 50%; + } +} // Responsive breakpoint system @media screen and (max-width: 480px) { -- cgit v1.3.1-26-gb76a