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

[Libreoffice Gerrit user]

 loleaflet/css/toolbar.css |    1 +
 loleaflet/js/toolbar.js   |    4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit c2635960ebac702cef5cc4c841406d2d26662cb7
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Wed Mar 13 16:38:01 2019 +0100
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Wed Mar 13 16:42:05 2019 +0100

    Hide close button by default
    
    Change-Id: I44528a096849324d68304165f7698fcd7e3b4130
    Reviewed-on: https://gerrit.libreoffice.org/69185
    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 2ef829052..347ca8081 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -128,6 +128,7 @@ w2ui-toolbar {
     width: 28px;
     height: 28px;
     background-color: white;
+    display: none;
 }
 
 #closebutton {
commit 39d47239992308f743303ece7110ce9fbbb5281e
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Wed Mar 13 15:46:00 2019 +0100
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Wed Mar 13 16:41:54 2019 +0100

    Don't show closebutton if not requested
    
    Change-Id: Ie7d84f52244003607cb1a227d9eeea8217c817f8
    Reviewed-on: https://gerrit.libreoffice.org/69184
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>
    Tested-by: Szymon Kłos <szymon.klos at collabora.com>

diff --git a/loleaflet/js/toolbar.js b/loleaflet/js/toolbar.js
index 348e0063f..f1d65da5d 100644
--- a/loleaflet/js/toolbar.js
+++ b/loleaflet/js/toolbar.js
@@ -2431,7 +2431,9 @@ $(window).resize(function() {
 });
 
 $(document).ready(function() {
-	if (closebutton && !L.Browser.mobile) {
+	if (!closebutton) {
+		$('#closebuttonwrapper').hide();
+	} else if (closebutton && !L.Browser.mobile) {
 		$('#closebuttonwrapper').show();
 	}