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

[Libreoffice Gerrit user]

 loleaflet/css/loleaflet.css           |   14 +++++++++-----
 loleaflet/css/spreadsheet.css         |   19 +++++++++++++++----
 loleaflet/js/toolbar.js               |   27 ++++++++++-----------------
 loleaflet/src/control/Control.Tabs.js |   16 +++++++++-------
 loleaflet/src/map/Map.js              |   12 ++++++------
 5 files changed, 49 insertions(+), 39 deletions(-)

New commits:
commit 30c06fab3332fc19a0348b27bb9f5aa7bab9b570
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Tue Dec 11 00:26:17 2018 +0100
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Wed Dec 12 13:39:14 2018 +0200

    Fix toolbars position
    
    Change-Id: Ib48bc53ebb5230f198de27d80ecffd3e0c4eec2f

diff --git a/loleaflet/css/loleaflet.css b/loleaflet/css/loleaflet.css
index bda949c39..fefaab466 100644
--- a/loleaflet/css/loleaflet.css
+++ b/loleaflet/css/loleaflet.css
@@ -8,8 +8,12 @@
 	left: 0px;
 }
 
+#document-container.tablet {
+	top: 41px;
+}
+
 #document-container.readonly {
-    top: 36px;
+    top: 41px;
 }
 
 #toolbar-wrapper.readonly {
@@ -61,7 +65,7 @@ body {
 }
 
 #presentation-controls-wrapper.readonly {
-    top: 36px;
+    top: 41px;
 }
 
 #toolbar-wrapper {
@@ -113,16 +117,16 @@ body {
 	top: 103px !important;
     }
     #document-container.spreadsheet-document.readonly {
-	top: 56px !important;
+	top: 61px !important;
     }
     #document-container {
-	top: 40px;
+	top: 41px;
     }
     #spreadsheet-row-column-frame {
 	top: 83px !important;
     }
     #spreadsheet-row-column-frame.readonly {
-	top: 36px !important;
+	top: 41px !important;
     }
     #toolbar-hamburger {
 	width: 41px;
diff --git a/loleaflet/css/spreadsheet.css b/loleaflet/css/spreadsheet.css
index e445069e7..8d39c9690 100644
--- a/loleaflet/css/spreadsheet.css
+++ b/loleaflet/css/spreadsheet.css
@@ -1,12 +1,19 @@
 #document-container.spreadsheet-document {
         border-top: 1px solid #B6B6B6;
-        top: 136px;
+        top: 137px;
         left: 50px;
         bottom: 68px;
 }
 
 #document-container.spreadsheet-document.readonly {
-        top: 56px;
+	top: 61px;
+}
+
+#document-container.spreadsheet-document.tablet {
+	border-top: 1px solid #B6B6B6;
+	top: 100px;
+	left: 50px;
+	bottom: 68px;
 }
 
 .spreadsheet-tabs-container {
@@ -62,12 +69,16 @@
 	position: absolute;
 	left: 0;
 	right: 0;
-	top: 116px;
+	top: 117px;
 	bottom: 65px;
 }
 
 #spreadsheet-row-column-frame.readonly {
-        top: 36px;
+        top: 41px;
+}
+
+#spreadsheet-row-column-frame.tablet {
+	top: 80px;
 }
 
 #spreadsheet-header-corner-container {
diff --git a/loleaflet/js/toolbar.js b/loleaflet/js/toolbar.js
index a25a87b0a..2895ea858 100644
--- a/loleaflet/js/toolbar.js
+++ b/loleaflet/js/toolbar.js
@@ -1702,24 +1702,17 @@ function onDocLayerInit() {
 	statusbar.refresh();
 
 	if (window.mode.isTablet()) {
-		// calc tablet version needs one more row before folding the menu
-		if (window.mode.isTablet() && map._docLayer._docType == 'spreadsheet') {
-			var content = $('#document-container');
-			if (content) {
-				var diff = 59;
-				var prevTop = content.css('top');
-				if (prevTop) {
-					prevTop = parseInt(prevTop.slice(0, -2)) + diff;
-				}
-				else {
-					prevTop = 0 + diff;
-				}
-				content.css({'top': String(prevTop) + 'px'});
-			}
-		}
-
 		// Fold menubar by default
-		map.toggleMenubar();
+		// FIXME: reuse toogleMenubar / use css
+		$('.main-nav').css({'display': 'none'});
+		$('#closebuttonwrapper').css({'display': 'none'});
+		var obj = $('.fold');
+		obj.removeClass('w2ui-icon fold');
+		obj.addClass('w2ui-icon unfold');
+		$('#document-container').addClass('tablet');
+		$('#spreadsheet-row-column-frame').addClass('tablet');
+		$('#presentation-controls-wrapper').css({'top': '41px'});
+
 		$('#tb_editbar_item_fonts').css({'display': 'none'});
 		$('#tb_editbar_item_fontsizes').css({'display': 'none'});
 	}
diff --git a/loleaflet/src/control/Control.Tabs.js b/loleaflet/src/control/Control.Tabs.js
index 6c9b8ae73..494d523c8 100644
--- a/loleaflet/src/control/Control.Tabs.js
+++ b/loleaflet/src/control/Control.Tabs.js
@@ -22,13 +22,15 @@ L.Control.Tabs = L.Control.extend({
 			$('.spreadsheet-tab').contextMenu(e.perm === 'edit');
 		}, 1000);
 
-		if (e.perm === 'edit') {
-			$('.spreadsheet-tabs-container').css('bottom', '33px');
-			$('#spreadsheet-toolbar').css('bottom', '33px');
-		}
-		else {
-			$('.spreadsheet-tabs-container').css('bottom', '0px');
-			$('#spreadsheet-toolbar').css('bottom', '0px');
+		if (window.mode.isMobile() == true) {
+			if (e.perm === 'edit') {
+				$('.spreadsheet-tabs-container').css('bottom', '33px');
+				$('#spreadsheet-toolbar').css('bottom', '33px');
+			}
+			else {
+				$('.spreadsheet-tabs-container').css('bottom', '0px');
+				$('#spreadsheet-toolbar').css('bottom', '0px');
+			}
 		}
 	},
 
diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index 4e198e381..0e6e4ec48 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -1416,9 +1416,9 @@ L.Map = L.Evented.extend({
 			obj.removeClass('w2ui-icon unfold');
 			obj.addClass('w2ui-icon fold');
 
-			moveObjectVertically($('#spreadsheet-row-column-frame'), 35);
-			moveObjectVertically($('#document-container'), 35);
-			moveObjectVertically($('#presentation-controls-wrapper'), 35);
+			moveObjectVertically($('#spreadsheet-row-column-frame'), 36);
+			moveObjectVertically($('#document-container'), 36);
+			moveObjectVertically($('#presentation-controls-wrapper'), 36);
 		}
 		else {
 			$('.main-nav').css({'display': 'none'});
@@ -1428,9 +1428,9 @@ L.Map = L.Evented.extend({
 			obj.removeClass('w2ui-icon fold');
 			obj.addClass('w2ui-icon unfold');
 
-			moveObjectVertically($('#spreadsheet-row-column-frame'), -35);
-			moveObjectVertically($('#document-container'), -35);
-			moveObjectVertically($('#presentation-controls-wrapper'), -35);
+			moveObjectVertically($('#spreadsheet-row-column-frame'), -36);
+			moveObjectVertically($('#document-container'), -36);
+			moveObjectVertically($('#presentation-controls-wrapper'), -36);
 		}
 	}
 });