Merge branch 'develop' of https://gitlab.com/aescape/lab_ui into v2

2019-07-10 14:23:43 -04:00
parent accffb70b3 a0629b9806
commit 56c8423d7f
4 changed files with 13 additions and 14 deletions
--- a/client/app/main.css
+++ b/client/app/main.css
@@ -480,6 +480,11 @@ html, body {
        background : #3671F9;
        width: 100%;
        margin-bottom: 10px;
+        height: 30px;
+    }
+
+    .slider-options .col-md-2 {
+      padding: 0px;
    }

    .progress-bar {