[Libreoffice-commits] online.git: Branch 'feature/calc-canvas' - loleaflet/css loleaflet/src

[Szymon KÅ‚os (via logerrit)]

 loleaflet/css/device-mobile.css            |    6 +++++-
 loleaflet/css/device-tablet.css            |   19 ++++++++++++++++++-
 loleaflet/css/menubar.css                  |    2 +-
 loleaflet/css/spreadsheet.css              |    4 ----
 loleaflet/css/toolbar-mobile.css           |    1 -
 loleaflet/css/toolbar.css                  |    1 +
 loleaflet/src/control/Control.UIManager.js |    2 ++
 7 files changed, 27 insertions(+), 8 deletions(-)

New commits:
commit 128e58de0437eccb1af58c9e10dfb9019f7c85b3
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Wed Sep 9 10:11:20 2020 +0200
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Wed Sep 9 10:36:52 2020 +0200

    Fix toolbars for tablet
    
    Change-Id: I030ed7f3823d47a0dc1b0b96b4ffc951bef65234

diff --git a/loleaflet/css/device-mobile.css b/loleaflet/css/device-mobile.css
index f8477cf38..7882a00bd 100644
--- a/loleaflet/css/device-mobile.css
+++ b/loleaflet/css/device-mobile.css
@@ -69,6 +69,9 @@ div#w2ui-overlay-actionbar.w2ui-overlay{
 }
 
 /* Related to loleaflet.css */
+#toolbar-wrapper{
+	top: 0px;
+}
 #toolbar-hamburger {
 	width: 36px;
 	height: 36px;
@@ -128,7 +131,8 @@ div#w2ui-overlay-actionbar.w2ui-overlay{
     height: 0;
     width: 100%;
     top: 37px; /*set equal to toolbar up's height*/
-    margin: 0;
+	margin: 0;
+	padding: 0px !important;
     -webkit-overflow-scrolling: touch;
     overflow: scroll;
     z-index: 1010;
diff --git a/loleaflet/css/device-tablet.css b/loleaflet/css/device-tablet.css
index a31b49dc2..e3aecffb0 100644
--- a/loleaflet/css/device-tablet.css
+++ b/loleaflet/css/device-tablet.css
@@ -33,7 +33,8 @@
 
 /* Additions for the main menu. */
 .main-nav {
-    margin: 0;
+	margin: 0;
+	padding: 0px !important;
 }
 .hasnotebookbar{
 	min-width: 808px; /*set a minimum so the logo fits*/
@@ -45,6 +46,22 @@
 	width: 0;
 	height: 0;
 }
+#document-container:not(.readonly) {
+	top: 70px;
+}
+#presentation-controls-wrapper:not(.readonly) {
+	top: 70px;
+}
 .vex-content .loleaflet-annotation-img {
 	box-sizing: content-box !important;
 }
+#toolbar-wrapper {
+	top: 36px;
+}
+
+#spreadsheet-row-column-frame {
+	top: 105px;
+}
+#document-container.spreadsheet-document {
+	top: 125px;
+}
\ No newline at end of file
diff --git a/loleaflet/css/menubar.css b/loleaflet/css/menubar.css
index 9b9f30f56..4e9c0d265 100644
--- a/loleaflet/css/menubar.css
+++ b/loleaflet/css/menubar.css
@@ -54,7 +54,7 @@
     height: 32px; /* on mouseover menubar items, border emerges */
     width: auto;
     background: #ffffff;
-    margin: 3px;
+    padding: 3px;
     white-space: nowrap;
     position: absolute;
     z-index: 12;
diff --git a/loleaflet/css/spreadsheet.css b/loleaflet/css/spreadsheet.css
index e19052ea9..4d03cb717 100644
--- a/loleaflet/css/spreadsheet.css
+++ b/loleaflet/css/spreadsheet.css
@@ -228,10 +228,6 @@
 	background-image: url('images/drop-down-button.svg');
 	background-size: 100% 100%;
 	background-repeat: no-repeat;
-	}
-
-#toolbar-wrapper.spreadsheet.tablet {
-	z-index: auto;
 }
 
 #toolbar-wrapper.spreadsheet.tablet.readonly {
diff --git a/loleaflet/css/toolbar-mobile.css b/loleaflet/css/toolbar-mobile.css
index 19168e2c9..59c308ec7 100644
--- a/loleaflet/css/toolbar-mobile.css
+++ b/loleaflet/css/toolbar-mobile.css
@@ -5,7 +5,6 @@
 	}
 	#toolbar-wrapper{
 		border-top: none;
-		top: 0px;
 	}
 	#toolbar-up{
 		top:-1px;
diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index 0cfb9aaf4..f3f6fac1c 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -84,6 +84,7 @@ w2ui-toolbar {
 
 #formulabar {
 		border-top: 1px solid #bbbbbb;
+		padding-bottom: 6px;
 }
 
 #presentation-toolbar {
diff --git a/loleaflet/src/control/Control.UIManager.js b/loleaflet/src/control/Control.UIManager.js
index a4459e39e..f451ace65 100644
--- a/loleaflet/src/control/Control.UIManager.js
+++ b/loleaflet/src/control/Control.UIManager.js
@@ -136,6 +136,7 @@ L.Control.UIManager = L.Control.extend({
 		obj.addClass('w2ui-icon fold');
 
 		this.moveObjectVertically($('#spreadsheet-row-column-frame'), 36);
+		this.moveObjectVertically($('#toolbar-wrapper'), 36);
 		this.moveObjectVertically($('#document-container'), 36);
 		this.moveObjectVertically($('#presentation-controls-wrapper'), 36);
 		this.moveObjectVertically($('#sidebar-dock-wrapper'), 36);
@@ -154,6 +155,7 @@ L.Control.UIManager = L.Control.extend({
 		obj.addClass('w2ui-icon unfold');
 
 		this.moveObjectVertically($('#spreadsheet-row-column-frame'), -36);
+		this.moveObjectVertically($('#toolbar-wrapper'), -36);
 		this.moveObjectVertically($('#document-container'), -36);
 		this.moveObjectVertically($('#presentation-controls-wrapper'), -36);
 		this.moveObjectVertically($('#sidebar-dock-wrapper'), -36);