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

[Szymon KÅ‚os (via logerrit)]

 loleaflet/css/device-tablet.css            |    5 ++---
 loleaflet/css/notebookbar.css              |    8 ++++++--
 loleaflet/src/control/Control.UIManager.js |   24 +++++++++++++++---------
 3 files changed, 23 insertions(+), 14 deletions(-)

New commits:
commit 1b0f079346123a04e9daa0145edc5b4f934a5c57
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Wed Sep 9 11:46:07 2020 +0200
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Wed Sep 9 11:46:07 2020 +0200

    Fix notebookbar css
    
    Change-Id: Ia66c011d7cd2cefc4fd32d7e31391c14c79c8194

diff --git a/loleaflet/css/device-tablet.css b/loleaflet/css/device-tablet.css
index e3aecffb0..aa4ca4b65 100644
--- a/loleaflet/css/device-tablet.css
+++ b/loleaflet/css/device-tablet.css
@@ -38,7 +38,6 @@
 }
 .hasnotebookbar{
 	min-width: 808px; /*set a minimum so the logo fits*/
-	overflow: auto hidden;
 	scrollbar-width: none;
 	-ms-overflow-style: none;
 }
@@ -60,8 +59,8 @@
 }
 
 #spreadsheet-row-column-frame {
-	top: 105px;
+	top: 109px;
 }
 #document-container.spreadsheet-document {
-	top: 125px;
+	top: 129px;
 }
\ No newline at end of file
diff --git a/loleaflet/css/notebookbar.css b/loleaflet/css/notebookbar.css
index c84b0b109..7e2f8a743 100644
--- a/loleaflet/css/notebookbar.css
+++ b/loleaflet/css/notebookbar.css
@@ -28,7 +28,7 @@
 	border: none;
 	border-radius: 0px;
 	background: #fff;
-	box-shadow: 0 3px 0px 0px #fff, 0px -1px 8px -4px rgba(105, 105, 105, 0.4), -1px -15px 15px -4px rgb(77, 130, 184, 0.1);
+	box-shadow: 0 4px 0px 0px #fff, 0px -1px 8px -4px rgba(105, 105, 105, 0.4), -1px -15px 15px -4px rgb(77, 130, 184, 0.1);
 }
 .main-nav.hasnotebookbar.text-color-indicator .ui-tab.selected.notebookbar{
 	color: rgb(3, 105, 163);
@@ -53,11 +53,15 @@
 	background-color: #f9f9f9;
 	cursor: pointer;
 	color: #555;
+	padding-bottom: 4px;
 }
 /* Document Logo */
 .main-nav.hasnotebookbar #document-header {
 	float: left;
 }
+.main-nav.hasnotebookbar {
+	padding: 3px !important;
+}
 
 /* shortcuts bar */
 
@@ -181,7 +185,7 @@
 #toolbar-wrapper.hasnotebookbar {
 	position: fixed;
 	z-index: 11;
-	top: 32px;
+	top: 36px;
 }
 
 .cell.notebookbar {
diff --git a/loleaflet/src/control/Control.UIManager.js b/loleaflet/src/control/Control.UIManager.js
index f451ace65..5e75525e7 100644
--- a/loleaflet/src/control/Control.UIManager.js
+++ b/loleaflet/src/control/Control.UIManager.js
@@ -205,18 +205,24 @@ L.Control.UIManager = L.Control.extend({
 		if (this.hasNotebookbarShown())
 			return;
 
-		var additionalOffset = 0;
+		var additionalOffsetDocument = 0, additionalOffsetHeaders = 0;
 		if (docType === 'spreadsheet') {
-			if (window.mode.isTablet())
-				additionalOffset = -7;
-			else
-				additionalOffset = 53;
+			if (window.mode.isTablet()) {
+				additionalOffsetDocument = 5;
+				additionalOffsetHeaders = 5;
+			} else {
+				additionalOffsetDocument = 60;
+				additionalOffsetHeaders = 0;
+			}
+		} else if (window.mode.isTablet()) {
+			additionalOffsetDocument = 3;
+			additionalOffsetHeaders = 3;
 		}
 
-		this.moveObjectVertically($('#spreadsheet-row-column-frame'), 36);
-		this.moveObjectVertically($('#document-container'), 43 + additionalOffset);
-		this.moveObjectVertically($('#presentation-controls-wrapper'), 43);
-		this.moveObjectVertically($('#sidebar-dock-wrapper'), 43);
+		this.moveObjectVertically($('#spreadsheet-row-column-frame'), 47 + additionalOffsetHeaders);
+		this.moveObjectVertically($('#document-container'), 47 + additionalOffsetDocument);
+		this.moveObjectVertically($('#presentation-controls-wrapper'), 47);
+		this.moveObjectVertically($('#sidebar-dock-wrapper'), 47);
 
 		$('#map').addClass('notebookbar-opened');
 	},