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

[Szymon Kłos (via logerrit)]

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

New commits:
commit 8a35cd80258f0018d485285d9039bc30264483b1
Author:     Szymon Kłos <szymon.k...@collabora.com>
AuthorDate: Tue Oct 8 21:26:56 2019 +0200
Commit:     Szymon Kłos <szymon.k...@collabora.com>
CommitDate: Tue Oct 8 21:26:56 2019 +0200

    jsdialogs: use picker for Color, add ids
    
    Change-Id: Ia9778ff2962c05eafb6b6b4ae636dc87b3d7bf01

diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index 398410cf5..717aaed83 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -49,6 +49,9 @@
        #ParaspaceIncrease, #ParaspaceDecrease {
                padding-left: 28px !important;
        }
+       #Color {
+               padding: 20px 20px 0px 20px !important;
+       }
        #Shadowed, #StyleNewByExample + div, #AlignTop, #AlignBottom + p, 
#mergecells{clear:both;}
        #DecrementIndent + input:disabled{display: none;}
        #buttonbefore, #buttonafter, #buttonoptimal, #buttonparallel, 
#buttonnone, #buttonthrough, #bottom, #top, #standard, #Bold, #Italic, 
#Underline, #Strikeout{
diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js 
b/loleaflet/src/control/Control.JSDialogBuilder.js
index 148dca8a1..ce3342452 100644
--- a/loleaflet/src/control/Control.JSDialogBuilder.js
+++ b/loleaflet/src/control/Control.JSDialogBuilder.js
@@ -59,6 +59,7 @@ L.Control.JSDialogBuilder = L.Control.extend({
                this._toolitemHandlers['.uno:BackColor'] = this._colorControl;
                this._toolitemHandlers['.uno:BackgroundColor'] = 
this._colorControl;
                this._toolitemHandlers['.uno:FrameLineColor'] = 
this._colorControl;
+               this._toolitemHandlers['.uno:Color'] = this._colorControl;
 
                this._currentDepth = 0;
        },
@@ -458,6 +459,7 @@ L.Control.JSDialogBuilder = L.Control.extend({
 
        _colorControl: function(parentContainer, data, builder) {
                var colorContainer = L.DomUtil.create('div', 'colorcontainer', 
parentContainer);
+               colorContainer.id = data.command.substr('.uno:'.length);
 
                if (data.enabled == 'false')
                        $(colorContainer).attr('disabled', 'disabled');
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits