aboutsummaryrefslogtreecommitdiff
path: root/docs/assets/css
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2011-08-25 22:41:45 -0700
committerMark Otto <[email protected]>2011-08-25 22:41:45 -0700
commitce615d016a8ac380dae871358cfc7e745b5e20c2 (patch)
treeddde1c9abb56c15aba88ace812e490486bf14d95 /docs/assets/css
parent04b8e667d0a8caaf241570721bbf7afb7a5e1b2d (diff)
downloadbootstrap-ce615d016a8ac380dae871358cfc7e745b5e20c2.tar.xz
bootstrap-ce615d016a8ac380dae871358cfc7e745b5e20c2.zip
merged in my pending changes from 1.2-wip branch, resolve diffs as best as i could, update docs and alerts to use original classes, updated docs to include smaller section for layouts
Diffstat (limited to 'docs/assets/css')
-rw-r--r--docs/assets/css/docs.css4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index 8334d3f12..67a34280b 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -171,7 +171,7 @@ div.mini-layout div {
div.mini-layout div.mini-layout-body {
background-color: #dceaf4;
margin: 0 auto;
- width: 450px;
+ width: 340px;
height: 340px;
}
div.mini-layout.fluid div.mini-layout-sidebar,
@@ -185,7 +185,7 @@ div.mini-layout.fluid div.mini-layout-sidebar {
height: 340px;
}
div.mini-layout.fluid div.mini-layout-body {
- width: 400px;
+ width: 300px;
margin-left: 10px;
}
/* Topbar special styles