diff options
| -rw-r--r-- | docs/assets/bootstrap.zip | bin | 56599 -> 56637 bytes | |||
| -rw-r--r-- | docs/assets/css/bootstrap.css | 8 | ||||
| -rw-r--r-- | docs/components.html | 20 | ||||
| -rw-r--r-- | docs/templates/pages/components.mustache | 20 | ||||
| -rw-r--r-- | less/dropdowns.less | 4 | ||||
| -rw-r--r-- | less/navbar.less | 2 |
6 files changed, 8 insertions, 46 deletions
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip Binary files differindex dde638c05..91d731edb 100644 --- a/docs/assets/bootstrap.zip +++ b/docs/assets/bootstrap.zip diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index c9c2ee891..912be887a 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1867,12 +1867,12 @@ table .span24 { left: auto; right: 0; } -.dropup .caret { +.dropup .caret, .navbar-fixed-bottom .dropdown .caret { border-top: 0; border-bottom: 4px solid #000000; content: "\2191"; } -.dropup .dropdown-menu { +.dropup .dropdown-menu, .navbar-fixed-bottom .dropdown .dropdown-menu { top: auto; bottom: 100%; margin-bottom: 1px; @@ -2945,14 +2945,14 @@ button.btn.btn-small, input[type="submit"].btn.btn-small { top: -6px; left: 10px; } -.navbar .dropdown-menu.bottom-up:before { +.navbar-fixed-bottom .dropdown-menu:before { border-top: 7px solid #ccc; border-top-color: rgba(0, 0, 0, 0.2); border-bottom: 0; bottom: -7px; top: auto; } -.navbar .dropdown-menu.bottom-up:after { +.navbar-fixed-bottom .dropdown-menu:after { border-top: 6px solid #ffffff; border-bottom: 0; bottom: -6px; diff --git a/docs/components.html b/docs/components.html index 41129c304..ee0e17b0f 100644 --- a/docs/components.html +++ b/docs/components.html @@ -898,16 +898,6 @@ <li><a href="#">One more separated link</a></li> </ul> </li> - <li class="dropdown"> - <a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropup <b class="caret bottom-up"></b></a> - <ul class="dropdown-menu bottom-up pull-right"> - <li><a href="#">Action</a></li> - <li><a href="#">Another action</a></li> - <li><a href="#">Something else here</a></li> - <li class="divider"></li> - <li><a href="#">Separated link</a></li> - </ul> - </li> </ul> <form class="navbar-search pull-left" action=""> <input type="text" class="search-query span2" placeholder="Search"> @@ -916,16 +906,6 @@ <li><a href="#">Link</a></li> <li class="divider-vertical"></li> <li class="dropdown"> - <a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropup <b class="caret bottom-up"></b></a> - <ul class="dropdown-menu bottom-up pull-right"> - <li><a href="#">Action</a></li> - <li><a href="#">Another action</a></li> - <li><a href="#">Something else here</a></li> - <li class="divider"></li> - <li><a href="#">Separated link</a></li> - </ul> - </li> - <li class="dropdown"> <a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a> <ul class="dropdown-menu"> <li><a href="#">Action</a></li> diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache index 7c12d8eb1..431bf164b 100644 --- a/docs/templates/pages/components.mustache +++ b/docs/templates/pages/components.mustache @@ -822,16 +822,6 @@ <li><a href="#">{{_i}}One more separated link{{/i}}</a></li> </ul> </li> - <li class="dropdown"> - <a href="#" class="dropdown-toggle" data-toggle="dropdown">{{_i}}Dropup{{/i}} <b class="caret bottom-up"></b></a> - <ul class="dropdown-menu bottom-up pull-right"> - <li><a href="#">{{_i}}Action{{/i}}</a></li> - <li><a href="#">{{_i}}Another action{{/i}}</a></li> - <li><a href="#">{{_i}}Something else here{{/i}}</a></li> - <li class="divider"></li> - <li><a href="#">{{_i}}Separated link{{/i}}</a></li> - </ul> - </li> </ul> <form class="navbar-search pull-left" action=""> <input type="text" class="search-query span2" placeholder="Search"> @@ -840,16 +830,6 @@ <li><a href="#">{{_i}}Link{{/i}}</a></li> <li class="divider-vertical"></li> <li class="dropdown"> - <a href="#" class="dropdown-toggle" data-toggle="dropdown">{{_i}}Dropup{{/i}} <b class="caret bottom-up"></b></a> - <ul class="dropdown-menu bottom-up pull-right"> - <li><a href="#">{{_i}}Action{{/i}}</a></li> - <li><a href="#">{{_i}}Another action{{/i}}</a></li> - <li><a href="#">{{_i}}Something else here{{/i}}</a></li> - <li class="divider"></li> - <li><a href="#">{{_i}}Separated link{{/i}}</a></li> - </ul> - </li> - <li class="dropdown"> <a href="#" class="dropdown-toggle" data-toggle="dropdown">{{_i}}Dropdown{{/i}} <b class="caret"></b></a> <ul class="dropdown-menu"> <li><a href="#">{{_i}}Action{{/i}}</a></li> diff --git a/less/dropdowns.less b/less/dropdowns.less index a0753f200..12ce7c2e5 100644 --- a/less/dropdowns.less +++ b/less/dropdowns.less @@ -126,7 +126,9 @@ // Allow for dropdowns to go bottom up (aka, dropup-menu) // ------------------------------------------------------ // Just add .dropup after the standard .dropdown class and you're set, bro. -.dropup { +// TODO: abstract this so that the navbar fixed styles are not placed here? +.dropup, +.navbar-fixed-bottom .dropdown { // Reverse the caret .caret { border-top: 0; diff --git a/less/navbar.less b/less/navbar.less index db299732a..90666133f 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -275,7 +275,7 @@ } } // Menu position and menu caret support for dropups via extra bottom-up class -.navbar .dropdown-menu.bottom-up { +.navbar-fixed-bottom .dropdown-menu { &:before { border-top: 7px solid #ccc; border-top-color: rgba(0, 0, 0, 0.2); |