loleaflet/css/mobilewizard.css | 30 +++++++++++++++++++++++ loleaflet/src/control/Control.JSDialogBuilder.js | 12 ++++++--- 2 files changed, 39 insertions(+), 3 deletions(-)
New commits: commit fb741776a033fde2bb9cac1a4744d96e442bedb4 Author: Szymon Kłos <[email protected]> AuthorDate: Thu Mar 12 09:40:00 2020 +0100 Commit: Szymon Kłos <[email protected]> CommitDate: Thu Mar 12 11:44:14 2020 +0100 jsdialog: style dialogs Change-Id: Iaac2c5521db66ea42900756584262463ae527892 diff --git a/loleaflet/css/mobilewizard.css b/loleaflet/css/mobilewizard.css index 732216702..0b58c0773 100644 --- a/loleaflet/css/mobilewizard.css +++ b/loleaflet/css/mobilewizard.css @@ -795,4 +795,34 @@ 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 f8d23fea1..a2a355c4f 100644 --- a/loleaflet/src/control/Control.JSDialogBuilder.js +++ b/loleaflet/src/control/Control.JSDialogBuilder.js @@ -1076,7 +1076,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; @@ -1211,7 +1211,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); @@ -1225,6 +1226,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 2640c8709549e1f00b23c671be074d5e9797bb08 Author: Szymon Kłos <[email protected]> AuthorDate: Thu Mar 12 09:00:53 2020 +0100 Commit: Szymon Kłos <[email protected]> CommitDate: Thu Mar 12 09:06:08 2020 +0100 jsdialog: avoid doubled ids Change-Id: Ib6ad41d60f297906c7104b45e032937c18e45252 diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js b/loleaflet/src/control/Control.JSDialogBuilder.js index e3725b15c..f8d23fea1 100644 --- a/loleaflet/src/control/Control.JSDialogBuilder.js +++ b/loleaflet/src/control/Control.JSDialogBuilder.js @@ -588,11 +588,13 @@ L.Control.JSDialogBuilder = L.Control.extend({ _checkboxControl: function(parentContainer, data, builder) { var div = L.DomUtil.createWithId('div', data.id, parentContainer); + $(div).addClass('ui-checkbox'); + $(div).addClass('mobile-wizard'); var checkboxLabel = L.DomUtil.create('label', '', div); checkboxLabel.innerHTML = builder._cleanText(data.text); checkboxLabel.for = data.id; - var checkbox = L.DomUtil.createWithId('input', data.id, div); + var checkbox = L.DomUtil.create('input', '', div); checkbox.type = 'checkbox'; if (data.enabled == 'false') { _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
