Skip to content

Commit 3cb8408

Browse files
authored
Merge pull request #19 from Western-Formula-Racing/dev-filtering-alt
filtering in datarow and data card, created by Marcus
2 parents a36d94a + e01e2cd commit 3cb8408

9 files changed

Lines changed: 302 additions & 94 deletions

File tree

pecan/Frontend/pecan-live-dashboard/src/App.css

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,21 @@
55
@tailwind utilities;
66

77
body {
8-
margin: 0;
9-
background-color: black;
8+
margin: 0;
9+
background-color: black;
1010
}
1111

1212
@keyframes logo-spin {
13-
from {
14-
transform: rotate(0deg);
15-
}
16-
to {
17-
transform: rotate(360deg);
18-
}
13+
from {
14+
transform: rotate(0deg);
15+
}
16+
to {
17+
transform: rotate(360deg);
18+
}
1919
}
2020

2121
@media (prefers-reduced-motion: no-preference) {
22-
a:nth-of-type(2) .logo {
23-
animation: logo-spin infinite 20s linear;
24-
}
22+
a:nth-of-type(2) .logo {
23+
animation: logo-spin infinite 20s linear;
24+
}
2525
}
713 Bytes
Loading
621 Bytes
Loading
624 Bytes
Loading
705 Bytes
Loading
719 Bytes
Loading

pecan/Frontend/pecan-live-dashboard/src/components/DataRow.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ export default function DataRow({ msgID, name, category, data, rawData, lastUpda
3232

3333
// Alternating row background
3434
const rowBg = index % 2 === 0 ? "bg-sidebar" : "bg-data-module-bg";
35-
8
35+
3636
const [open, setOpen] = useState(false);
3737

3838
const rows = useMemo(() => {
@@ -120,6 +120,5 @@ export default function DataRow({ msgID, name, category, data, rawData, lastUpda
120120
</div>
121121
</div>
122122
</div>
123-
124123
);
125124
}

pecan/Frontend/pecan-live-dashboard/src/index.css

Lines changed: 37 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -5,66 +5,67 @@
55
@tailwind utilities;
66

77
:root {
8-
font-family: system-ui, Avenir, Helvetica, Arial, sans-serif;
9-
font-weight: 400;
10-
font-synthesis: none;
11-
text-rendering: optimizeLegibility;
12-
-webkit-font-smoothing: antialiased;
13-
-moz-osx-font-smoothing: grayscale;
8+
font-family: system-ui, Avenir, Helvetica, Arial, sans-serif;
9+
font-weight: 400;
10+
font-synthesis: none;
11+
text-rendering: optimizeLegibility;
12+
-webkit-font-smoothing: antialiased;
13+
-moz-osx-font-smoothing: grayscale;
1414
}
1515

1616
@theme {
17-
--color-sidebar: #171720;
18-
--color-sidebarfg: #8e8eab;
19-
--color-option: #20202f;
20-
--color-option-select: #3d3d4f;
17+
--color-sidebar: #171720;
18+
--color-sidebarfg: #8e8eab;
19+
--color-option: #20202f;
20+
--color-option-select: #3d3d4f;
2121

22-
--color-data-module-bg: #20202f;
23-
--color-dropdown-menu-bg: #8E8EAB;
24-
--color-data-textbox-bg: #35354c;
22+
--color-data-module-bg: #20202f;
23+
--color-dropdown-menu-bg: #8e8eab;
24+
--color-dropdown-menu-secondary: #747492;
25+
--color-data-textbox-bg: #35354c;
2526

26-
--font-heading: "ZipSonik", sans-serif;
27-
--font-footer: "Days One", sans-serif;
27+
--font-heading: "ZipSonik", sans-serif;
28+
--font-footer: "Days One", sans-serif;
2829
}
2930

3031
body {
31-
background-color: #0d0c11;
32+
background-color: #0d0c11;
3233
}
3334

3435
p {
35-
margin-bottom: 0 !important;
36+
margin-bottom: 0 !important;
3637
}
3738

3839
/* temporary local fonts */
3940

4041
@font-face {
41-
font-family: ZipSonik;
42-
src: url("./assets/fonts/ZipSonik-Italic.otf") format("opentype");
43-
font-style: normal;
44-
font-display: swap;
42+
font-family: ZipSonik;
43+
src: url("./assets/fonts/ZipSonik-Italic.otf") format("opentype");
44+
font-style: normal;
45+
font-display: swap;
4546
}
4647

4748
@font-face {
48-
font-family: Days One;
49-
src: url("./assets/fonts/DaysOne-Regular.ttf") format("truetype");
50-
font-style: normal;
51-
font-display: swap;
52-
font-weight: 400;
49+
font-family: Days One;
50+
src: url("./assets/fonts/DaysOne-Regular.ttf") format("truetype");
51+
font-style: normal;
52+
font-display: swap;
53+
font-weight: 400;
5354
}
5455

5556
@layer utilities {
56-
@keyframes tab-in {
57-
from {
58-
transform: scaleX(0);
57+
@keyframes tab-in {
58+
from {
59+
transform: scaleX(0);
60+
}
61+
to {
62+
transform: scaleX(1);
63+
}
5964
}
60-
to {
61-
transform: scaleX(1);
65+
.animate-tab-in {
66+
animation: tab-in 300ms ease-out forwards;
67+
transform-origin: left;
6268
}
63-
}
64-
.animate-tab-in {
65-
animation: tab-in 300ms ease-out forwards;
66-
transform-origin: left;
67-
}
6869
}
6970

7071
.avoid-break {

0 commit comments

Comments
 (0)