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/components.html | |
| 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/components.html')
| -rw-r--r-- | docs/components.html | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/docs/components.html b/docs/components.html index 3f1c71f10..c6d430e90 100644 --- a/docs/components.html +++ b/docs/components.html @@ -18,11 +18,11 @@ <![endif]--> <!-- Le fav and touch icons --> - <link rel="shortcut icon" href="assets/ico/favicon.png"> <link rel="apple-touch-icon-precomposed" sizes="144x144" href="assets/ico/apple-touch-icon-144-precomposed.png"> <link rel="apple-touch-icon-precomposed" sizes="114x114" href="assets/ico/apple-touch-icon-114-precomposed.png"> - <link rel="apple-touch-icon-precomposed" sizes="72x72" href="assets/ico/apple-touch-icon-72-precomposed.png"> - <link rel="apple-touch-icon-precomposed" href="assets/ico/apple-touch-icon-57-precomposed.png"> + <link rel="apple-touch-icon-precomposed" sizes="72x72" href="assets/ico/apple-touch-icon-72-precomposed.png"> + <link rel="apple-touch-icon-precomposed" href="assets/ico/apple-touch-icon-57-precomposed.png"> + <link rel="shortcut icon" href="assets/ico/favicon.png"> </head> @@ -162,12 +162,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> @@ -186,10 +186,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> @@ -208,10 +208,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> |