Skip to content

Commit be86525

Browse files
committed
Tune styling
1 parent f448636 commit be86525

File tree

5 files changed

+75
-66
lines changed

5 files changed

+75
-66
lines changed

frontend/src/assets/main.css

Lines changed: 0 additions & 39 deletions
This file was deleted.

frontend/src/assets/main.scss

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
.body--dark {
2+
--q-primary: #487A91;
3+
--q-secondary: #26A69A;
4+
--q-accent: #9C27B0;
5+
--q-positive: #21BA45;
6+
--q-negative: #C10015;
7+
--q-info: #31CCEC;
8+
--q-warning: #F2C037;
9+
--q-dark-page: #545454;
10+
}
11+
12+
.body--light {
13+
--q-primary: #0794B9;
14+
--q-secondary: #17DFD5;
15+
--q-accent: #9C27B0;
16+
--q-positive: #21BA45;
17+
--q-negative: #C10015;
18+
--q-info: #31CCEC;
19+
--q-warning: #F2C037;
20+
}
21+
22+
.text-team-yellow {
23+
color: #000000 !important;
24+
}
25+
26+
.bg-team-yellow {
27+
background: #ced509 !important;
28+
}
29+
30+
.text-team-blue {
31+
color: #ffffff !important;
32+
}
33+
34+
.bg-team-blue {
35+
background: #134cc4 !important;
36+
}
37+
38+
h1 {
39+
margin: 0.3em;
40+
}
41+
42+
h2 {
43+
margin: 0.3em;
44+
}
45+
46+
h3 {
47+
margin: 0.3em;
48+
}
49+
50+
h4 {
51+
margin: 0.3em;
52+
}
53+
54+
h5 {
55+
margin: 0.3em;
56+
}
57+
58+
.max-content-width {
59+
max-width: 900px;
60+
}

frontend/src/main.ts

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import {Quasar} from 'quasar'
88

99
import {control} from "@/plugins/control";
1010

11-
import "@/assets/main.css"
11+
import "@/assets/main.scss"
1212

1313
// Import icon libraries
1414
import '@quasar/extras/material-icons/material-icons.css'
@@ -20,23 +20,7 @@ createApp(App)
2020
.use(router)
2121
.use(createPinia())
2222
.use(control)
23-
.use(Quasar, {
24-
config: {
25-
brand: {
26-
primary: '#a11a30',
27-
secondary: '#984447',
28-
accent: '#9C27B0',
29-
30-
dark: '#07171a',
31-
'dark-page': '#374040',
32-
33-
positive: '#21BA45',
34-
negative: '#C10015',
35-
info: '#1ad3ed',
36-
warning: '#ddb660'
37-
}
38-
}
39-
})
23+
.use(Quasar)
4024
.mount('#app')
4125

4226
subscribeToLocalStorage()

frontend/src/store/gcState/defaultStates.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,4 +79,6 @@ export const mockedConfig = {
7979
"Team1", "Team2"
8080
],
8181
activeTrackerSource: "Foo",
82+
gameEventBehavior: {},
83+
autoRefConfigs: {},
8284
} as Config

frontend/src/views/StartView.vue

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,6 @@ import {teams} from "@/helpers";
1717

1818
<template>
1919
<div class="q-ma-md">
20-
<p>
21-
To set up a new match, go through this page from top to bottom.
22-
The full procedure can be found in the
23-
<q-btn dense color="primary" target="_blank"
24-
href="https://robocup-ssl.github.io/ssl-rules/sslrules.html#_match_preparation">
25-
rule book
26-
</q-btn>
27-
.
28-
</p>
2920
<div class="row justify-evenly">
3021
<div class="q-pa-md">
3122
<ResetMatchButton/>
@@ -82,5 +73,16 @@ import {teams} from "@/helpers";
8273
<SwitchSidesRandomButton/>
8374
<EndMatchButton/>
8475
</div>
76+
77+
<div class="q-ma-md">
78+
<p>
79+
To set up a new match, go through this page from top to bottom.
80+
The full procedure can be found in the
81+
<q-btn color="primary" target="_blank"
82+
href="https://robocup-ssl.github.io/ssl-rules/sslrules.html#_match_preparation">
83+
rule book
84+
</q-btn>
85+
</p>
86+
</div>
8587
</div>
8688
</template>

0 commit comments

Comments
 (0)