mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-24 14:04:09 +03:00
Code Activity

Merge branch 'gridcontainer' of https://github.com/jacobrask/bootstrap into jacobrask-gridcontainer

Browse Source 
Conflicts:
	docs/assets/bootstrap.zip
This commit is contained in:
Mark Otto
2012-02-19 15:01:25 -08:00
parent 5f2d2893d2 82457603b6
commit 89ccbdf8d1
4 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/assets/css/bootstrap.css
Vendored
+4 -2
View File
@@ -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;