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

[Libreoffice Gerrit user]

 loleaflet/css/toolbar.css |    6 ++++--
 loleaflet/js/toolbar.js   |    2 +-
 loleaflet/src/map/Map.js  |    4 +++-
 3 files changed, 8 insertions(+), 4 deletions(-)

New commits:
commit 1d1fc28886926bc59921c4c006c7094494fa5e2a
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Wed Mar 13 18:48:09 2019 +0100
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Wed Mar 13 18:50:00 2019 +0100

    Don't show closebutton on menubar toggle
    
    Change-Id: I57dbca9aac09445c0990770565682adc1da1db40
    Reviewed-on: https://gerrit.libreoffice.org/69220
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>
    Tested-by: Szymon Kłos <szymon.klos at collabora.com>

diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index 347ca8081..3c2534b17 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -128,7 +128,6 @@ w2ui-toolbar {
     width: 28px;
     height: 28px;
     background-color: white;
-    display: none;
 }
 
 #closebutton {
@@ -145,7 +144,10 @@ w2ui-toolbar {
     background-color: #eee;
 }
 
-.closebuttonimage{ background: url('images/lc_closedoc.svg') no-repeat center !important; }
+.closebuttonimage {
+    display: none;
+    background: url('images/lc_closedoc.svg') no-repeat center !important;
+}
 
 #tb_actionbar_item_left {
     width: 45%;
diff --git a/loleaflet/js/toolbar.js b/loleaflet/js/toolbar.js
index f1d65da5d..dfaeefaa7 100644
--- a/loleaflet/js/toolbar.js
+++ b/loleaflet/js/toolbar.js
@@ -2434,7 +2434,7 @@ $(document).ready(function() {
 	if (!closebutton) {
 		$('#closebuttonwrapper').hide();
 	} else if (closebutton && !L.Browser.mobile) {
-		$('#closebuttonwrapper').show();
+		$('.closebuttonimage').show();
 	}
 
 	$('#closebutton').click(function() {
diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index 60244aa57..6f213dd9d 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -1467,7 +1467,9 @@ L.Map = L.Evented.extend({
 		}
 		else {
 			$('.main-nav').css({'display': 'none'});
-			$('#closebuttonwrapper').css({'display': 'none'});
+			if (closebutton) {
+				$('#closebuttonwrapper').css({'display': 'none'});
+			}
 
 			obj = $('.fold');
 			obj.removeClass('w2ui-icon fold');