diff options
| author | Szymon Kłos <szymon.klos@collabora.com> | 2019-10-08 21:19:07 +0200 |
|---|---|---|
| committer | Szymon Kłos <szymon.klos@collabora.com> | 2019-10-08 21:19:07 +0200 |
| commit | 34b49466ed4b7d3a2646198c777f7f57fdba3333 (patch) | |
| tree | 5f0ecc0bb47f85e30438f780c6d63bae105af0cf | |
| parent | 008ae186e5bf277327935c97ab6485f5612ab897 (diff) | |
jsdialogs: use picker for border and background colors
Change-Id: Iec5ee4214529ab5dbce1e0aece6e5814a1cf8365
| -rw-r--r-- | loleaflet/css/toolbar.css | 7 | ||||
| -rw-r--r-- | loleaflet/src/control/Control.JSDialogBuilder.js | 4 |
2 files changed, 8 insertions, 3 deletions
diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css index f1258eba8..398410cf5 100644 --- a/loleaflet/css/toolbar.css +++ b/loleaflet/css/toolbar.css @@ -41,10 +41,13 @@ margin: 0px !important; float:left; } - .colorspan { + .colorcontainer { width: 120px; float: left; - padding: 0px 10px 0px 10px !important; + padding: 20px 20px 20px 20px !important; + } + #ParaspaceIncrease, #ParaspaceDecrease { + padding-left: 28px !important; } #Shadowed, #StyleNewByExample + div, #AlignTop, #AlignBottom + p, #mergecells{clear:both;} #DecrementIndent + input:disabled{display: none;} diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js b/loleaflet/src/control/Control.JSDialogBuilder.js index 26b74e0f4..148dca8a1 100644 --- a/loleaflet/src/control/Control.JSDialogBuilder.js +++ b/loleaflet/src/control/Control.JSDialogBuilder.js @@ -57,6 +57,8 @@ L.Control.JSDialogBuilder = L.Control.extend({ this._toolitemHandlers['.uno:FontHeight'] = this._fontHeightControl; this._toolitemHandlers['.uno:FontColor'] = this._colorControl; this._toolitemHandlers['.uno:BackColor'] = this._colorControl; + this._toolitemHandlers['.uno:BackgroundColor'] = this._colorControl; + this._toolitemHandlers['.uno:FrameLineColor'] = this._colorControl; this._currentDepth = 0; }, @@ -455,7 +457,7 @@ L.Control.JSDialogBuilder = L.Control.extend({ }, _colorControl: function(parentContainer, data, builder) { - var colorContainer = L.DomUtil.create('div', 'colorspan', parentContainer); + var colorContainer = L.DomUtil.create('div', 'colorcontainer', parentContainer); if (data.enabled == 'false') $(colorContainer).attr('disabled', 'disabled'); |
