Skip to content

Commit 7f11581

Browse files
authored
Merge pull request #7 from mame98/ui-cleanup
Ui cleanup
2 parents ec31701 + 34de52b commit 7f11581

File tree

3 files changed

+19
-8
lines changed

3 files changed

+19
-8
lines changed

src/components/MatchStatus.vue

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -126,10 +126,13 @@
126126
127127
.time-positive {
128128
border-color: green;
129+
background-color: rgba(0, 255, 0, 0.1);
130+
129131
}
130132
131133
.time-negative {
132134
border-color: red;
135+
background-color: rgba(255, 0, 0, 0.1);
133136
}
134137
135138
.separator {
@@ -152,18 +155,19 @@
152155
}
153156
154157
.highlight-command {
155-
transition: background-color 1000ms ease;
156-
border-radius: 1em;
158+
transition: background-color 500ms ease;
159+
border-radius: .5em;
157160
padding: 0.1em;
161+
padding-top: 0.2em;
158162
margin-top: 0.1em;
159163
}
160164
161165
.highlight-command.stop-command {
162-
background-color: #E23D28;
166+
background-color: #FF7000
163167
}
164168
165169
.highlight-command.halt-command {
166-
background-color: #A50021;
170+
background-color: #EE0022;
167171
}
168172
169173
</style>

src/components/TeamStatus.vue

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88

99
<div class="cards">
1010
<Card color="red" :num-cards="team.redCards"/>
11-
<span> | </span>
11+
<span class="card-separator"> | </span>
1212
<Card color="yellow"
1313
:class="{'marked-card': markYellowCard}"
1414
:num-cards="team.yellowCards"/>
15-
<span> | </span>
15+
<span class="card-separator"> | </span>
1616
<span class="botinfo">
1717
<img class="boticon" src="bot.png"/>
1818
{{team.maxAllowedBots}}
@@ -69,7 +69,9 @@
6969
}
7070
7171
.team-name {
72-
height: 12vh;
72+
margin-top: 12px;
73+
margin-bottom: 12px;
74+
font-size: 5vh;
7375
display: flex;
7476
flex-direction: column;
7577
justify-content: flex-end;
@@ -115,4 +117,9 @@
115117
font-size: 24pt;
116118
color: yellow;
117119
}
120+
121+
.card-separator {
122+
display: inline-block;
123+
padding-right: 2px;
124+
}
118125
</style>

src/texts.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ export const mapGameEventToText = function (event) {
282282
}
283283
if (event.defenderTooCloseToKickPoint != null) {
284284
return `${teamAndBot(event.defenderTooCloseToKickPoint)} `
285-
+ `too close to kick point (${velocity(event.defenderTooCloseToKickPoint.distance)})`;
285+
+ `too close to kick point (${distance(event.defenderTooCloseToKickPoint.distance)})`;
286286
}
287287
if (event.defenderInDefenseAreaPartially != null) {
288288
return `${teamAndBot(event.defenderInDefenseAreaPartially)} `

0 commit comments

Comments
 (0)