mirror of
https://github.com/twbs/bootstrap.git
synced 2025-04-06 23:57:36 +02:00
fixes #5020: submenu support in dropup
This commit is contained in:
parent
f2bd7d9f27
commit
61332d727e
10
docs/assets/css/bootstrap.css
vendored
10
docs/assets/css/bootstrap.css
vendored
@ -2902,6 +2902,16 @@ table [class*=span],
|
|||||||
display: block;
|
display: block;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.dropup .dropdown-submenu > .dropdown-menu {
|
||||||
|
top: auto;
|
||||||
|
bottom: 0;
|
||||||
|
margin-top: 0;
|
||||||
|
margin-bottom: -2px;
|
||||||
|
-webkit-border-radius: 5px 5px 5px 0;
|
||||||
|
-moz-border-radius: 5px 5px 5px 0;
|
||||||
|
border-radius: 5px 5px 5px 0;
|
||||||
|
}
|
||||||
|
|
||||||
.dropdown-submenu > a:after {
|
.dropdown-submenu > a:after {
|
||||||
display: block;
|
display: block;
|
||||||
float: right;
|
float: right;
|
||||||
|
@ -182,6 +182,24 @@
|
|||||||
</ul>
|
</ul>
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
|
<div class="dropup" style="float: left; margin-left: 20px;">
|
||||||
|
<ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu" style="display: block; position: static; margin-bottom: 5px; *width: 180px;">
|
||||||
|
<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>
|
||||||
|
<li class="divider"></li>
|
||||||
|
<li class="dropdown-submenu">
|
||||||
|
<a tabindex="-1" href="#">More options</a>
|
||||||
|
<ul class="dropdown-menu">
|
||||||
|
<li><a tabindex="-1" href="#">Second level link</a></li>
|
||||||
|
<li><a tabindex="-1" href="#">Second level link</a></li>
|
||||||
|
<li><a tabindex="-1" href="#">Second level link</a></li>
|
||||||
|
<li><a tabindex="-1" href="#">Second level link</a></li>
|
||||||
|
<li><a tabindex="-1" href="#">Second level link</a></li>
|
||||||
|
</ul>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<pre class="prettyprint linenums">
|
<pre class="prettyprint linenums">
|
||||||
|
18
docs/templates/pages/components.mustache
vendored
18
docs/templates/pages/components.mustache
vendored
@ -111,6 +111,24 @@
|
|||||||
</ul>
|
</ul>
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
|
<div class="dropup" style="float: left; margin-left: 20px;">
|
||||||
|
<ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu" style="display: block; position: static; margin-bottom: 5px; *width: 180px;">
|
||||||
|
<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>
|
||||||
|
<li class="divider"></li>
|
||||||
|
<li class="dropdown-submenu">
|
||||||
|
<a tabindex="-1" href="#">{{_i}}More options{{/i}}</a>
|
||||||
|
<ul class="dropdown-menu">
|
||||||
|
<li><a tabindex="-1" href="#">{{_i}}Second level link{{/i}}</a></li>
|
||||||
|
<li><a tabindex="-1" href="#">{{_i}}Second level link{{/i}}</a></li>
|
||||||
|
<li><a tabindex="-1" href="#">{{_i}}Second level link{{/i}}</a></li>
|
||||||
|
<li><a tabindex="-1" href="#">{{_i}}Second level link{{/i}}</a></li>
|
||||||
|
<li><a tabindex="-1" href="#">{{_i}}Second level link{{/i}}</a></li>
|
||||||
|
</ul>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>{{! /example }}
|
</div>{{! /example }}
|
||||||
<pre class="prettyprint linenums">
|
<pre class="prettyprint linenums">
|
||||||
|
@ -163,6 +163,8 @@
|
|||||||
.dropdown-submenu {
|
.dropdown-submenu {
|
||||||
position: relative;
|
position: relative;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Default dropdowns
|
||||||
.dropdown-submenu > .dropdown-menu {
|
.dropdown-submenu > .dropdown-menu {
|
||||||
top: 0;
|
top: 0;
|
||||||
left: 100%;
|
left: 100%;
|
||||||
@ -176,6 +178,18 @@
|
|||||||
display: block;
|
display: block;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Dropups
|
||||||
|
.dropup .dropdown-submenu > .dropdown-menu {
|
||||||
|
top: auto;
|
||||||
|
bottom: 0;
|
||||||
|
margin-top: 0;
|
||||||
|
margin-bottom: -2px;
|
||||||
|
-webkit-border-radius: 5px 5px 5px 0;
|
||||||
|
-moz-border-radius: 5px 5px 5px 0;
|
||||||
|
border-radius: 5px 5px 5px 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Caret to indicate there is a submenu
|
||||||
.dropdown-submenu > a:after {
|
.dropdown-submenu > a:after {
|
||||||
display: block;
|
display: block;
|
||||||
content: " ";
|
content: " ";
|
||||||
|
Loading…
x
Reference in New Issue
Block a user