You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2017/05/13 17:46:09 UTC

[2/2] isis git commit: ISIS-1614: fixes responsive menu bar for tertiary menu

ISIS-1614: fixes responsive menu bar for tertiary menu


Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/de83e6ed
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/de83e6ed
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/de83e6ed

Branch: refs/heads/master
Commit: de83e6edaa5657dd78859aea9837a09b59188912
Parents: 90dec11
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Sat May 13 18:28:38 2017 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Sat May 13 18:42:09 2017 +0100

----------------------------------------------------------------------
 .../viewer/wicket/ui/components/header/HeaderPanel.html | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/isis/blob/de83e6ed/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/header/HeaderPanel.html
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/header/HeaderPanel.html b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/header/HeaderPanel.html
index e887868..06c8ef9 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/header/HeaderPanel.html
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/header/HeaderPanel.html
@@ -36,7 +36,11 @@
                         <img alt="Brand" wicket:id="brandLogo"/>
                     </a>
                 </div>
-                <div class="navbar-header navbar-right">
+                <div class="navbar-collapse app-actions collapse navbar-left">
+                    <ul class="nav navbar-nav" wicket:id="primaryMenuBar"></ul>
+                </div>
+                <div class="navbar-collapse app-actions collapse navbar-right">
+                    <ul class="nav navbar-nav" wicket:id="secondaryMenuBar"></ul>
                     <ul class="nav navbar-nav tertiary">
                         <li class="dropdown">
                             <a tabindex="-1" href="#" class="dropdown-toggle" data-toggle="dropdown">
@@ -47,12 +51,6 @@
                         </li>
                     </ul>
                 </div>
-                <div class="navbar-collapse app-actions collapse navbar-right">
-                    <ul class="nav navbar-nav" wicket:id="secondaryMenuBar"></ul>
-                </div>
-                <div class="navbar-collapse app-actions collapse">
-                    <ul class="nav navbar-nav" wicket:id="primaryMenuBar"></ul>
-                </div>
             </div>
 
             </header>