From 053996743103d51ff3f0bfa1bfc7bcf564765612 Mon Sep 17 00:00:00 2001 From: Brian Brazil Date: Sat, 13 Apr 2019 14:22:52 +0100 Subject: [PATCH] Make flat&bright default, and fix Red box. The brighter the better for projectors. Flat&bright shouldn't have a gradient on the OR/TO/OTO box. Fix handling of removal of scoreboard_dots. --- config/default/99-settings.xml | 4 ++-- html/views/standard/index.css | 4 ++++ html/views/standard/index.js | 2 +- html/views/standard/test.html | 6 ------ 4 files changed, 7 insertions(+), 9 deletions(-) delete mode 100644 html/views/standard/test.html diff --git a/config/default/99-settings.xml b/config/default/99-settings.xml index 31295d524..36cee7f6f 100644 --- a/config/default/99-settings.xml +++ b/config/default/99-settings.xml @@ -19,14 +19,14 @@ - + - + diff --git a/html/views/standard/index.css b/html/views/standard/index.css index e8ac91cfa..e14b331eb 100644 --- a/html/views/standard/index.css +++ b/html/views/standard/index.css @@ -102,6 +102,10 @@ body.box_flat .Box.Red { border-radius: 5px !important; } +body.box_flat.bright .Box.Red { + background: #FF4040; +} + body.box_flat .FlatDark { color: #FFFFFF; } diff --git a/html/views/standard/index.js b/html/views/standard/index.js index c5e60a926..f8fa6c0a4 100644 --- a/html/views/standard/index.js +++ b/html/views/standard/index.js @@ -79,7 +79,7 @@ function initialize() { break; case 'ScoreBoard.Team(' + t + ').Color(scoreboard_dots_fg).Color': var dotColor = v; - if (dotColor == null) {dotColor = '#000000';} + if (dotColor == '') {dotColor = '#000000';} $('.Team' + t + ' .DotTimeouts .Dot').css('background', dotColor); $('.Team' + t + ' .Dot.OfficialReview1').css('background', dotColor); diff --git a/html/views/standard/test.html b/html/views/standard/test.html deleted file mode 100644 index b70c72fcb..000000000 --- a/html/views/standard/test.html +++ /dev/null @@ -1,6 +0,0 @@ - - - - - -