diff --git a/src/app.tsx b/src/app.tsx index c9b9018..e90e92b 100644 --- a/src/app.tsx +++ b/src/app.tsx @@ -3,16 +3,17 @@ import { MuiThemeProvider as ThemeProvider, StylesProvider } from "@material-ui/ import { studentTheme } from "./ui/theme"; import { MuiPickersUtilsProvider } from "@material-ui/pickers"; import MomentUtils from "@date-io/moment"; -import { BrowserRouter, Switch, Route, Link } from "react-router-dom" +import { BrowserRouter, Link, Route, Switch } from "react-router-dom" import "moment/locale/pl" -moment.locale("pl") - import '@/styles/overrides.scss' import '@/styles/header.scss' import moment, { Moment } from "moment"; import { route, routes } from "@/routing"; +import { Button, Divider } from '@material-ui/core'; + +moment.locale("pl") class LocalizedMomentUtils extends MomentUtils { getDatePickerHeaderText(date: Moment): string { @@ -21,28 +22,42 @@ class LocalizedMomentUtils extends MomentUtils { } function App() { - return ( - - - - -
- -
- - -
-
- { routes.map(({ name, content, ...route }) => { content() }) } -
-
-
-
- ); + return ( + + + + +
+ +
+ + +
+
+ { routes.map(({ name, content, ...route }) => { content() }) } +
+
+
+
+ ); } export default App; diff --git a/src/forms/Internship.tsx b/src/forms/Internship.tsx index 56a5800..967b1b6 100644 --- a/src/forms/Internship.tsx +++ b/src/forms/Internship.tsx @@ -144,13 +144,13 @@ export const InternshipForm: React.FunctionComponent = prop return (
- Dane osoby odbywającej praktykę + Dane osoby odbywającej praktykę - Rodzaj i program praktyki + Rodzaj i program praktyki - Czas trwania praktyki + Czas trwania praktyki - Miejsce odbywania praktyki + Miejsce odbywania praktyki
diff --git a/src/pages/base.tsx b/src/pages/base.tsx index b8f1ff3..be27987 100644 --- a/src/pages/base.tsx +++ b/src/pages/base.tsx @@ -1,11 +1,11 @@ import React, { HTMLProps, useEffect } from "react"; import classNames from "classnames" -import { Breadcrumbs, BreadcrumbsProps, Container, Typography } from "@material-ui/core"; +import { Box, BoxProps, Breadcrumbs, BreadcrumbsProps, Container, Typography } from "@material-ui/core"; import "@/styles/page.scss" export type PageProps = { title?: string; -} & HTMLProps; +} & BoxProps; export type PageHeaderProps = { maxWidth?: "sm" | "md" | "lg" | false @@ -16,9 +16,9 @@ export const Page = ({ title, children, ...props }: PageProps) => { document.title = title ? title + " | Praktyka Studencka" : "Praktyka Studencka"; }, [ title ]) - return
+ return { children } -
+ } Page.Header = ({ children, maxWidth = false, ...props }: PageHeaderProps) => diff --git a/src/pages/main.tsx b/src/pages/main.tsx index 8fcb80d..d343098 100644 --- a/src/pages/main.tsx +++ b/src/pages/main.tsx @@ -6,8 +6,9 @@ import { Link as RouterLink } from "react-router-dom"; import { route } from "@/routing"; export const MainPage = () => { - return + return + Moja praktyka diff --git a/src/styles/header.scss b/src/styles/header.scss index b13891b..2397beb 100644 --- a/src/styles/header.scss +++ b/src/styles/header.scss @@ -4,6 +4,8 @@ height: 110px; background: $main; display: flex; + + color: white; } .header__logo { @@ -22,8 +24,39 @@ background-color: $main-dark; height: 38px; width: 100%; + display: flex; + align-items: center; + font-size: 0.75rem; + color: #e4f1fe; + padding: 0 1rem; + + a { + color: #e4f1fe + } + + .header__divider { + margin: 0 .5rem; + background: lighten($main-dark, 3%); + width: 1px; + height: 60%; + } } .header__nav { flex: 1 1 auto; } + +.header__top .header__menu { + margin-right: auto; +} + +.header__language-switcher { + padding: 0; + display: flex; + text-transform: uppercase; + + li { + padding: 7px; + list-style: none; + } +} diff --git a/src/styles/overrides.scss b/src/styles/overrides.scss index 78aa4a2..08cb80e 100644 --- a/src/styles/overrides.scss +++ b/src/styles/overrides.scss @@ -14,4 +14,10 @@ html, body { margin: 0; padding: 0; + + font-family: "Roboto", "Helvetica", "Arial", sans-serif; +} + +* { + box-sizing: border-box; } diff --git a/src/ui/theme.ts b/src/ui/theme.ts index f03db04..8f770f0 100644 --- a/src/ui/theme.ts +++ b/src/ui/theme.ts @@ -1,6 +1,6 @@ -import { createMuiTheme } from "@material-ui/core/styles"; +import { createMuiTheme, responsiveFontSizes } from "@material-ui/core/styles"; -export const studentTheme = createMuiTheme({ +export const studentTheme = responsiveFontSizes(createMuiTheme({ props: { MuiGrid: { spacing: 3, @@ -16,5 +16,19 @@ export const studentTheme = createMuiTheme({ dark: "#072138" } }, + typography: { + h2: { + fontSize: "3rem", + fontWeight: 400, + color: "#043865", + }, + h3: { + fontSize: "2.25rem", + lineHeight: "1.2", + }, + h4: { + fontSize: "1.75rem" + }, + }, spacing: 8 -}) +}))