diff options
| author | Mark Otto <[email protected]> | 2012-11-30 00:13:30 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-11-30 00:13:30 -0800 |
| commit | fca35c0dba060da14ccb29fc56dc37aa1de533c4 (patch) | |
| tree | 04cc972e705bedb2910247bdcfb0c8ede3cee09a /docs/assets/css/docs.css | |
| parent | 7e56e2265d67ae81ad8be52af4d56f189929207a (diff) | |
| parent | bca3ff4ed6f42701ceae1405f518c35ec8c623be (diff) | |
| download | bootstrap-fca35c0dba060da14ccb29fc56dc37aa1de533c4.tar.xz bootstrap-fca35c0dba060da14ccb29fc56dc37aa1de533c4.zip | |
Merge branch '2.2.2-wip' into exploratory
Conflicts:
docs/assets/css/bootstrap.css
docs/components.html
docs/templates/pages/components.mustache
less/alerts.less
less/button-groups.less
less/buttons.less
less/tests/css-tests.html
Diffstat (limited to 'docs/assets/css/docs.css')
| -rw-r--r-- | docs/assets/css/docs.css | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 9a7525422..21dc6ea18 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -831,6 +831,7 @@ form.bs-docs-example { /* When affixed, space properly */ .bs-docs-sidenav { top: 0; + width: 218px; margin-top: 30px; margin-right: 0; } @@ -838,7 +839,7 @@ form.bs-docs-example { /* Tablet to desktop ------------------------- */ -@media (min-width: 768px) and (max-width: 980px) { +@media (min-width: 768px) and (max-width: 979px) { /* Remove any padding from the body */ body { padding-top: 0; |