loleaflet/css/mobilewizard.css | 40 +++++++++++++++++++++++
loleaflet/src/control/Control.JSDialogBuilder.js | 13 +++++--
2 files changed, 50 insertions(+), 3 deletions(-)
New commits:
commit 2c535d564b3a5fa859e9db12711e66f0f2a97138
Author: Szymon Kłos <szymon.k...@collabora.com>
AuthorDate: Thu Aug 13 12:19:55 2020 +0200
Commit: Szymon Kłos <szymon.k...@collabora.com>
CommitDate: Mon Sep 7 16:19:16 2020 +0200
mobile-wizard: style radio buttons
Change-Id: Iee03b7fceada0ab1166ba35438da50b178a99ce7
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100652
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/102180
Reviewed-by: Szymon Kłos <szymon.k...@collabora.com>
diff --git a/loleaflet/css/mobilewizard.css b/loleaflet/css/mobilewizard.css
index a83108951..9d5f3434a 100644
--- a/loleaflet/css/mobilewizard.css
+++ b/loleaflet/css/mobilewizard.css
@@ -794,6 +794,46 @@ div#mobile-wizard-content .spinfieldcontainer
.spinfieldimage.disabled {
top: -20px;
width: 16px;
}
+
+#mobile-wizard input[type=radio]:disabled{
+ border: 2px solid #ddd;
+ box-shadow: none;
+}
+#mobile-wizard input[type=radio]{
+ border-radius: 50%;
+ appearance: none;
+ width: 24px;
+ height: 24px;
+ margin: 10px 20px 10px 0px !important;
+ float: right;
+ -webkit-appearance: none;
+ -moz-appearance: none;
+ -o-appearance: none;
+ appearance: none;
+ border: 2px solid #aaa;
+ outline: none;
+ box-shadow: #00000015 0px 0px 2px 1px;
+}
+#mobile-wizard input[type=radio]:checked{
+ background: url(images/lc_ok_white.svg) no-repeat center;
+ background-color: #0b87e7;
+ border: 2px solid #0b87e7;
+ outline: none;
+ box-shadow: none;
+}
+#mobile-wizard input[type=radio]:checked:disabled{
+ background-color: #ddd !important;
+ border: 2px solid #ddd !important;
+}
+#mobile-wizard input[type=radio]:before{
+ width: 20px;
+ height: 20px;
+}
+#mobile-wizard input[type=radio]:after{
+ top: -20px;
+ width: 16px;
+}
+
#enablecontour + label{
line-height: 44px;
vertical-align: baseline;
diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js
b/loleaflet/src/control/Control.JSDialogBuilder.js
index 81648ee86..a0e5a39f8 100644
--- a/loleaflet/src/control/Control.JSDialogBuilder.js
+++ b/loleaflet/src/control/Control.JSDialogBuilder.js
@@ -801,10 +801,13 @@ L.Control.JSDialogBuilder = L.Control.extend({
},
_radiobuttonControl: function(parentContainer, data, builder) {
- var radiobutton = L.DomUtil.createWithId('input', data.id,
parentContainer);
+ var container = L.DomUtil.createWithId('div', data.id +
'-container', parentContainer);
+ L.DomUtil.addClass(container, 'radiobutton');
+
+ var radiobutton = L.DomUtil.createWithId('input', data.id,
container);
radiobutton.type = 'radio';
- var radiobuttonLabel = L.DomUtil.create('label', '',
parentContainer);
+ var radiobuttonLabel = L.DomUtil.create('label', '', container);
radiobuttonLabel.innerHTML = builder._cleanText(data.text);
radiobuttonLabel.for = data.id;
commit 9560a5b02146b234b69c61c0bdf89ac0fc72a7b4
Author: Szymon Kłos <szymon.k...@collabora.com>
AuthorDate: Tue Aug 11 11:32:14 2020 +0200
Commit: Szymon Kłos <szymon.k...@collabora.com>
CommitDate: Mon Sep 7 16:19:11 2020 +0200
mobile-wizard: improve calc shape shadow panel
- use listboxes
- reduce input to make space for -/+ controls
- working color selector
Change-Id: Ia9df4fbc09132474985d169d7b0d55985461ec2b
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100472
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Jan Holesovsky <ke...@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/102179
Tested-by: Jenkins
Reviewed-by: Szymon Kłos <szymon.k...@collabora.com>
diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js
b/loleaflet/src/control/Control.JSDialogBuilder.js
index dbfa4dbe4..81648ee86 100644
--- a/loleaflet/src/control/Control.JSDialogBuilder.js
+++ b/loleaflet/src/control/Control.JSDialogBuilder.js
@@ -1434,7 +1434,9 @@ L.Control.JSDialogBuilder = L.Control.extend({
data.id === 'fontsizecombobox' ||
data.id === 'fontsize' ||
data.id === 'FontBox' ||
- data.id === 'rotation') {
+ data.id === 'rotation' ||
+ data.id === 'LB_ANGLE' ||
+ data.id === 'LB_DISTANCE') {
builder._listboxControl(parentContainer, data, builder);
} else if (data.id === 'searchterm' ||
data.id === 'replaceterm') {
@@ -1807,6 +1809,8 @@ L.Control.JSDialogBuilder = L.Control.extend({
builder.map['stateChangeHandler'].setItemValue(data.command,
params[data.id].value);
builder.map.sendUnoCommand(data.command, params);
return;
+ } else if (data.id === 'LB_SHADOW_COLOR') {
+ data.command = '.uno:FillShadowColor';
}
var command = data.command + '?Color:string=' + color;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
