From 2352249441e0f5dfef3ab1abbf1b7c629deba31e Mon Sep 17 00:00:00 2001 From: Steve Gravrock Date: Wed, 15 Oct 2025 19:42:46 -0700 Subject: [PATCH] Clean up progress bar CSS --- lib/jasmine-core/jasmine.css | 38 +++++++++++++---------------- src/html/_HTMLReporter.scss | 46 ++++++++++++++++++++---------------- 2 files changed, 42 insertions(+), 42 deletions(-) diff --git a/lib/jasmine-core/jasmine.css b/lib/jasmine-core/jasmine.css index d742075b..180ec354 100644 --- a/lib/jasmine-core/jasmine.css +++ b/lib/jasmine-core/jasmine.css @@ -1,25 +1,4 @@ @charset "UTF-8"; -progress { - width: 100%; -} - -progress[value] { - -webkit-appearance: none; - -moz-appearance: none; - appearance: none; -} - -progress[value]::-webkit-progress-value, progress[value]::-moz-progress-bar { - background: #007069; -} -.failed progress[value]::-webkit-progress-value, .failed progress[value]::-moz-progress-bar { - background: #ca3a11; -} - -progress.failed[value]::-webkit-progress-value, progress.failed[value]::-moz-progress-bar { - background: #ca3a11; -} - body { overflow-y: scroll; } @@ -136,6 +115,23 @@ body { color: #ba9d37; content: "•"; } +.jasmine_html-reporter progress { + width: 100%; +} +.jasmine_html-reporter progress[value] { + -webkit-appearance: none; + -moz-appearance: none; + appearance: none; +} +.jasmine_html-reporter progress[value]::-webkit-progress-value, .jasmine_html-reporter progress[value]::-moz-progress-bar { + background: #007069; +} +.failed .jasmine_html-reporter progress[value]::-webkit-progress-value, .failed .jasmine_html-reporter progress[value]::-moz-progress-bar { + background: #ca3a11; +} +.jasmine_html-reporter progress.failed[value]::-webkit-progress-value, .jasmine_html-reporter progress.failed[value]::-moz-progress-bar { + background: #ca3a11; +} .jasmine_html-reporter .jasmine-run-options { float: right; margin-right: 5px; diff --git a/src/html/_HTMLReporter.scss b/src/html/_HTMLReporter.scss index b3517126..a742b9e2 100644 --- a/src/html/_HTMLReporter.scss +++ b/src/html/_HTMLReporter.scss @@ -26,26 +26,6 @@ $space: "\0020"; $font-size: 11px; $large-font-size: 14px; -// TODO: nope -progress { - width: 100%; -} -progress[value] { - -webkit-appearance: none; - -moz-appearance: none; - appearance: none; -} -progress[value]::-webkit-progress-value, progress[value]::-moz-progress-bar { - background: $passing-color; - - .failed & { - background: $failing-color; - } -} -progress.failed[value]::-webkit-progress-value, progress.failed[value]::-moz-progress-bar { - background: $failing-color; -} - body { overflow-y: scroll; } @@ -126,7 +106,7 @@ body { padding-right: 9px; } - //--- Symbol summary ---// + //--- Symbol summary (v1 reporter) ---// .jasmine-symbol-summary { overflow: hidden; @@ -192,6 +172,30 @@ body { } } + //--- Progress bar (v2 reporter) ---// + + progress { + width: 100%; + } + + progress[value] { + -webkit-appearance: none; + -moz-appearance: none; + appearance: none; + } + + progress[value]::-webkit-progress-value, progress[value]::-moz-progress-bar { + background: $passing-color; + + .failed & { + background: $failing-color; + } + } + + progress.failed[value]::-webkit-progress-value, progress.failed[value]::-moz-progress-bar { + background: $failing-color; + } + .jasmine-run-options { float: right; margin-right: 5px;