From dcf0d4e1e74ade53b6f89df445cd4ea7be57d556 Mon Sep 17 00:00:00 2001 From: Yan Zhu Date: Fri, 11 Mar 2016 14:54:58 +0800 Subject: add 960px layout --- demo/index.html | 12 ++++++------ dist/spectre.css | 18 +++++++++++++++--- src/layout.less | 7 +++++++ src/utilities.less | 12 +++++++++--- 4 files changed, 37 insertions(+), 12 deletions(-) diff --git a/demo/index.html b/demo/index.html index f886414..be55664 100644 --- a/demo/index.html +++ b/demo/index.html @@ -6,9 +6,9 @@ -
+
-
headings
+

headings

H1 Title

H2 Title

H3 Title

@@ -16,17 +16,17 @@
H5 Title
H6 Title
-
paragraphs
+

paragraphs

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.

-
blockquote
+

blockquote

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.

-
lists
+

lists

  • list item 1
  • list item 2 @@ -51,7 +51,7 @@
-
flexbox layout
+

flexbox layout

First column diff --git a/dist/spectre.css b/dist/spectre.css index 3673bd7..2a18f31 100644 --- a/dist/spectre.css +++ b/dist/spectre.css @@ -505,6 +505,12 @@ ol ol { padding-left: 10px; padding-right: 10px; } +.container.grid-960 { + width: 960px; +} +.container.grid-full { + width: 100%; +} .columns { display: -webkit-box; display: -webkit-flex; @@ -642,6 +648,12 @@ ol ol { position: absolute; left: 0; } +.centered { + display: block; + float: none; + margin-left: auto; + margin-right: auto; +} .mt-10 { margin-top: 10px; } @@ -667,13 +679,13 @@ ol ol { margin-left: 5px; } .block { - display: block !important; + display: block; } .inline { - display: inline !important; + display: inline; } .inline-block { - display: inline-block !important; + display: inline-block; } .flex { display: -webkit-box; diff --git a/src/layout.less b/src/layout.less index 7879aff..d7f6557 100644 --- a/src/layout.less +++ b/src/layout.less @@ -5,6 +5,13 @@ padding-left: 10px; padding-right: 10px; &:extend(.clearfix all); + + &.grid-960 { + width: 960px; + } + &.grid-full { + width: 100%; + } } .columns { diff --git a/src/utilities.less b/src/utilities.less index eee854a..d49fe37 100644 --- a/src/utilities.less +++ b/src/utilities.less @@ -34,6 +34,12 @@ .abs; left: 0; } +.centered { + display: block; + float: none; + margin-left: auto; + margin-right: auto; +} .mt-10 { margin-top: 10px; @@ -63,13 +69,13 @@ // Display .block { - display: block !important; + display: block; } .inline { - display: inline !important; + display: inline; } .inline-block { - display: inline-block !important; + display: inline-block; } .flex { display: flex; -- cgit v1.3.1-23-gd82d