diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 6e9bbb9be7da30859ad1fc44f8464a728447460b..c7bddd45af9bfd4616f4666837f3552ec2000242 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -687,6 +687,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 @@ -1013,7 +1028,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; diff --git a/docs/components.html b/docs/components.html index b5e22e3da5cdbb777b5a8a5a36598e5224a741b6..518924026be014342b4d9c25d4696f65fdd006ef 100644 --- a/docs/components.html +++ b/docs/components.html @@ -165,12 +165,12 @@ <h3>Sub menus on dropdowns</h3> <p>Add an extra level of dropdown menus, appearing on hover like those of OS X, with some simple markup additions. Add <code>.dropdown-submenu</code> to any <code>li</code> in an existing dropdown menu for automatic styling.</p> - <div class="bs-docs-example" style="min-height: 180px;"> + <div class="bs-docs-example bs-docs-example-submenus"> <div class="pull-left"> <p class="muted">Default</p> <div class="dropdown clearfix"> - <ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu" style="display: block; position: static; margin-bottom: 5px; *width: 180px;"> + <ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu"> <li><a tabindex="-1" href="#">Action</a></li> <li><a tabindex="-1" href="#">Another action</a></li> <li><a tabindex="-1" href="#">Something else here</a></li> @@ -189,10 +189,10 @@ </div> </div> - <div class="pull-left" style="margin-left: 20px;"> + <div class="pull-left"> <p class="muted">Dropup</p> <div class="dropup"> - <ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu" style="display: block; position: static; margin-bottom: 5px; *width: 180px;"> + <ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu"> <li><a tabindex="-1" href="#">Action</a></li> <li><a tabindex="-1" href="#">Another action</a></li> <li><a tabindex="-1" href="#">Something else here</a></li> @@ -211,10 +211,10 @@ </div> </div> - <div class="pull-left" style="margin-left: 20px;"> + <div class="pull-left"> <p class="muted">Left submenu</p> <div class="dropdown"> - <ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu" style="display: block; position: static; margin-bottom: 5px; *width: 180px;"> + <ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu"> <li><a tabindex="-1" href="#">Action</a></li> <li><a tabindex="-1" href="#">Another action</a></li> <li><a tabindex="-1" href="#">Something else here</a></li> diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache index 6fa1947028e3c7067124947e7cf9870bf74c7be8..283bdf8825942a2cb65f07df87ad5f9360427224 100644 --- a/docs/templates/pages/components.mustache +++ b/docs/templates/pages/components.mustache @@ -94,12 +94,12 @@ <h3>{{_i}}Sub menus on dropdowns{{/i}}</h3> <p>{{_i}}Add an extra level of dropdown menus, appearing on hover like those of OS X, with some simple markup additions. Add <code>.dropdown-submenu</code> to any <code>li</code> in an existing dropdown menu for automatic styling.{{/i}}</p> - <div class="bs-docs-example" style="min-height: 180px;"> + <div class="bs-docs-example bs-docs-example-submenus"> <div class="pull-left"> <p class="muted">Default</p> <div class="dropdown clearfix"> - <ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu" style="display: block; position: static; margin-bottom: 5px; *width: 180px;"> + <ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu"> <li><a tabindex="-1" href="#">{{_i}}Action{{/i}}</a></li> <li><a tabindex="-1" href="#">{{_i}}Another action{{/i}}</a></li> <li><a tabindex="-1" href="#">{{_i}}Something else here{{/i}}</a></li> @@ -118,10 +118,10 @@ </div> </div>{{! /.pull-left }} - <div class="pull-left" style="margin-left: 20px;"> + <div class="pull-left"> <p class="muted">Dropup</p> <div class="dropup"> - <ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu" style="display: block; position: static; margin-bottom: 5px; *width: 180px;"> + <ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu"> <li><a tabindex="-1" href="#">{{_i}}Action{{/i}}</a></li> <li><a tabindex="-1" href="#">{{_i}}Another action{{/i}}</a></li> <li><a tabindex="-1" href="#">{{_i}}Something else here{{/i}}</a></li> @@ -140,10 +140,10 @@ </div> </div>{{! /.pull-left }} - <div class="pull-left" style="margin-left: 20px;"> + <div class="pull-left"> <p class="muted">Left submenu</p> <div class="dropdown"> - <ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu" style="display: block; position: static; margin-bottom: 5px; *width: 180px;"> + <ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu"> <li><a tabindex="-1" href="#">{{_i}}Action{{/i}}</a></li> <li><a tabindex="-1" href="#">{{_i}}Another action{{/i}}</a></li> <li><a tabindex="-1" href="#">{{_i}}Something else here{{/i}}</a></li>