loleaflet/css/toolbar.css | 5 ++++-
loleaflet/src/control/Control.JSDialogBuilder.js | 10 ++++++++--
2 files changed, 12 insertions(+), 3 deletions(-)
New commits:
commit acc9529c274e03e2bf4ce80163084cc68626351c
Author: Szymon Kłos <szymon.k...@collabora.com>
AuthorDate: Wed Oct 9 14:24:36 2019 +0200
Commit: Szymon Kłos <szymon.k...@collabora.com>
CommitDate: Wed Oct 9 14:25:06 2019 +0200
jsdialog: create more containers around spinfields
Change-Id: I6833ec415c9ea869091caf23f151944415807cab
diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index 46a1a4994..82f0a33cb 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -66,7 +66,6 @@
height: 32px;
margin: 24px 28px 24px 28px !important;
width: 70%;
- background: url(images/lc_linespacing.svg) no-repeat 1px center;
border: 1px solid #ccc;
border-radius: 2px;
background-size: 28px;
@@ -1107,3 +1106,7 @@ menu-entry-with-icon.padding-left + menu-entry-icon.width
*/
float: left;
height: 32px;
}
+
+.spinfieldcontainer {
+ display: inline-block;
+}
diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js
b/loleaflet/src/control/Control.JSDialogBuilder.js
index 5f6add277..c76c87c8e 100644
--- a/loleaflet/src/control/Control.JSDialogBuilder.js
+++ b/loleaflet/src/control/Control.JSDialogBuilder.js
@@ -320,9 +320,15 @@ L.Control.JSDialogBuilder = L.Control.extend({
},
_spinfieldControl: function(parentContainer, data, builder) {
- var spinfield = L.DomUtil.create('input', '', parentContainer);
+ var div = L.DomUtil.createWithId('div', data.id,
parentContainer);
+ $(div).addClass('spinfieldcontainer');
+
+ var image = L.DomUtil.create('img', 'spinfieldimage', div);
+ var icon = builder._createIconPath(data.id);
+ image.src = icon;
+
+ var spinfield = L.DomUtil.create('input', 'spinfield', div);
spinfield.type = 'number';
- spinfield.id = data.id;
if (data.enabled == 'false')
$(spinfield).attr('disabled', 'disabled');
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
