Commit 82457603 authored by Jacob Rask's avatar Jacob Rask
Browse files

Separate span12 and container classes

If you have less than 12 columns, container is too wide. Instead
generate container width using the @gridColumns variable.

Also remove duplicate container width property.
parent ac6e667a
Showing with 14 additions and 7 deletions
+14 -7
No preview for this file type
...@@ -161,7 +161,10 @@ ...@@ -161,7 +161,10 @@
.span11 { .span11 {
width: 662px; width: 662px;
} }
.span12, .container { .span12 {
width: 724px;
}
.container {
width: 724px; width: 724px;
} }
.offset1 { .offset1 {
...@@ -447,7 +450,10 @@ ...@@ -447,7 +450,10 @@
.span11 { .span11 {
width: 1070px; width: 1070px;
} }
.span12, .container { .span12 {
width: 1170px;
}
.container {
width: 1170px; width: 1170px;
} }
.offset1 { .offset1 {
......
...@@ -168,7 +168,10 @@ a:hover { ...@@ -168,7 +168,10 @@ a:hover {
.span11 { .span11 {
width: 860px; width: 860px;
} }
.span12, .container { .span12 {
width: 940px;
}
.container {
width: 940px; width: 940px;
} }
.offset1 { .offset1 {
...@@ -259,7 +262,6 @@ a:hover { ...@@ -259,7 +262,6 @@ a:hover {
width: 99.99999998999999%; width: 99.99999998999999%;
} }
.container { .container {
width: 940px;
margin-left: auto; margin-left: auto;
margin-right: auto; margin-right: auto;
*zoom: 1; *zoom: 1;
......
...@@ -142,7 +142,6 @@ ...@@ -142,7 +142,6 @@
// Site container // Site container
// ------------------------- // -------------------------
.container-fixed() { .container-fixed() {
width: @gridRowWidth;
margin-left: auto; margin-left: auto;
margin-right: auto; margin-right: auto;
.clearfix(); .clearfix();
...@@ -185,8 +184,8 @@ ...@@ -185,8 +184,8 @@
.span9 { #gridSystem > .columns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 9); } .span9 { #gridSystem > .columns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 9); }
.span10 { #gridSystem > .columns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 10); } .span10 { #gridSystem > .columns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 10); }
.span11 { #gridSystem > .columns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 11); } .span11 { #gridSystem > .columns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 11); }
.span12, .span12 { #gridSystem > .columns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 12); }
.container { #gridSystem > .columns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 12); } .container { #gridSystem > .columns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, @gridColumns); }
// Offset column options // Offset column options
.offset1 { #gridSystem > .offset(@gridColumnWidth, @gridGutterWidth, 1); } .offset1 { #gridSystem > .offset(@gridColumnWidth, @gridGutterWidth, 1); }
.offset2 { #gridSystem > .offset(@gridColumnWidth, @gridGutterWidth, 2); } .offset2 { #gridSystem > .offset(@gridColumnWidth, @gridGutterWidth, 2); }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment