From ba7e747b97aaeee469dc4c8e697eb7b4288950cc Mon Sep 17 00:00:00 2001 From: Rufus Pollock Date: Sat, 9 Feb 2013 18:30:11 +0000 Subject: [PATCH] [build][xs]: build. --- dist/recline.css | 10 +++++----- dist/recline.js | 11 ++++------- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/dist/recline.css b/dist/recline.css index 610a56a7..bc71116c 100644 --- a/dist/recline.css +++ b/dist/recline.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/dist/recline.js b/dist/recline.js index 32db2ce5..297cc26b 100644 --- a/dist/recline.js +++ b/dist/recline.js @@ -2024,7 +2024,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!

\ @@ -2091,9 +2091,6 @@ my.Flot = Backbone.View.extend({ // check we have something to plot if (this.state.get('group') && this.state.get('series')) { - // faff around with width because flot draws axes *outside* of the element - // width which means graph can get push down as it hits element next to it - this.$graph.width(this.el.width() - 240); var series = this.createSeries(); var options = this.getGraphOptions(this.state.attributes.graphType, series[0].data.length); this.plot = $.plot(this.$graph, series, options); @@ -2114,7 +2111,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); @@ -2136,13 +2133,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; }