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

[Szymon Kłos (via logerrit)]

 loleaflet/css/toolbar.css                        |    3 +++
 loleaflet/src/control/Control.JSDialogBuilder.js |    4 ++++
 2 files changed, 7 insertions(+)

New commits:
commit d663129d88403ab822a83e81315275fca845d775
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Wed Oct 9 08:58:43 2019 +0200
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Wed Oct 9 08:58:56 2019 +0200

    jsdialog: add missing id to elements
    
    Change-Id: Ic022d0d768064c68a0374b9fa9e0ca41ceb7e3d5

diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js b/loleaflet/src/control/Control.JSDialogBuilder.js
index dc4d04b34..87b619d63 100644
--- a/loleaflet/src/control/Control.JSDialogBuilder.js
+++ b/loleaflet/src/control/Control.JSDialogBuilder.js
@@ -328,6 +328,7 @@ L.Control.JSDialogBuilder = L.Control.extend({
 	_spinfieldControl: function(parentContainer, data, builder) {
 		var spinfield = L.DomUtil.create('input', '', parentContainer);
 		spinfield.type = 'number';
+		spinfield.id = data.id;
 
 		if (data.enabled == 'false')
 			$(spinfield).attr('disabled', 'disabled');
@@ -350,6 +351,7 @@ L.Control.JSDialogBuilder = L.Control.extend({
 	_editControl: function(parentContainer, data, builder) {
 		var edit = L.DomUtil.create('input', '', parentContainer);
 		edit.value = builder._cleanText(data.text);
+		edit.id = data.id;
 
 		if (data.enabled == 'false')
 			$(edit).attr('disabled', 'disabled');
@@ -367,6 +369,7 @@ L.Control.JSDialogBuilder = L.Control.extend({
 	_pushbuttonControl: function(parentContainer, data, builder) {
 		var pushbutton = L.DomUtil.create('button', '', parentContainer);
 		pushbutton.innerHTML = builder._cleanText(data.text);
+		pushbutton.id = data.id;
 
 		if (data.enabled == 'false')
 			$(pushbutton).attr('disabled', 'disabled');
@@ -408,6 +411,7 @@ L.Control.JSDialogBuilder = L.Control.extend({
 	_fixedtextControl: function(parentContainer, data, builder) {
 		var fixedtext = L.DomUtil.create('p', '', parentContainer);
 		fixedtext.innerHTML = builder._cleanText(data.text);
+		fixedtext.id = data.id;
 
 		if (data.hidden)
 			$(fixedtext).hide();
commit a06821a1a0880fdb5548cbc3184fdb03cccb4150
Author:     Pedro <pedro.silva at collabora.com>
AuthorDate: Wed Oct 9 08:03:02 2019 +0200
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Wed Oct 9 08:58:56 2019 +0200

    Turn round color picker elements
    
    Change-Id: Id35b8dae443446a28ffdb1f5116115b80d6190be

diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index 717aaed83..297c6cfbf 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -4,6 +4,9 @@
 	}
 }
 @media (max-width: 767px), (max-device-height: 767px) {
+	#BackColor .w2ui-tb-caption > div, #FontColor .w2ui-tb-caption > div, #BackgroundColor .w2ui-tb-caption > div{
+		border-radius:100px !important;
+	}
 	#toolbar-down table.w2ui-button.checked .w2ui-tb-image{
 		-webkit-filter: grayscale(100%) brightness(80%) sepia(100%) hue-rotate(-190deg) saturate(900%) contrast(0.8);
 		filter: grayscale(100%) brightness(80%) sepia(100%) hue-rotate(-190deg) saturate(900%) contrast(0.8);