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

[Libreoffice Gerrit user]

 loleaflet/css/menubar.css        |   22 ++++++++++--------
 loleaflet/html/loleaflet.html.m4 |   47 ++++++++++++++++++---------------------
 2 files changed, 35 insertions(+), 34 deletions(-)

New commits:
commit f94c5e25f6c393f61bb668f4c48793c4750f923c
Author:     Henry Castro <hcastro at collabora.com>
AuthorDate: Sun Oct 14 15:24:12 2018 -0400
Commit:     Henry Castro <hcastro at collabora.com>
CommitDate: Mon Oct 15 12:20:36 2018 -0400

    loleaflet: mobile: fix scrolling the menu bar
    
    Change-Id: Ic0bdbfb825507ab3b09f56627e0218a40fd95172

diff --git a/loleaflet/css/menubar.css b/loleaflet/css/menubar.css
index f248ec4e0..d55ad37dc 100644
--- a/loleaflet/css/menubar.css
+++ b/loleaflet/css/menubar.css
@@ -11,14 +11,10 @@
     top: 30px;
 }
 
-.header-wrapper {
-    background: #efefef; /* Fill up white areas with grey */
-    min-height: 70px; /* Map starts from 70px onwards in case of writer, calc */
-}
 .main-nav {
     height: 30px; /* on mouseover menubar items, border emerges */
-    position: absolute;
-    width: 100%;
+    width: auto;
+    background: #efefef;
 }
 
 /* Customizations to sm-simple theme to make it look like LO menu, lo-menu class */
@@ -231,13 +227,21 @@
     }
 
     #main-menu {
-	top: 39px !important;
+	position: relative;
+	top: 40px;
     }
 
     .main-nav {
-	position: absolute;
-	width: 100%;
+        position: absolute;
+        height: initial;
+        width: 100%;
+        top: 0;
+        bottom: 33px;
+        margin: 0;
+        -webkit-overflow-scrolling: touch;
+        overflow: scroll;
     }
+
 }
 
 /* Some more lo-menu specific customizations */
diff --git a/loleaflet/html/loleaflet.html.m4 b/loleaflet/html/loleaflet.html.m4
index 8ae22bbd1..61ca22426 100644
--- a/loleaflet/html/loleaflet.html.m4
+++ b/loleaflet/html/loleaflet.html.m4
@@ -78,37 +78,34 @@ ifelse(IOSAPP,[true],
         and width, this being inside the smaller "document-container" will
         cause the content to overflow, creating scrollbars -->
 
-    <div class="header-wrapper">
-      <div id="logo" class="logo"></div>
-      <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>
-	</tr>
-	<tr>
-	  <td colspan="3" id="formulabar"></td>
-	</tr>
-      </table>
-      <input id="insertgraphic" type="file" style="position: fixed; top: -100em">
-    </div>
-
+    <div id="logo" class="logo"></div>
+    <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>
+    </tr>
+    <tr>
+      <td colspan="3" id="formulabar"></td>
+    </tr>
+    </table>
+
+    <input id="insertgraphic" type="file" style="position: fixed; top: -100em">
     <input id="document-name-input" type="text" disabled="true"/>
 
     <div id="closebuttonwrapper">
       <div class="closebuttonimage" id="closebutton"></div>
     </div>
 
-    <div id="spreadsheet-row-column-frame">
-    </div>
+    <div id="spreadsheet-row-column-frame"></div>
 
     <div id="document-container">
       <div id="map"></div>