Skip to content

Commit ba9d4b4

Browse files
authored
Merge pull request #4 from LRYMND/custom_fonts
Custom fonts & Cleanup
2 parents d736a89 + 577c073 commit ba9d4b4

18 files changed

+17687
-28772
lines changed

package-lock.json

+17,309-28,335
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+4-19
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "volvo-rtvi",
3-
"version": "1.2.0",
3+
"version": "1.2.1",
44
"private": false,
55
"author": {
66
"name": "Louis Raymond",
@@ -11,41 +11,31 @@
1111
"main": "electron/main.js",
1212
"dependencies": {
1313
"@electron/rebuild": "^3.2.10",
14-
"@fontsource/montserrat": "^4.5.0",
14+
"@mui/material": "^5.11.3",
1515
"@testing-library/jest-dom": "^5.14.1",
1616
"@testing-library/react": "^11.2.7",
1717
"@testing-library/user-event": "^12.8.3",
18-
"@mui/material": "^5.11.3",
19-
"buffer": "^6.0.3",
2018
"canvas-gauges": "^2.1.7",
2119
"electron-is-dev": "^2.0.0",
2220
"electron-store": "^8.1.0",
2321
"jmuxer": "^2.0.5",
2422
"node-carplay": "^3.0.4",
25-
"node-pty": "^0.10.1",
26-
"path-browserify": "^1.0.1",
2723
"python-shell": "^3.0.1",
2824
"react": "^18.2.0",
2925
"react-app-rewired": "^2.2.1",
3026
"react-canvas-gauges": "^1.2.1",
3127
"react-dom": "^18.2.0",
3228
"react-js-carplay": "^3.0.18",
33-
"react-native-animated-pagination-dot": "^0.3.2",
34-
"react-player": "^2.9.0",
35-
"react-router-dom": "^6.3.0",
3629
"react-scripts": "^5.0.1",
3730
"react-simple-keyboard": "^3.5.3",
3831
"react-spinners-kit": "^1.9.1",
3932
"rpi-wifi-connection": "^1.0.17",
4033
"sass": "^1.52.3",
4134
"socket.io": "^4.5.4",
4235
"socket.io-client": "^4.5.4",
43-
"stream-browserify": "^3.0.0",
4436
"usb": "^1.7.1",
4537
"versiony": "^2.0.1",
46-
"web-vitals": "^1.1.2",
47-
"webpack": "^5.75.0",
48-
"ws": "^8.11.0"
38+
"web-vitals": "^1.1.2"
4939
},
5040
"babel": {
5141
"presets": [
@@ -105,13 +95,8 @@
10595
"@babel/cli": "^7.17.6",
10696
"@babel/preset-react": "^7.16.7",
10797
"concurrently": "^7.2.2",
108-
"cross-env": "^7.0.3",
10998
"electron": "^22.0.0",
11099
"electron-builder": "^23.6.0",
111-
"electron-rebuild": "^3.2.9",
112-
"node-abi": "^3.30.0",
113-
"nodemon": "^2.0.16",
114-
"process": "^0.11.10",
115-
"wait-on": "^6.0.1"
100+
"process": "^0.11.10"
116101
}
117102
}
File renamed without changes.
File renamed without changes.

src/index.css

+5-7
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
body {
22
margin: 0;
3-
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen',
4-
'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue',
5-
sans-serif;
3+
font-family: 'Helvetica Neue';
4+
65
-webkit-font-smoothing: antialiased;
76
-moz-osx-font-smoothing: grayscale;
87
}
98

10-
/*code {
11-
font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New',
12-
monospace;
13-
}*/
9+
code {
10+
font-family: 'Helvetica Neue';
11+
}

src/react/App.css

+9-2
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,18 @@ body,
3131
}
3232

3333
body {
34-
font-family: "Montserrat";
35-
3634
display: flex;
3735
align-items: center;
3836
justify-content: center;
3937
}
4038

39+
.container {
40+
width: 100%;
41+
height: 100%;
42+
43+
font-family: 'Helvetica',
44+
}
45+
4146
@media (prefers-reduced-motion: no-preference) {
4247
.App-logo {
4348
animation: App-logo-spin infinite 20s linear;
@@ -72,3 +77,5 @@ body {
7277
from { opacity: 0; }
7378
to { opacity: 1; }
7479
}
80+
81+

src/react/App.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ import './App.css';
99
const App = () => {
1010

1111
return (
12-
<>
12+
<div className='container'>
1313
<CarplayAudio />
1414
<Home />
15-
</>
15+
</div>
1616
);
1717
};
1818

src/react/App.test.js

-8
This file was deleted.

src/react/JsmpegPlayer.js

-32
This file was deleted.

src/react/logo.svg

-1
This file was deleted.

0 commit comments

Comments
 (0)