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

[Pedro Pinto Silva (via logerrit)]

 loleaflet/css/loleaflet.css                |    5 ++++-
 loleaflet/src/control/Control.LokDialog.js |    2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 862486f6d231178ce44a0f3902b2feb76866b5f9
Author:     Pedro Pinto Silva <pedro.silva at collabora.com>
AuthorDate: Fri Jun 19 16:32:05 2020 +0200
Commit:     Pedro Silva <pedro.silva at collabora.com>
CommitDate: Tue Jun 23 15:01:29 2020 +0200

    Sidebar-panel has fixed width that is bigger than its contents, better fix
    
    - Revert display:table from #sidebar-panel
    - Set document-container position to right:0px when in presence of text or presentation documents that has (missing) the sidebar closed (sidebar-dock-wrapper display:none)
    
    Change-Id: Id4416e9dfa0540dd774b83b41428f021f99f4f38
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/96741
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Pedro Silva <pedro.silva at collabora.com>

diff --git a/loleaflet/css/loleaflet.css b/loleaflet/css/loleaflet.css
index 0773c624d..41e9459fc 100644
--- a/loleaflet/css/loleaflet.css
+++ b/loleaflet/css/loleaflet.css
@@ -7,6 +7,10 @@
 	right: 0px;
 	left: 0px;
 }
+#document-container.sidebar-closed {
+	right: 0px !important;
+}
+
 
 #document-container.tablet {
 	top: 36px;
@@ -152,7 +156,6 @@ body {
 }
 
 #sidebar-panel {
-	display: table;
 	padding: 0px;
 	margin: 0px;
 	position: relative;
diff --git a/loleaflet/src/control/Control.LokDialog.js b/loleaflet/src/control/Control.LokDialog.js
index dfddbdfc2..1b70b1cc0 100644
--- a/loleaflet/src/control/Control.LokDialog.js
+++ b/loleaflet/src/control/Control.LokDialog.js
@@ -1060,6 +1060,7 @@ L.Control.LokDialog = L.Control.extend({
 			this._sendPaintWindowRect(id);
 		} else {
 			this._createSidebar(id, strId, width, height);
+			$('#document-container').removeClass('sidebar-closed');
 		}
 	},
 
@@ -1365,6 +1366,7 @@ L.Control.LokDialog = L.Control.extend({
 			this._map.fire('editorgotfocus');
 			this._map.focus();
 		}
+		$('#document-container').addClass('sidebar-closed');
 	},
 
 	_onCalcInputBarClose: function(dialogId) {