diff options
| author | Jacob Thornton <[email protected]> | 2011-08-21 21:42:56 -0700 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2011-08-21 21:42:56 -0700 |
| commit | e11c49cc48a70de1728ed18ca425db74e79c9938 (patch) | |
| tree | bd23ebcb2e9f077024bb1b551fbba2e84e263c33 /docs/assets/css | |
| parent | b54dc13535ce50d26f3814a0246aae769ff45fc8 (diff) | |
| parent | f169c99f726c250f0bb2f68ea4eedaaf3fbe15c0 (diff) | |
| download | bootstrap-e11c49cc48a70de1728ed18ca425db74e79c9938.tar.xz bootstrap-e11c49cc48a70de1728ed18ca425db74e79c9938.zip | |
Merge branch 'master' of github.com:twitter/bootstrap
Conflicts:
bootstrap-1.0.0.css
bootstrap-1.0.0.min.css
docs/index.html
Diffstat (limited to 'docs/assets/css')
| -rw-r--r-- | docs/assets/css/docs.css | 34 |
1 files changed, 4 insertions, 30 deletions
diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 96c9ffb97..b7d241994 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -44,7 +44,7 @@ section { font-weight: bold; } #masthead { - margin-top: -20px; + margin-top: 40px; } #masthead h1, #masthead p { @@ -146,34 +146,6 @@ div.quickstart form textarea { .show-grid:hover .column, .show-grid:hover .columns { background: rgba(0, 0, 0, 0.25); } -/* Hashgrid.js grid (press G & H to view) --------------------------------------------------- */ -#grid { - width: 980px; - position: absolute; - top: 0; - left: 50%; - margin-left: -490px; -} -#grid div.vert { - background-color: rgba(0, 206, 209, 0.075); - width: 39px; - border: solid darkturquoise; - border-width: 0 1px; - margin-right: 19px; -} -#grid div.vert.first-line { - margin-left: 19px; -} -#grid div.horiz { - height: 19px; - border-bottom: 1px solid rgba(255, 0, 0, 0.1); - margin: 0; - padding: 0; -} -#grid div.horiz:nth-child(5n) { - border-color: rgba(255, 0, 0, 0.25); -} /* Render mini layout previews -------------------------------------------------- */ div.mini-layout { @@ -199,7 +171,9 @@ div.mini-layout div.mini-layout-body { width: 450px; height: 340px; } -div.mini-layout.fluid div.mini-layout-sidebar, div.mini-layout.fluid div.mini-layout-header, div.mini-layout.fluid div.mini-layout-body { +div.mini-layout.fluid div.mini-layout-sidebar, +div.mini-layout.fluid div.mini-layout-header, +div.mini-layout.fluid div.mini-layout-body { float: left; } div.mini-layout.fluid div.mini-layout-sidebar { |