Merge pull request rollerderby#666 from frank-weinberg/bugfix/long-jam

fix display of overlong jams & fix initial trip display on rounded
katpet · Sep 14, 2023 · cd0468d · cd0468d
2 parents 8f75898 + b15a5c2
commit cd0468d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/html/views/common.js b/html/views/common.js
@@ -179,17 +179,17 @@ function clockRunner(k, v) {
   var lc = WS.state['ScoreBoard.CurrentGame.Clock(Lineup).Running'];
   var tc = WS.state['ScoreBoard.CurrentGame.Clock(Timeout).Running'];
   var ic = WS.state['ScoreBoard.CurrentGame.Clock(Intermission).Running'];
-  var jc = WS.state['ScoreBoard.CurrentGame.Clock(Jam).Running'];
+  var jc = WS.state['ScoreBoard.CurrentGame.InJam'];
 
   var clock = 'NoClock';
-  if (isTrue(tc)) {
+  if (isTrue(jc)) {
+    clock = 'Jam';
+  } else if (isTrue(tc)) {
     clock = 'Timeout';
   } else if (isTrue(lc)) {
     clock = 'Lineup';
   } else if (isTrue(ic)) {
     clock = 'Intermission';
-  } else if (isTrue(jc)) {
-    clock = 'Jam';
   }
 
   $('.Clock,.SlideDown').removeClass('Show');

diff --git a/html/views/standard/index.css b/html/views/standard/index.css
@@ -9,7 +9,7 @@ user-select: none;-webkit-user-select: none;-khtml-user-select: none;-moz-user-s
 .DisplayPane {opacity: 0;position: absolute;left: 0; top: 0;width: 100%;height: 100%; } 
 .DisplayPane.Hide {animation: HidePanel 1s;-moz-animation: HidePanel 1s;-webkit-animation: HidePanel 1s; } 
 .DisplayPane.Show {animation: ShowPanel 1s;-moz-animation: ShowPanel 1s;-webkit-animation: ShowPanel 1s;opacity: 1; } 
-.DisplayPane>.object {width: 100%;height: 100%;scrolling: no; frameborder: 0px; border: 0px; object-fit: contain; } 
+.DisplayPane>.object {width: 100%;height: 100%; scrolling: no;frameborder: 0px; border: 0px; object-fit: contain; } 
 @-moz-keyframes ShowPanel { 
  0% { opacity: 0; } 100% { opacity: 1; } 
  } 
@@ -45,9 +45,9 @@ body.box_flat .Box.Red {background: #EFEFEF;background: -moz-linear-gradient(top
 
 body.box_flat.bright .Box.Red {background: #FF4040; } 
 
-body.box_flat .FlatDark { color: #FFFFFF; } 
+body .FlatDark { color: #FFFFFF; } 
 
-body.box_flat .Box.FlatDark { background: #595959; background: -moz-linear-gradient(top, #595959, #474747 100%); background: -webkit-gradient(linear, 0 0, 0 100%, from(#595959), color-stop(100%, #474747)); } 
+body .Box.FlatDark { background: #595959; background: -moz-linear-gradient(top, #595959, #474747 100%); background: -webkit-gradient(linear, 0 0, 0 100%, from(#595959), color-stop(100%, #474747)) !important; } 
 
 body.box_flat .Box.FlatBottom { border-radius: 5px 5px 0px 0px !important; } 
 body.box_flat .Box.FlatTop { border-radius: 0px 0px 5px 5px !important; }