diff --git a/components/Home/AboutUsSection.tsx b/components/Home/AboutUsSection.tsx index 247952e..9ae10b2 100644 --- a/components/Home/AboutUsSection.tsx +++ b/components/Home/AboutUsSection.tsx @@ -1,68 +1,124 @@ import { FC } from 'react'; +import Box from '@mui/material/Box'; import Container from '@mui/material/Container'; -import { createTheme, ThemeProvider } from '@mui/material/styles'; +import Divider from '@mui/material/Divider'; +import { ThemeProvider } from '@mui/material/styles'; import Typography from '@mui/material/Typography'; import Image from 'next/image'; import Deerfield from 'public/deerfield.png'; // image from https://www.soundsolutions.ca/projects/featured-exterior-cladding-projects/deerfield-hall-univeristy-of-toronto-mississauga-campus import Experience from 'public/experience.png'; -const theme = createTheme({ - typography: { - fontFamily: ['Segoe UI'].join(','), - }, -}); +import { aboutSectionTheme } from '../../style/theme'; const AboutUsSection: FC = () => ( - + -
+ Deerfield Hall -
+ -
-
+ + ABOUT US -
-
+ + -
-
-

+ + + FOR THE STUDENTS -

-

- Academic Society -

-
-
+ + + Experience -
-
-

+ + + Academic Society -

-
+ + Hello students and welcome! UTM Mathematical and Computational Sciences Society (MCSS) is the official academic society for the Mathematics and Computational Sciences @@ -73,8 +129,8 @@ const AboutUsSection: FC = () => ( between the students themselves, and encourage faculty and student interaction outside of the formal lecture, tutorial, and lab settings. -
-
+ +
); diff --git a/pages/_app.tsx b/pages/_app.tsx index 7944513..edbd15a 100644 --- a/pages/_app.tsx +++ b/pages/_app.tsx @@ -9,7 +9,7 @@ import { store } from '@store/store'; import { ReactQueryDevtools } from '@tanstack/react-query-devtools'; import type { AppProps } from 'next/app'; import Script from 'next/script'; -import theme from 'style/theme'; +import { theme } from 'style/theme'; import { APIProvider } from '../contexts/useAPI'; diff --git a/style/theme.ts b/style/theme.ts index d627c40..18a4a45 100644 --- a/style/theme.ts +++ b/style/theme.ts @@ -2,6 +2,12 @@ import { createTheme } from '@mui/material/styles'; import COLORS from 'style/colors'; +const aboutSectionTheme = createTheme({ + typography: { + fontFamily: ['Segoe UI'].join(','), + }, +}); + const base = createTheme({ palette: { primary: { @@ -164,4 +170,4 @@ const theme = createTheme(base, { }, }); -export default theme; +export { theme, aboutSectionTheme };