Creating changes to have correct coloring for tv.

renemadsen · Mar 29, 2024 · bad96af · bad96af
1 parent 7dfca21
commit bad96af
Show file tree

Hide file tree

Showing 5 changed files with 136 additions and 68 deletions.
diff --git a/.gitignore b/.gitignore
@@ -31,5 +31,7 @@ database/owlcms.mv.db
 /logs/
 /node_modules/
 /.metadata/
-/.moquette_uuid
-/fly.toml
+/.moquette_uuid
+/fly.toml
+.idea
+mqttData
diff --git a/owlcms/frontend/components/CurrentAthlete.js b/owlcms/frontend/components/CurrentAthlete.js
@@ -23,18 +23,20 @@ class CurrentAthlete extends LitElement {
         </div>
 
         <div class="attemptBar" style="${this.attemptBarStyles()}">
-          <div class="startNumber" style="${this.startNumberStyles()}"><span>${this.startNumber}</span> </div>
-          <div class="fullName ellipsis" style="${this.fullNameStyles()}" .innerHTML="${this.fullName}"></div>
-          <div class="clubName ellipsis" style="${this.teamNameStyles()}"><div class="clubNameEllipsis">${this.teamName}</div></div>
-          <div class="attempt" style="${this.attemptStyles()}"><span .innerHTML="${this.attempt}"></span></div>
-          <div class="weight" style="${this.weightStyles()}">
-            <span >${this.weight}<span style="font-size: 75%" >&nbsp;${this.t?.KgSymbol}</span></span>
-          </div>
-          <div class="timer athleteTimer" style="${this.athleteTimerStyles()}">
-            <timer-element id="timer"></timer-element>
-          </div>
-          <div class="timer breakTime" style="${this.breakTimerStyles()}">
-            <timer-element id="breakTimer"></timer-element>
+          <div class="bg">
+            <div class="startNumber" style="${this.startNumberStyles()}"><span>${this.startNumber}</span> </div>
+            <div class="fullName ellipsis" style="${this.fullNameStyles()}" .innerHTML="${this.fullName}"></div>
+            <div class="clubName ellipsis" style="${this.teamNameStyles()}"><div class="clubNameEllipsis">${this.teamName}</div></div>
+            <div class="attempt" style="${this.attemptStyles()}"><span .innerHTML="${this.attempt}"></span></div>
+            <div class="weight" style="${this.weightStyles()}">
+              <span >${this.weight}<span style="font-size: 75%" >&nbsp;${this.t?.KgSymbol}</span></span>
+            </div>
+            <div class="timer athleteTimer" style="${this.athleteTimerStyles()}">
+              <timer-element id="timer"></timer-element>
+            </div>
+            <div class="timer breakTime" style="${this.breakTimerStyles()}">
+              <timer-element id="breakTimer"></timer-element>
+            </div>
           </div>
           <div class="decisionBox" style="${this.decisionStyles()}">
             <decision-element id="decisions" style="padding:1ex"></decision-element>

diff --git a/shared/src/main/resources/css/grid/currentathlete.css b/shared/src/main/resources/css/grid/currentathlete.css
@@ -67,11 +67,11 @@ div > div.attemptBar > div.attempts > table > tr > td.totalRank {
     justify-items: center;
 }
 
-.attemptBar .startNumber {
+.attemptBar .bg .startNumber {
     align-self: center;
 }
 
-.attemptBar .startNumber span {
+.attemptBar .bg .startNumber span {
     font-size: 70%;
     font-weight: bold;
     border-width: 0.2ex;
@@ -85,36 +85,36 @@ div > div.attemptBar > div.attempts > table > tr > td.totalRank {
     grid-row: 1/1;
 }
 
-.attemptBar .fullName {
+.attemptBar .bg .fullName {
     font-size: 110%;
     justify-self: left;
     grid-column: 2/3;
 }
 
-.attemptBar .club {
+.attemptBar .bg .club {
     width: var(--club-width);
     white-space: nowrap;
     overflow: hidden;
     text-overflow: ellipsis;
     grid-area: 3/4;
 }
 
-.attemptBar .attempt {
+.attemptBar .bg .attempt {
     grid-column: 4/5;
 }
 
-.attemptBar .weight {
+.attemptBar .bg .weight {
     color: var(--athleteAttemptWeightColor);
     grid-column: 5/6
 }
 
-.attemptBar .timer {
+.attemptBar .bg .timer {
     font-weight: bold;
     grid-column: 6/7;
     grid-row: 1/2;
 }
 
-.attemptBar .decisionBox {
+.attemptBar .bg .decisionBox {
     width: 100%;
     height: 100%;
     background-color: var(--videoHeaderBackgroundColor);

diff --git a/shared/src/main/resources/css/nogrid/currentathlete.css b/shared/src/main/resources/css/nogrid/currentathlete.css
@@ -56,7 +56,7 @@ div > div.attemptBar > div.attempts > table > tr > td.totalRank {
     overflow: hidden;
 }
 
-.attemptBar {
+.attemptBar .bg {
     display: grid;
     font-weight: bold;
     font-size: var(--attemptBarFontSize);
@@ -67,11 +67,11 @@ div > div.attemptBar > div.attempts > table > tr > td.totalRank {
     justify-items: center;
 }
 
-.attemptBar .startNumber {
+.attemptBar .bg .startNumber {
     align-self: center;
 }
 
-.attemptBar .startNumber span {
+.attemptBar .bg .startNumber span {
     font-size: 70%;
     font-weight: bold;
     border-width: 0.2ex;
@@ -85,36 +85,36 @@ div > div.attemptBar > div.attempts > table > tr > td.totalRank {
     grid-row: 1/1;
 }
 
-.attemptBar .fullName {
+.attemptBar .bg .fullName {
     font-size: 110%;
     justify-self: left;
     grid-column: 2/3;
 }
 
-.attemptBar .club {
+.attemptBar .bg .club {
     width: var(--club-width);
     white-space: nowrap;
     overflow: hidden;
     text-overflow: ellipsis;
     grid-area: 3/4;
 }
 
-.attemptBar .attempt {
+.attemptBar .bg .attempt {
     grid-column: 4/5;
 }
 
-.attemptBar .weight {
+.attemptBar .bg .weight {
     color: var(--athleteAttemptWeightColor);
     grid-column: 5/6
 }
 
-.attemptBar .timer {
+.attemptBar .bg .timer {
     font-weight: bold;
     grid-column: 6/7;
     grid-row: 1/2;
 }
 
-.attemptBar .decisionBox {
+.attemptBar .bg .decisionBox {
     width: 100%;
     height: 100%;
     background-color: var(--videoHeaderBackgroundColor);