diff options
| author | Mark Otto <[email protected]> | 2012-12-05 11:05:10 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-12-05 11:05:10 -0800 |
| commit | 33e14fe5bfd7a7091ab491a961d66a2a2580f1de (patch) | |
| tree | 79c2c539e578877c3241e90402e47c4691c22a39 /docs/assets/css/docs.css | |
| parent | b3019d7aab877cccf03fda3e6894c0fdaa7330f3 (diff) | |
| parent | ed74992853054c57f33ef5d21941f0869e287552 (diff) | |
| download | bootstrap-33e14fe5bfd7a7091ab491a961d66a2a2580f1de.tar.xz bootstrap-33e14fe5bfd7a7091ab491a961d66a2a2580f1de.zip | |
Merge branch '2.2.2-wip' into 3.0.0-wip
Conflicts:
README.md
docs/assets/css/bootstrap.css
docs/assets/js/bootstrap.js
docs/assets/js/bootstrap.min.js
docs/examples/fluid.html
docs/scaffolding.html
less/breadcrumbs.less
less/popovers.less
less/responsive.less
Diffstat (limited to 'docs/assets/css/docs.css')
| -rw-r--r-- | docs/assets/css/docs.css | 36 |
1 files changed, 35 insertions, 1 deletions
diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 54a76236d..6a7b3d485 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -689,6 +689,21 @@ form.bs-docs-example { margin: 20px; } +/* Dropdowns */ +.bs-docs-example-submenus { + min-height: 180px; +} +.bs-docs-example-submenus > .pull-left + .pull-left { + margin-left: 20px; +} +.bs-docs-example-submenus .dropup > .dropdown-menu, +.bs-docs-example-submenus .dropdown > .dropdown-menu { + display: block; + position: static; + margin-bottom: 5px; + *width: 180px; +} + /* Responsive docs @@ -986,7 +1001,26 @@ form.bs-docs-example { word-break: break-all; } - /* Modal example */ + /* Examples: dropdowns */ + .bs-docs-example-submenus > .pull-left { + float: none; + clear: both; + } + .bs-docs-example-submenus > .pull-left, + .bs-docs-example-submenus > .pull-left + .pull-left { + margin-left: 0; + } + .bs-docs-example-submenus p { + margin-bottom: 0; + } + .bs-docs-example-submenus .dropup > .dropdown-menu, + .bs-docs-example-submenus .dropdown > .dropdown-menu { + margin-bottom: 10px; + float: none; + max-width: 180px; + } + + /* Examples: modal */ .modal-example .modal { position: relative; top: auto; |