diff options
| author | Thomas Steur <tsteur@users.noreply.github.com> | 2018-11-13 11:23:07 +0300 |
|---|---|---|
| committer | Matthieu Aubry <mattab@users.noreply.github.com> | 2018-11-13 11:23:07 +0300 |
| commit | ac432359d9436d4ac3564b0c6c07558871356737 (patch) | |
| tree | b27c10d0959a4fd3ca4f4cc21388458130e06865 /plugins/Annotations/javascripts/annotations.js | |
| parent | e6a7ace51248f43d0ffa10e2e833bb79b1010182 (diff) | |
Update theme to reflect the new logo and brand color changes (#13629)
* update theme
* fix alert box has no spacing
* fix couple issues with new theme
* improve contrast and make sure to use correct theme color
* fix notification colour
* fix wrong logo used
* fix theme color
* fix update title not readable
Diffstat (limited to 'plugins/Annotations/javascripts/annotations.js')
| -rw-r--r-- | plugins/Annotations/javascripts/annotations.js | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/plugins/Annotations/javascripts/annotations.js b/plugins/Annotations/javascripts/annotations.js index 0556b6027f..988690e9ea 100644 --- a/plugins/Annotations/javascripts/annotations.js +++ b/plugins/Annotations/javascripts/annotations.js @@ -459,7 +459,7 @@ date = date.split(',')[0]; } - $('.evolution-annotations>span', domElem).each(function () { + $('.evolution-annotations>span[data-date]', domElem).each(function () { if ($(this).attr('data-date') == date) { // get counts from attributes (and convert them to ints) var starredCount = +$(this).attr('data-starred'), @@ -467,12 +467,11 @@ // modify the starred count & make sure the correct image is used var newStarCount = starredCount + starAmt; + var newAnno = 'icon-annotation'; if (newStarCount > 0) { - var newImg = 'plugins/Morpheus/images/annotations_starred.png'; - } else { - var newImg = 'plugins/Morpheus/images/annotations.png'; + newAnno += ' starred'; } - $(this).attr('data-starred', newStarCount).find('img').attr('src', newImg); + $(this).attr('data-starred', newStarCount).find('span').attr('class', newAnno); // modify the annotation count & hide/show based on new count var newCount = annotationCount + amt; @@ -575,12 +574,12 @@ // if no graph available, hide all icons if (!canvases || canvases.length == 0) { - $('span', annotations).hide(); + $('span[data-date]', annotations).hide(); return true; } // set position of each individual icon - $('span', annotations).each(function (i) { + $('span[data-date]', annotations).each(function (i) { var canvas = $(canvases[i]), canvasCenterX = canvas.position().left + (canvas.width() / 2); $(this).css({ |