Team4388/ScoutingApp2022
1
0
Fork 0
mirror of https://github.com/Team4388/ScoutingApp2022.git synced 2026-06-09 00:38:03 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/Team4388/ScoutingApp2022

Browse Source
This commit is contained in:
Sebastian
2022-02-07 17:17:55 -07:00
parent 9d43dc5097 91ae79a698
commit 476ae842ff
6 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
webserver/public/fonts/IBMPlexSansThaiLooped-Regular.ttf
BIN
View File
Binary file not shown.
webserver/public/index.html
+1 -1
View File
@@ -22,7 +22,7 @@
work correctly both with client-side routing and a non-root public URL. work correctly both with client-side routing and a non-root public URL.
Learn how to configure a non-root public URL by running `npm run build`. Learn how to configure a non-root public URL by running `npm run build`.
--> -->
<title>Scouting🔭</title> <title>Scouting 2022</title>
</head> </head>
webserver/src/Pages/WelcomePage.js
+2 -1
View File
@@ -1,8 +1,9 @@
import React from 'react' import React from 'react'
import "./WelcomePage.css"; import "./WelcomePage.css";
import "../App.css";
const WelcomePage = () => { const WelcomePage = () => {
return ( return (
<div class='center'> <div align="center" class = "headerwithfont">
<h1>Welcome to Ridgebotics Scouting Web Application 2022</h1> <h1>Welcome to Ridgebotics Scouting Web Application 2022</h1>
<img src = "/WelcomePageImage.webp"/> <img src = "/WelcomePageImage.webp"/>
</div> </div>
webserver/src/components/Navigation/Drawer/SideDrawer.css
+1
View File
@@ -32,6 +32,7 @@
color: white; color: white;
text-decoration: none; text-decoration: none;
font-size: 2rem; font-size: 2rem;
z-index: 1;
} }
.side_drawer a:hover, .side_drawer a:hover,
webserver/src/components/Navigation/PagesList.js
+2 -2
View File
@@ -4,8 +4,8 @@ import { Link } from "react-router-dom";
const PagesList = props => { const PagesList = props => {
return ( return (
<ul> <ul>
<li><Link onClick={props.click} to="/Dashboard">Dashboard</Link></li> <button><Link onClick={props.click} to="/Dashboard">Dashboard</Link></button>
<li><Link onClick={props.click} to="/Input">Input</Link></li> <button><Link onClick={props.click} to="/Input">Input</Link></button>
</ul> </ul>
) )
} }
webserver/src/components/Navigation/Toolbar/Toolbar.css
+4 -1
View File
@@ -21,7 +21,8 @@
.toolbar_logo a { .toolbar_logo a {
color: white; color: white;
text-decoration: none; text-decoration: none;
font-size: 1.5rem; font-size: 2.0rem;
height: 100%;
} }
.toolbar_spacer { .toolbar_spacer {
@@ -42,6 +43,8 @@
.toolbar_items a { .toolbar_items a {
color: white; color: white;
text-decoration: none; text-decoration: none;
font-size: 1.5rem;
height: 200%;
} }
.toolbar_items a:hover, .toolbar_items a:hover,