aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorJacob Rask <[email protected]>2012-02-19 21:49:17 +0100
committerJacob Rask <[email protected]>2012-02-19 21:49:17 +0100
commit82457603b65b177e70793eebbcf5a9c23873a770 (patch)
tree10c5f01f071fe2420a96a27f20a3ef68fcb9bb0d /docs
parentac6e667ad9ae57c5caa977fd6593a2299887737a (diff)
downloadbootstrap-82457603b65b177e70793eebbcf5a9c23873a770.tar.xz
bootstrap-82457603b65b177e70793eebbcf5a9c23873a770.zip
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.
Diffstat (limited to 'docs')
-rw-r--r--docs/assets/bootstrap.zipbin53408 -> 53417 bytes
-rw-r--r--docs/assets/css/bootstrap-responsive.css10
-rw-r--r--docs/assets/css/bootstrap.css6
3 files changed, 12 insertions, 4 deletions
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index df4dc7ff2..d1b9b51e0 100644
--- a/docs/assets/bootstrap.zip
+++ b/docs/assets/bootstrap.zip
Binary files differ
diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css
index 906485e6d..9dd71c62d 100644
--- a/docs/assets/css/bootstrap-responsive.css
+++ b/docs/assets/css/bootstrap-responsive.css
@@ -161,7 +161,10 @@
.span11 {
width: 662px;
}
- .span12, .container {
+ .span12 {
+ width: 724px;
+ }
+ .container {
width: 724px;
}
.offset1 {
@@ -447,7 +450,10 @@
.span11 {
width: 1070px;
}
- .span12, .container {
+ .span12 {
+ width: 1170px;
+ }
+ .container {
width: 1170px;
}
.offset1 {
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 71ab7a9d4..ba403461b 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -168,7 +168,10 @@ a:hover {
.span11 {
width: 860px;
}
-.span12, .container {
+.span12 {
+ width: 940px;
+}
+.container {
width: 940px;
}
.offset1 {
@@ -259,7 +262,6 @@ a:hover {
width: 99.99999998999999%;
}
.container {
- width: 940px;
margin-left: auto;
margin-right: auto;
*zoom: 1;