[Libreoffice-commits] online.git: loleaflet/css loleaflet/html loleaflet/src

[Libreoffice Gerrit user]

 loleaflet/css/menubar.css                |   11 ++++-------
 loleaflet/html/loleaflet.html.m4         |    9 +++++----
 loleaflet/src/control/Control.Menubar.js |    3 +++
 3 files changed, 12 insertions(+), 11 deletions(-)

New commits:
commit c0643e14212c10c8808aaba961b792f2f98e5915
Author:     Henry Castro <hcastro at collabora.com>
AuthorDate: Sun Oct 21 10:49:52 2018 -0400
Commit:     Henry Castro <hcastro at collabora.com>
CommitDate: Sun Oct 21 12:53:16 2018 -0400

    loleaflet: mobile: move button (hamburger/x icon)
    
    Change-Id: If552c5f77cb56818f6762b77f34498eabc267d1a

diff --git a/loleaflet/css/menubar.css b/loleaflet/css/menubar.css
index d55ad37dc..79462d356 100644
--- a/loleaflet/css/menubar.css
+++ b/loleaflet/css/menubar.css
@@ -119,9 +119,6 @@
 /* Mobile menu toggle button */
 
 .main-menu-btn {
-    z-index: 2000;
-    float: right;
-    top: 5px;
     margin: 2px 10px;
     position: relative;
     display: inline-block;
@@ -228,18 +225,18 @@
 
     #main-menu {
 	position: relative;
-	top: 40px;
+	top: 0;
     }
 
     .main-nav {
         position: absolute;
-        height: initial;
+        height: 0;
         width: 100%;
-        top: 0;
-        bottom: 33px;
+        top: 41px;
         margin: 0;
         -webkit-overflow-scrolling: touch;
         overflow: scroll;
+        z-index: 1000;
     }
 
 }
diff --git a/loleaflet/html/loleaflet.html.m4 b/loleaflet/html/loleaflet.html.m4
index 2a173f4fb..d2669ac78 100644
--- a/loleaflet/html/loleaflet.html.m4
+++ b/loleaflet/html/loleaflet.html.m4
@@ -86,16 +86,17 @@ ifelse(MOBILEAPP,[true],
     <nav class="main-nav" role="navigation">
       <!-- Mobile menu toggle button (hamburger/x icon) -->
       <input id="main-menu-state" type="checkbox" />
-      <label class="main-menu-btn" for="main-menu-state">
-       <span class="main-menu-btn-icon"></span>
-      </label>
       <ul id="main-menu" class="sm sm-simple lo-menu"></ul>
     </nav>
     <table id="toolbar-wrapper">
     <tr>
       <td id="toolbar-logo"></td>
       <td id="toolbar-up"</td>
-      <td id="toolbar-hamburger"></td>
+      <td id="toolbar-hamburger">
+        <label class="main-menu-btn" for="main-menu-state">
+          <span class="main-menu-btn-icon"></span>
+        </label>
+      </td>
     </tr>
     <tr>
       <td colspan="3" id="formulabar"></td>
diff --git a/loleaflet/src/control/Control.Menubar.js b/loleaflet/src/control/Control.Menubar.js
index 2eb1d3661..9f0b8514c 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -546,10 +546,13 @@ L.Control.Menubar = L.Control.extend({
 				// animate mobile menu
 				$mainMenuState.change(function() {
 					var $menu = $('#main-menu');
+					var $nav = $menu.parent();
 					if (this.checked) {
+						$nav.css({height: 'initial', bottom: 33});
 						$menu.hide().slideDown(250, function() { $menu.css('display', ''); });
 					} else {
 						$menu.show().slideUp(250, function() { $menu.css('display', ''); });
+						$nav.css({height:0, bottom: ''});
 					}
 				});
 				// hide mobile menu beforeunload