Merge branch '84-el-tamano-de-las-graficas-no-respeta-lo-que-se-previsualiza-en-el-editor' into 'develop'

Change visual console graphs design and fix selection move - #84

See merge request !227
This commit is contained in:
Enrique Camargo 2017-03-07 13:30:10 +01:00
commit 70c6a111fc
7 changed files with 30 additions and 5 deletions

View File

@ -2713,8 +2713,8 @@ function eventsItems(drag) {
unselectAll();
$(divParent).attr('withborder','true');
$(divParent).css('border', '1px blue dotted');
//$(divParent).css('left', '-=1px');
//$(divParent).css('top', '-=1px');
$(divParent).css('left', '-=1px');
$(divParent).css('top', '-=1px');
if ($(divParent).hasClass('box_item')) {
creationItem = null;
@ -3116,8 +3116,8 @@ function unselectAll() {
$(".item").each(function(){
$(this).css('border', '');
if($(this).attr('withborder') == 'true'){
//$(this).css('top', '+=1');
//$(this).css('left', '+=1');
$(this).css('top', '+=1');
$(this).css('left', '+=1');
$(this).attr('withborder', 'false');
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.8 KiB

After

Width:  |  Height:  |  Size: 5.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.2 KiB

After

Width:  |  Height:  |  Size: 6.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.9 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 9.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.1 KiB

After

Width:  |  Height:  |  Size: 4.3 KiB

View File

@ -301,5 +301,30 @@ $ignored_params['refr'] = '';
$(this).css('margin-top','');
}
});
$(".graph").each(function(){
height = parseInt($(this).css("height")) - 30;
$(this).css('height', height);
});
/*
$('.percentile_item a > img').each(function(){
if($(this).css('float')=='left' || $(this).css('float')=='right'){
$(this).css('margin-top',(parseInt($(this).parent().parent().css('height'))/2-parseInt($(this).css('height'))/2)+'px');
$(this).css('margin-left','');
}
else{
$(this).css('margin-left',(parseInt($(this).parent().parent().css('width'))/2-parseInt($(this).css('width'))/2)+'px');
$(this).css('margin-top','');
}
});
*/
});
</script>