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

[Szymon KÅ‚os (via logerrit)]

 loleaflet/css/mobilewizard.css                   |   30 +++++++++++++++++++++++
 loleaflet/src/control/Control.JSDialogBuilder.js |   10 +++++--
 2 files changed, 37 insertions(+), 3 deletions(-)

New commits:
commit a5016d547c6242f6f9b28748b5724b0bc10cdb67
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Thu Mar 12 09:40:00 2020 +0100
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Tue Apr 28 11:22:43 2020 +0200

    jsdialog: style dialogs
    
    Change-Id: Iaac2c5521db66ea42900756584262463ae527892
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/93038
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>

diff --git a/loleaflet/css/mobilewizard.css b/loleaflet/css/mobilewizard.css
index aa99efa72..d6dc6bfe2 100644
--- a/loleaflet/css/mobilewizard.css
+++ b/loleaflet/css/mobilewizard.css
@@ -820,3 +820,33 @@ input[type=checkbox][disabled] {
 	background-color: grey !important;
 	border-color: grey !important;
 }
+
+.ui-checkbox.mobile-wizard {
+	margin-top: 25px;
+	padding-left: 2% !important;
+	width: 100%;
+}
+
+.ui-header-left > input, .ui-checkbox.mobile-wizard > label {
+	margin-left: 2% !important;
+	width: 100%;
+}
+
+.ui-edit.mobile-wizard, textarea {
+	margin-left: 5% !important;
+	margin-bottom: 10px;
+}
+
+#label9, #documentlabel-mobile {
+	border: none;
+	font-size: 15pt;
+}
+
+#searchlabel {
+	border: none;
+	font-size: 11pt;
+}
+
+#criteria.ui-tab, #inputhelp.ui-tab {
+	width: 30% !important;
+}
diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js b/loleaflet/src/control/Control.JSDialogBuilder.js
index 6d5b3001c..57e6ed607 100644
--- a/loleaflet/src/control/Control.JSDialogBuilder.js
+++ b/loleaflet/src/control/Control.JSDialogBuilder.js
@@ -1173,7 +1173,7 @@ L.Control.JSDialogBuilder = L.Control.extend({
 	},
 
 	_editControl: function(parentContainer, data, builder, callback) {
-		var edit = L.DomUtil.create('input', '', parentContainer);
+		var edit = L.DomUtil.create('input', 'ui-edit mobile-wizard', parentContainer);
 		edit.value = builder._cleanText(data.text);
 		edit.id = data.id;
 
@@ -1308,7 +1308,8 @@ L.Control.JSDialogBuilder = L.Control.extend({
 	_comboboxControl: function(parentContainer, data, builder) {
 		if (data.id === 'applystyle' ||
 			data.id === 'fontnamecombobox' ||
-			data.id === 'fontsizecombobox')
+			data.id === 'fontsizecombobox' ||
+			data.id === 'FontBox')
 			builder._listboxControl(parentContainer, data, builder);
 		else
 			builder._explorableEditControl(parentContainer, data, builder);
@@ -1322,6 +1323,9 @@ L.Control.JSDialogBuilder = L.Control.extend({
 
 		builder._setIconAndNameForCombobox(data);
 
+		if (data.id === 'FontBox')
+			data.text = '';
+
 		var title = data.text;
 		var valueNode = null;
 		if (data.selectedEntries) {
commit b15099ac7f155fa099338f0b139951928320c844
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Wed Mar 18 13:01:59 2020 +0100
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Tue Apr 28 11:22:40 2020 +0200

    jsdialog: fix checkbox
    
    Change-Id: If0c0d6a852738ed2b62609ac3bea8ed5beab7ce5
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/93039
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>

diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js b/loleaflet/src/control/Control.JSDialogBuilder.js
index 4189b9bb9..6d5b3001c 100644
--- a/loleaflet/src/control/Control.JSDialogBuilder.js
+++ b/loleaflet/src/control/Control.JSDialogBuilder.js
@@ -752,7 +752,7 @@ L.Control.JSDialogBuilder = L.Control.extend({
 		}
 
 		checkbox.addEventListener('change', function() {
-			builder.callback('checkbox', 'change', checkbox, this.checked, builder);
+			builder.callback('checkbox', 'change', div, this.checked, builder);
 		});
 
 		var customCommand = builder._mapWindowIdToUnoCommand(data.id);