diff --git a/css/flot.css b/css/flot.css index 03f21e56..cf203cda 100644 --- a/css/flot.css +++ b/css/flot.css @@ -1,23 +1,23 @@ -.recline-graph .graph { +.recline-flot .graph { height: 500px; overflow: hidden; } -.recline-graph .legend table { +.recline-flot .legend table { width: auto; margin-bottom: 0; } -.recline-graph .legend td { +.recline-flot .legend td { padding: 5px; line-height: 13px; } -.recline-graph .graph .alert { +.recline-flot .graph .alert { width: 450px; } -#recline-graph-tooltip { +#recline-flot-tooltip { position: absolute; background-color: #FEE !important; color: #000000 !important; diff --git a/src/view.flot.js b/src/view.flot.js index fe595e81..ea87f40f 100644 --- a/src/view.flot.js +++ b/src/view.flot.js @@ -23,7 +23,7 @@ this.recline.View = this.recline.View || {}; // generate the element itself (you can then append view.el to the DOM. my.Flot = Backbone.View.extend({ template: ' \ -
\ +
\
\
\

Hey there!

\ @@ -110,7 +110,7 @@ my.Flot = Backbone.View.extend({ this.previousTooltipPoint.y !== item.seriesIndex) { this.previousTooltipPoint.x = item.dataIndex; this.previousTooltipPoint.y = item.seriesIndex; - $("#recline-graph-tooltip").remove(); + $("#recline-flot-tooltip").remove(); var x = item.datapoint[0].toFixed(2), y = item.datapoint[1].toFixed(2); @@ -132,13 +132,13 @@ my.Flot = Backbone.View.extend({ yLocation = item.pageY - 20; } - $('
' + content + '
').css({ + $('
' + content + '
').css({ top: yLocation, left: xLocation }).appendTo("body").fadeIn(200); } } else { - $("#recline-graph-tooltip").remove(); + $("#recline-flot-tooltip").remove(); this.previousTooltipPoint.x = null; this.previousTooltipPoint.y = null; }