Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'devel' of https://github.com/arangodb/arangodb into devel

This commit is contained in:
Jan Steemann 2016-10-13 10:56:31 +02:00
parent 5508ba4a87 ebb36a6d45
commit b99f43935c
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
js/apps/system/_admin/aardvark/APP/frontend/js/views/queryView.js
View File

@ -104,7 +104,7 @@
_.each($('.queryProfile'), function (elem) { _.each($('.queryProfile'), function (elem) {
if ($(elem).attr('counter') === count) { if ($(elem).attr('counter') === count) {
$(elem).fadeOut('fast'); $(elem).fadeOut('fast').remove();
} }
}); });
}, },
@ -1909,7 +1909,7 @@
'rgb(93, 165, 218)', 'rgb(93, 165, 218)',
'rgb(250, 164, 58)', 'rgb(250, 164, 58)',
'rgb(96, 189, 104)', 'rgb(96, 189, 104)',
'rgb(0, 0, 0)' 'rgb(64, 74, 83)'
]; ];
var descs = [ var descs = [
@ -1946,11 +1946,11 @@
queryProfile.find('.pure-g').append( queryProfile.find('.pure-g').append(
'<div class="pure-table-row noHover">' + '<div class="pure-table-row noHover">' +
'<div class="pure-u-1-24 left"><p class="bold" style="background:' + colors[pos] + '">' + legend[pos] + '</p></div>' + '<div class="pure-u-1-24 left"><p class="bold" style="background:' + colors[pos] + '">' + legend[pos] + '</p></div>' +
'<div class="pure-u-4-24 left">' + ms + '</div>' + '<div class="pure-u-4-24 left">' + ms + '</div>' +
'<div class="pure-u-6-24 left">' + key + '</div>' + '<div class="pure-u-6-24 left">' + key + '</div>' +
'<div class="pure-u-13-24 left">' + descs[pos] + '</div>' + '<div class="pure-u-13-24 left">' + descs[pos] + '</div>' +
'</div>' '</div>'
); );
width = (value * 1000) / total * 100; width = (value * 1000) / total * 100;