[frio] Remove unwanted navbar-nav behavior for top nav bar on mobile

- Rename overly generic notification menu button id

diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css
index 12a961108d627aa8f78b9c6dfc70459c50bb8f50..5bbc21709017caa45f6adeb958a5e4a497e858e3 100644 (file)
--- a/view/theme/frio/css/style.css
+++ b/view/theme/frio/css/style.css
@@ -417,7 +417,11 @@ header #banner #logo-img,
 }
 }
 @media (max-width: 991px) {
-    .topbar ul.nav>li>a { padding-left: 10px; padding-right: 10px; };
+    .topbar ul.nav > li > a,
+    .topbar ul.nav > li > button
+       {
+               padding: 15px 10px;
+       }
 }
 .topbar .dropdown-footer {
     margin: 10px
@@ -862,9 +866,6 @@ nav.navbar a, nav.navbar .btn-link {
 }
 
 /* Dropdown Menus */
-#dropdownMenu1 {
-    padding: 15px 15px;
-}
 .nav > li > .btn-link {
     position: relative;
     display: block;

diff --git a/view/theme/frio/templates/nav.tpl b/view/theme/frio/templates/nav.tpl
index cc661b3d50c1d7520183aa47771ccccf38a83c47..ad9f93066348331eb331e7e7848fcc4c435d24e7 100644 (file)
--- a/view/theme/frio/templates/nav.tpl
+++ b/view/theme/frio/templates/nav.tpl
@@ -37,7 +37,7 @@
                                </button>
 
                                {{* Left section of the NavBar with navigation shortcuts/icons *}}
-                               <ul class="nav navbar-nav navbar-left" role="menubar">
+                               <ul class="nav navbar-left" role="menubar">
                                        {{if $nav.network}}
                                        <li class="nav-segment">
                                                <a accesskey="n" class="nav-menu {{$sel.network}}" href="{{$nav.network.0}}" data-toggle="tooltip" aria-label="{{$nav.network.3}}" title="{{$nav.network.3}}"><i class="fa fa-lg fa-th" aria-hidden="true"></i><span id="net-update" class="nav-network-badge badge nav-notification"></span></a>
@@ -76,14 +76,12 @@
                                        {{* The notifications dropdown *}}
                                        {{if $nav.notifications}}
                                                <li id="nav-notification" class="nav-segment dropdown" role="presentation">
-                                                       <button id="dropdownMenu1" class="btn-link dropdown-toggle" data-toggle="dropdown" type="button" aria-haspopup="true" aria-expanded="false" aria-controls="nav-notifications-menu">
+                                                       <button id="nav-notifications-menu-btn" class="btn-link dropdown-toggle" data-toggle="dropdown" type="button" aria-haspopup="true" aria-expanded="false" aria-controls="nav-notifications-menu">
                                                                <span id="notification-update" class="nav-notification-badge badge nav-notification dropdown" data-toggle="dropdown"></span>
                                                                <i class="fa fa-bell fa-lg" aria-label="{{$nav.notifications.1}}"></i>
                                                        </button>
                                                        {{* The notifications dropdown menu. There are two parts of menu. The second is at the bottom of this file. It is loaded via js. Look at nav-notifications-template *}}
-                                                       <ul id="nav-notifications-menu" class="dropdown-menu menu-popup" role="menu" aria-labelledby="dropdownMenu1">
-<!--                                                   <ul id="nav-notifications-menu" class="dropdown-menu menu-popup" role="menu" aria-labelledby="dropdownMenu1" style="display: none;">
--->
+                                                       <ul id="nav-notifications-menu" class="dropdown-menu menu-popup" role="menu" aria-labelledby="nav-notifications-menu-btn">
                                                                {{* the following list entry must have the id "nav-notificaionts-mark-all". Without it this isn't visable. ....strange behavior :-/ *}}
                                                                <li role="presentation" id="nav-notifications-mark-all" class="dropdown-header">
                                                                        <div class="arrow"></div>