diff --git a/public/assets/css/bootstrap-modal-bs3patch.css b/public/assets/css/bootstrap-modal-bs3patch.css
deleted file mode 100644
index fedb608..0000000
--- a/public/assets/css/bootstrap-modal-bs3patch.css
+++ /dev/null
@@ -1,29 +0,0 @@
-/*!
- * Bootstrap Modal
- *
- * Copyright Jordan Schroter
- * Licensed under the Apache License v2.0
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Boostrap 3 patch for for bootstrap-modal. Include BEFORE bootstrap-modal.css!
- */
-
-body.modal-open,
-.modal-open .navbar-fixed-top,
-.modal-open .navbar-fixed-bottom {
- margin-right: 0;
-}
-
-.modal {
- left: 50%;
- bottom: auto;
- right: auto;
- padding: 0;
- width: 500px;
- margin-left: -250px;
- background-clip: padding-box;
-}
-
-.modal.container {
- max-width: none;
-}
diff --git a/public/assets/css/bootstrap-modal.css b/public/assets/css/bootstrap-modal.css
index 27e0ba1..0a1dc7a 100644
--- a/public/assets/css/bootstrap-modal.css
+++ b/public/assets/css/bootstrap-modal.css
@@ -1,3 +1,34 @@
+/*!
+ * Bootstrap Modal
+ *
+ * Copyright Jordan Schroter
+ * Licensed under the Apache License v2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Boostrap 3 patch for for bootstrap-modal. Include BEFORE bootstrap-modal.css!
+ */
+
+body.modal-open,
+.modal-open .navbar-fixed-top,
+.modal-open .navbar-fixed-bottom {
+ margin-right: 0;
+}
+
+.modal {
+ left: 50%;
+ bottom: auto;
+ right: auto;
+ padding: 0;
+ width: 500px;
+ margin-left: -250px;
+ background-clip: padding-box;
+}
+
+.modal.container {
+ max-width: none;
+}
+
+
/*!
* Bootstrap Modal
*
diff --git a/public/assets/js/jquery.flot.draggable.js b/public/assets/js/jquery.flot.draggable.js
index 09710d3..cf69532 100644
--- a/public/assets/js/jquery.flot.draggable.js
+++ b/public/assets/js/jquery.flot.draggable.js
@@ -78,7 +78,7 @@
}
var is_last = series[sidx].data.length == didx+1;
-
+
// funny hack to make drag resizing usable
if (newx > ax.max)
{
@@ -86,14 +86,8 @@
}
else if (newx < (ax.max*0.5) && newx >= ax.datamax && is_last)
{
- console.log(ax);
ax.options.max = newx*2;
- //ax.options.max = ;
- console.log(ax);
- //plot.setRange(ax);
plot.setupGrid();
- //ax.max = ax.max*2;
- //ax2.max = ax2.max*0.9;
}
plot.draw();
diff --git a/public/index.html b/public/index.html
index 4cc6d69..cbec8c4 100644
--- a/public/index.html
+++ b/public/index.html
@@ -2,7 +2,7 @@
- PicoReflow
+ picoReflow
@@ -17,7 +17,6 @@
-
@@ -155,6 +154,5 @@
-