diff --git a/webserver/public/fonts/IBMPlexSansThaiLooped-Regular.ttf b/webserver/public/fonts/IBMPlexSansThaiLooped-Regular.ttf new file mode 100644 index 0000000..6932de9 Binary files /dev/null and b/webserver/public/fonts/IBMPlexSansThaiLooped-Regular.ttf differ diff --git a/webserver/public/index.html b/webserver/public/index.html index 7cf49a0..b5bb0e9 100644 --- a/webserver/public/index.html +++ b/webserver/public/index.html @@ -22,7 +22,7 @@ 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`. --> - Scouting🔭 + Scouting 2022 diff --git a/webserver/src/Pages/WelcomePage.js b/webserver/src/Pages/WelcomePage.js index 147ed60..15c1dff 100644 --- a/webserver/src/Pages/WelcomePage.js +++ b/webserver/src/Pages/WelcomePage.js @@ -1,8 +1,9 @@ import React from 'react' import "./WelcomePage.css"; +import "../App.css"; const WelcomePage = () => { return ( -
+

Welcome to Ridgebotics Scouting Web Application 2022

diff --git a/webserver/src/components/Navigation/Drawer/SideDrawer.css b/webserver/src/components/Navigation/Drawer/SideDrawer.css index 5e0c3f3..089fb36 100644 --- a/webserver/src/components/Navigation/Drawer/SideDrawer.css +++ b/webserver/src/components/Navigation/Drawer/SideDrawer.css @@ -32,6 +32,7 @@ color: white; text-decoration: none; font-size: 2rem; + z-index: 1; } .side_drawer a:hover, diff --git a/webserver/src/components/Navigation/PagesList.js b/webserver/src/components/Navigation/PagesList.js index bd6ea7e..7901962 100644 --- a/webserver/src/components/Navigation/PagesList.js +++ b/webserver/src/components/Navigation/PagesList.js @@ -4,8 +4,8 @@ import { Link } from "react-router-dom"; const PagesList = props => { return ( ) } diff --git a/webserver/src/components/Navigation/Toolbar/Toolbar.css b/webserver/src/components/Navigation/Toolbar/Toolbar.css index df1a745..3b1d4dc 100644 --- a/webserver/src/components/Navigation/Toolbar/Toolbar.css +++ b/webserver/src/components/Navigation/Toolbar/Toolbar.css @@ -21,7 +21,8 @@ .toolbar_logo a { color: white; text-decoration: none; - font-size: 1.5rem; + font-size: 2.0rem; + height: 100%; } .toolbar_spacer { @@ -42,6 +43,8 @@ .toolbar_items a { color: white; text-decoration: none; + font-size: 1.5rem; + height: 200%; } .toolbar_items a:hover,