Merge pull request #62 from Kragrathea/TestBranch

Test branch
Kragrathea · Aug 29, 2020 · 452ba5a · 452ba5a
2 parents 86536a1 + 6f85dc3
commit 452ba5a
Show file tree

Hide file tree

Showing 6 changed files with 2,765 additions and 42 deletions.
diff --git a/octoprint_prettygcode/__init__.py b/octoprint_prettygcode/__init__.py
@@ -14,7 +14,7 @@ def get_assets(self):
         return dict(
             js=["js/prettygcode.js","js/three.min.js",
                 "js/LineSegmentsGeometry.js","js/LineGeometry.js","js/OBJLoader.js",
-                "js/LineMaterial.js","js/LineSegments2.js","js/Line2.js","js/camera-controls.js","js/Lut.js","js/dat.gui.min.js"],
+                "js/LineMaterial.js","js/LineSegments2.js","js/Line2.js","js/camera-controls.js","js/Lut.js","js/dat.gui.js"],
             css=["css/prettygcode.css"]
         )
 

diff --git a/octoprint_prettygcode/static/css/prettygcode.css b/octoprint_prettygcode/static/css/prettygcode.css
@@ -226,6 +226,19 @@
     background: #eee;
 }
 
+/*style slider to be more progress bar like*/
+.gwin #myslider .slider-track {
+    background: green;
+}
+.gwin #myslider .slider-handle {
+    width:24px;
+}
+.gwin #myslider .tooltip {
+    display: none;
+}
+
+
+
 #tab_plugin_prettygcode code 
 { 
     border: 1px black;