[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - loleaflet/css

[Pedro Pinto Silva (via logerrit)]

 loleaflet/css/device-mobile.css |    8 +++++---
 loleaflet/css/impress.css       |    3 ++-
 loleaflet/css/toolbar.css       |   14 ++++++++------
 3 files changed, 15 insertions(+), 10 deletions(-)

New commits:
commit 612f3d1ab497649c1ab9a974671e704847fd4bcb
Author:     Pedro Pinto Silva <pedro.silva at collabora.com>
AuthorDate: Mon Sep 7 15:51:30 2020 +0200
Commit:     Pedro Silva <pedro.silva at collabora.com>
CommitDate: Wed Sep 9 17:00:08 2020 +0200

    Fix inconsistencies wrt slide-sorter between impress and draw
    
    - Inconsistencies between impress and draw (slide-sorter)
    - Fix missing slide-sorter divider
    - Mobile: Fix white borders
    - Read-only mode inconsistencies (slide-sorter)
    - Mobile: landscape: divider is present at the left edge of the screen (remove)
    - #presentation-toolbar misaligned and lack bottom border
    
    Change-Id: Ib45438e955f4e65b35bae67b5d0edbc510a4987c
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/102182
    Tested-by: Jenkins
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Pedro Silva <pedro.silva at collabora.com>
    (cherry picked from commit 80542f6cf9646c89de54b6c7240ab6edbd7ba0f3)
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/102302

diff --git a/loleaflet/css/device-mobile.css b/loleaflet/css/device-mobile.css
index d7f0d95fa..3329a216e 100644
--- a/loleaflet/css/device-mobile.css
+++ b/loleaflet/css/device-mobile.css
@@ -674,7 +674,7 @@ td[id^=tb_spreadsheet-toolbar_item]:focus table.w2ui-button div.w2ui-icon, td[id
 }
 
 #document-container.portrait.readonly.parts-preview-document {
-	bottom: 65px;
+	bottom: 61px;
 }
 
 #document-container.portrait.parts-preview-document {
@@ -686,7 +686,9 @@ td[id^=tb_spreadsheet-toolbar_item]:focus table.w2ui-button div.w2ui-icon, td[id
 #document-container.portrait.parts-preview-document.keyboard {
 	bottom: 33px;
 }
-
+#document-container.portrait.parts-preview-document #map {
+	box-shadow: none;
+}
 #slide-sorter.portrait {
 	max-height: 60px;
 }
@@ -726,7 +728,7 @@ td[id^=tb_spreadsheet-toolbar_item]:focus table.w2ui-button div.w2ui-icon, td[id
 #document-container.landscape.parts-preview-document {
 	top: 41px;
 	left: 66px !important;
-	bottom: 33px;
+	bottom: 35px;
 }
 
 #document-container.landscape.readonly.parts-preview-document {
diff --git a/loleaflet/css/impress.css b/loleaflet/css/impress.css
index 13f3763f4..d9b0f296b 100644
--- a/loleaflet/css/impress.css
+++ b/loleaflet/css/impress.css
@@ -1,4 +1,5 @@
-.presentation-doctype #map{
+.presentation-doctype #map, .drawing-doctype #map{
+	border-collapse: separate; /*To use box-shadow in Internet Explorer 9 or later, you must set border-collapse */
 	box-shadow: rgb(223, 223, 223) 0px 0px inset, #b6b6b6 1px 0px 0px inset;
 }
 #presentation-controls-wrapper {
diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index 2e75ea3a7..f2d8a1bae 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -87,12 +87,14 @@ w2ui-toolbar {
 }
 
 #presentation-toolbar {
-		background-color: #dfdfdf;
-		text-align: center;
-		position: absolute;
-		z-index: 500;
-		width: 98%;
-		padding: 0px 0px 10px 0px;
+	background-color: #dfdfdf;
+	text-align: center;
+	position: absolute;
+	z-index: 500;
+	width: 98%;
+	padding-bottom: 0px;
+	margin-top: -1px;
+	border-bottom: 1px solid #bbbbbb;
 }
 
 /* For MS Edge 40, the select2 combo boxes need to have higher z-index than #map