aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2017-02-02 10:33:23 +0100
committerMario Vavti <mario@mariovavti.com>2017-02-02 10:33:23 +0100
commit852073fc68dd8263db24c9bc24a784676a545532 (patch)
treea450c2af46c0638cf05bd2ebcb85de1aef0419f8
parent17082cda3c1600354cb3b9a40dc49182c706d103 (diff)
downloadvolse-hubzilla-852073fc68dd8263db24c9bc24a784676a545532.tar.gz
volse-hubzilla-852073fc68dd8263db24c9bc24a784676a545532.tar.bz2
volse-hubzilla-852073fc68dd8263db24c9bc24a784676a545532.zip
dropdown menus should be restricted in height in normal view but not in collapsed view
-rw-r--r--view/css/bootstrap-red.css7
-rwxr-xr-xview/tpl/nav.tpl3
2 files changed, 7 insertions, 3 deletions
diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css
index 39461ad32..f1ebb204e 100644
--- a/view/css/bootstrap-red.css
+++ b/view/css/bootstrap-red.css
@@ -35,6 +35,13 @@ aside .nav-pills > li > a,
nav .dropdown-menu {
margin-top: 0px;
+ max-height: 70vh;
+ overflow: auto;
+}
+
+nav .navbar-collapse.in .dropdown-menu {
+ max-height: none;
+ overflow: none;
}
.wall-item-tools .dropdown-menu {
diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl
index f74c88ce7..5a2dda730 100755
--- a/view/tpl/nav.tpl
+++ b/view/tpl/nav.tpl
@@ -180,9 +180,6 @@
</ul>
</div>
- <div class="collapse navbar-collapse" id="navbar-collapse-2">
- {{$navapps}}
- </div>
</div>
{{if $nav.help.6}}
<div id="contextual-help-content" class="contextual-help-content">