mirror
/
piskel
mirror of https://github.com/piskelapp/piskel.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #397 from GMartigny/issue_#348 

Issue #348 : colorpicker showing on top of tooltip
This commit is contained in:
Julian Descottes 2016-03-11 00:58:36 +01:00
parent c907f47f5d 14fde4f8a0
commit 539d7c7870
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/js/controller/PaletteController.js
View File

@ -110,7 +110,8 @@
};
ns.PaletteController.prototype.setTitleOnPicker_ = function (title, colorPicker) {
var spectrumInputSelector = '.sp-replacer';
colorPicker.next(spectrumInputSelector).attr('title', title);
var parent = colorPicker.parent();
title = parent.data('initial-title') + '<br/>' + title;
parent.attr('data-original-title', title);
};
})();

4
src/templates/drawing-tools.html
View File

@ -13,7 +13,7 @@
<div class="palette-wrapper">
<div
class="tool-icon tool-color-picker"
title="Primary - left mouse button"
data-initial-title="Primary - left mouse button"
rel="tooltip"
data-placement="right"
>
@ -21,7 +21,7 @@
</div>
<div
class="tool-icon tool-color-picker"
title="Secondary - right mouse button"
data-initial-title="Secondary - right mouse button"
rel="tooltip"
data-placement="right"
>