tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cherry-pick-1ba76736' into 'pandora_6.0' 

Merge branch '7-cambiar-color-de-grafica-de-acceso-integria-3271' into 'develop'

See merge request !130
This commit is contained in:
vgilc 2017-02-17 10:12:08 +01:00
parent 2312a95805 d8e10996f1
commit 78f46d7b85
3 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
pandora_console/images/logo_vertical_water.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
pandora_console/images/logo_vertical_water_2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.6 KiB

2
pandora_console/include/graphs/flot/pandora.flot.js
View File

@ -2225,7 +2225,7 @@ function set_watermark(graph_id, plot, watermark_src) {
down_ticks_height = $('#'+graph_id+' .yAxis .tickLabel').eq(0).css('height').split('px')[0];
}
var left_pos = parseInt(context.canvas.width - 3) - $('#watermark_image_'+graph_id)[0].width;
var top_pos = parseInt(context.canvas.height - down_ticks_height - 20) - $('#watermark_image_'+graph_id)[0].height;
var top_pos = parseInt(context.canvas.height - down_ticks_height - 10) - $('#watermark_image_'+graph_id)[0].height;
context.drawImage(this, left_pos, top_pos);