Report fixes and color updates

smashtestio · Nov 10, 2019 · 4a73194 · 4a73194
1 parent 1e9c0e1
commit 4a73194
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 18 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## 1.6.10
+
+- Fixed blank elapsed counter in a stopped run's report
+- Updated colors in report
+
 ## 1.6.9
 
 - Polyfilled EF injected js to work with IE11/Edge

diff --git a/examples/web-ui/todomvc/implementation.smash b/examples/web-ui/todomvc/implementation.smash
@@ -51,7 +51,7 @@
     Create note 'one'
 
     * When the X next to a note is clicked
-        Hover over 'item, 1st'
+        Hover over '1st item'
             Click 'delete button'
 
         * Then it will be deleted
@@ -84,7 +84,7 @@
             Create note 'three'
 
     * When the X next to a note is clicked
-        Hover over 'item, 2nd'
+        Hover over '2nd item'
             Click 'delete button'
 
         * Then it will be deleted {
@@ -113,7 +113,7 @@
             Create note 'one'
 
     * When the X next to a note is clicked
-        Hover over 'item, 2nd'
+        Hover over '2nd item'
             Click 'delete button'
 
         * Then it will be deleted {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "smashtest",
-  "version": "1.6.9",
+  "version": "1.6.10",
   "description": "smashtest",
   "keywords": [
     "smashtest",

diff --git a/src/cli.js b/src/cli.js
@@ -30,7 +30,7 @@ const PROGRESS_BAR_ON = true;
 let fullRun = false;
 
 console.log(hRule);
-console.log(yellowChalk.bold("Smashtest 1.6.9"));
+console.log(yellowChalk.bold("Smashtest 1.6.10"));
 console.log("");
 
 // ***************************************

diff --git a/src/report-template.html b/src/report-template.html
@@ -104,7 +104,7 @@
             }
 
             .runner-status-msg {
-                color: #ffb347;
+                color: #f5b70c;
             }
 
             .debug-mode {
@@ -194,13 +194,13 @@
             }
 
             .updates-live .branch-indicator.running {
-                background-color: orange;
+                background-color: #f5b70c;
                 animation: blinker 2s linear infinite;
             }
 
             .updates-paused .branch-indicator.running,
             .updates-disconnected .branch-indicator.running {
-                background-color: orange;
+                background-color: #f5b70c;
             }
 
             @keyframes blinker {
@@ -291,7 +291,7 @@
             }
 
             .pill.running {
-                background-color: orange;
+                background-color: #f5b70c;
             }
 
             .tooltip-text {
@@ -323,18 +323,14 @@
             }
 
             .progress-bar .filled-bar {
-                background-color: rgb(245,155,0);
+                background-color: #f5b70c;
                 color: white;
                 text-align: center;
                 height: 100%;
                 border-radius: 4px;
                 overflow-x: hidden;
             }
 
-            /*.progress-bar .filled-bar.paused {
-                background-color: rgb(70,70,70);
-            }*/
-
             .progress-bar .filled-bar-text {
                 position: relative;
                 top: 2px;
@@ -363,15 +359,15 @@
             }
 
             .updates-live .running-item {
-                color: orange;
+                color: #f5b70c;
                 animation: blinker 2s linear infinite;
             }
 
             .updates-paused .running-item,
             .updates-disconnected .running-item,
             .running-item-no-anim,
             .orange-item {
-                color: orange;
+                color: #f5b70c;
             }
 
             .passed-item {
@@ -1545,8 +1541,8 @@
 
                 render() {
                     let elapsedText = "";
-                    let elapsed = this.props.data.tree.elapsed;
-                    if(typeof elapsed != undefined && elapsed != -1) {
+                    let elapsed = this.props.data.tree.elapsed || -1;
+                    if(elapsed != -1) {
                         elapsedText = `(${formatElapsed(elapsed)})`;
                     }