[Libreoffice-commits] online.git: 2 commits - loleaflet/dist
Pranav Kant
pranavk at collabora.com
Thu May 12 19:06:03 UTC 2016
loleaflet/dist/toolbar.css | 4 ++--
loleaflet/dist/toolbar/toolbar.js | 13 +++++++++----
2 files changed, 11 insertions(+), 6 deletions(-)
New commits:
commit cf932d52ec87adc987ec21f8fee89f0805ce539e
Author: Pranav Kant <pranavk at collabora.com>
Date: Fri May 13 00:35:01 2016 +0530
bccu#1788: Center/Align the color feedback under the icon
Change-Id: I985f502e4810ff76d99f4375bd85d6819e64e325
diff --git a/loleaflet/dist/toolbar.css b/loleaflet/dist/toolbar.css
index bb864fc..b28bc33 100644
--- a/loleaflet/dist/toolbar.css
+++ b/loleaflet/dist/toolbar.css
@@ -177,8 +177,8 @@ button.leaflet-control-search-next
.back-color-indicator {
width: 16px;
height: 5px;
- margin-top: -7px;
- margin-left: 5px;
+ margin-top: -7px !important;
+ margin-left: 5px !important;
position: fixed;
background: transparent;
}
commit fc87000a6268efa0cf891c7495f8d33ad372a863
Author: Pranav Kant <pranavk at collabora.com>
Date: Fri May 13 00:34:07 2016 +0530
loleaflet: More checking; don't add element if already added
Change-Id: Id0e71b5f100167e39d95cbad6033a42f1111b570
diff --git a/loleaflet/dist/toolbar/toolbar.js b/loleaflet/dist/toolbar/toolbar.js
index 4b516d3..72382c0 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -89,10 +89,15 @@ $(function () {
onClick(e.target);
},
onRefresh: function(e) {
- var fontColorIndicator = L.DomUtil.create('div', 'font-color-indicator', L.DomUtil.get('tb_toolbar-up_item_fontcolor'));
- fontColorIndicator.id = 'fontcolorindicator';
- var backColorIndicator = L.DomUtil.create('div', 'back-color-indicator', L.DomUtil.get('tb_toolbar-up_item_backcolor'));
- backColorIndicator.id = 'backcolorindicator';
+ if (!L.DomUtil.get('fontcolorindicator')) {
+ var fontColorIndicator = L.DomUtil.create('div', 'font-color-indicator', L.DomUtil.get('tb_toolbar-up_item_fontcolor'));
+ fontColorIndicator.id = 'fontcolorindicator';
+ }
+
+ if (!L.DomUtil.get('backcolorindicator')) {
+ var backColorIndicator = L.DomUtil.create('div', 'back-color-indicator', L.DomUtil.get('tb_toolbar-up_item_backcolor'));
+ backColorIndicator.id = 'backcolorindicator';
+ }
}
});
More information about the Libreoffice-commits
mailing list