Merge master into 309-expand-content-when-sidebar-empty

2013-02-11 10:00:41 +01:00
parent f0005bed6c c3f18ab1ed
commit fa086053fb
29 changed files with 1209 additions and 759 deletions
--- 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;
--- a/css/flotr2.css
+++ b/css/flotr2.css