Don't use hardcoded layer offset (#511)

* don't use hard-coded offset * fix codefactor issues
UnchartedBull · Mar 22, 2020 · c4b5289 · c4b5289
1 parent 77ab96f
commit c4b5289
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 26 deletions.
diff --git a/src/app/plugin-service/layer-progress.service.ts b/src/app/plugin-service/layer-progress.service.ts
@@ -32,8 +32,8 @@ export class LayerProgressService {
                     .subscribe(
                         (data: OctoprintLayerProgressAPI): void => {
                             observer.next({
-                                current: data.layer.current === '-' ? 0 : Number(data.layer.current) + 1,
-                                total: data.layer.total === '-' ? 0 : Number(data.layer.total) + 1,
+                                current: data.layer.current === '-' ? 0 : Number(data.layer.current),
+                                total: data.layer.total === '-' ? 0 : Number(data.layer.total),
                                 fanSpeed:
                                     data.fanSpeed === '-'
                                         ? 0

diff --git a/src/app/settings/settings.component.scss b/src/app/settings/settings.component.scss
@@ -5,12 +5,12 @@
         left: 0;
         width: 100%;
         height: 100%;
-        background-color: rgba(0, 0, 0, .8);
+        background-color: rgba(0, 0, 0, 0.8);
         z-index: 20;
     }
 
     &-container {
-        animation: fadein .8s;
+        animation: fadein 0.8s;
         position: absolute;
         top: 10vh;
         left: 20vw;
@@ -20,7 +20,7 @@
         border-radius: 2vw;
 
         &-fadeout {
-            animation: fadeout .8s;
+            animation: fadeout 0.8s;
         }
     }
 
@@ -29,7 +29,7 @@
         display: block;
         text-align: center;
         margin-top: 1.5vh;
-        opacity: .3;
+        opacity: 0.3;
     }
 
     &__heading {
@@ -101,13 +101,13 @@
 
             & span {
                 font-size: inherit;
-                opacity: .5;
+                opacity: 0.5;
             }
         }
 
         &-prefix {
             font-size: 2vw;
-            opacity: .7;
+            opacity: 0.7;
             padding-right: 1vw;
         }
 
@@ -139,16 +139,16 @@
         }
 
         &-checked {
-            background-color: #2196F3;
+            background-color: #2196f3;
             width: 1.8vw;
             height: 1.8vw;
             display: block;
-            margin-left: .6vw;
-            margin-top: .6vw;
-            border-radius: .4vw;
+            margin-left: 0.6vw;
+            margin-top: 0.6vw;
+            border-radius: 0.4vw;
 
             &-disabled {
-                background-color: rgba(255, 255, 255, .5)
+                background-color: rgba(255, 255, 255, 0.5);
             }
         }
 
@@ -167,11 +167,10 @@
     }
 
     &__list {
-
         & fa-icon {
             font-size: 3vw;
-            margin-left: .5vw;
-            opacity: .7;
+            margin-left: 0.5vw;
+            opacity: 0.7;
         }
 
         & li {
@@ -183,7 +182,7 @@
     &__made {
         font-size: 2.3vw;
         display: block;
-        opacity: .6;
+        opacity: 0.6;
         text-align: center;
         margin-top: 4vh;
 
@@ -217,19 +216,19 @@
         padding: 2vh 2vw 2vh 4vw;
 
         &-slideout-forward {
-            animation: slideout-forward .5s ease-out;
+            animation: slideout-forward 0.5s ease-out;
         }
 
         &-slidein-forward {
-            animation: slidein-forward .5s ease-out
+            animation: slidein-forward 0.5s ease-out;
         }
 
         &-slideout-backward {
-            animation: slideout-backward .5s ease-out
+            animation: slideout-backward 0.5s ease-out;
         }
 
         &-slidein-backward {
-            animation: slidein-backward .5s ease-out
+            animation: slidein-backward 0.5s ease-out;
         }
 
         &-inactive {
@@ -282,7 +281,7 @@
 
 @keyframes slideout-forward {
     from {
-        left: 0vw;
+        left: 0;
     }
 
     to {
@@ -296,7 +295,7 @@
     }
 
     to {
-        left: 0vw;
+        left: 0;
     }
 }
 
@@ -306,13 +305,13 @@
     }
 
     to {
-        left: 0vw;
+        left: 0;
     }
 }
 
 @keyframes slideout-backward {
     from {
-        left: 0vw;
+        left: 0;
     }
 
     to {

diff --git a/src/assets/reset.css b/src/assets/reset.css
@@ -87,7 +87,6 @@ video {
     margin: 0;
     padding: 0;
     border: 0;
-    font-size: 100%;
     font: inherit;
     vertical-align: baseline;
 }