[Libreoffice-commits] online.git: loleaflet/dist

[Pranav Kant]

 loleaflet/dist/toolbar/toolbar.js |   10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

New commits:
commit 01d91642f10941438d63590a6f8f61ec35540df7
Author: Pranav Kant <pranavk at collabora.co.uk>
Date:   Thu Dec 8 22:15:15 2016 +0530

    loleaflet: Use same loleaflet font for color picker
    
    Change-Id: I4e8235a913db81f3d270a23a95e1b3144de47d08

diff --git a/loleaflet/dist/toolbar/toolbar.js b/loleaflet/dist/toolbar/toolbar.js
index fa07464..ca277ac 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -184,12 +184,18 @@ function onClick(id, item, subItem) {
 	else if (id === 'fontcolor') {
 		// absolutely no idea why, but without the timeout, the popup is
 		// closed as soon as it is opend
-		setTimeout(function () {$('#fontColorPicker').colorpicker('showPalette');}, 0);
+		setTimeout(function () {
+			$('#fontColorPicker').colorpicker('showPalette');
+			$('.ui-widget-content').addClass('loleaflet-font');
+		}, 0);
 	}
 	else if (id === 'backcolor') {
 		// absolutely no idea why, but without the timeout, the popup is
 		// closed as soon as it is opend
-		setTimeout(function () {$('#backColorPicker').colorpicker('showPalette');}, 0);
+		setTimeout(function () {
+			$('#backColorPicker').colorpicker('showPalette');
+			$('.ui-widget-content').addClass('loleaflet-font');
+		}, 0);
 	}
 	else if (id === 'sum') {
 		map.sendUnoCommand('.uno:AutoSum');