diff --git a/src/assets/img/SIK_RGB_W_side.png b/src/assets/img/SIK_RGB_W_side.png new file mode 100644 index 0000000..724d687 Binary files /dev/null and b/src/assets/img/SIK_RGB_W_side.png differ diff --git a/src/components/Header/Header.scss b/src/components/Header/Header.scss index df1da96..d62240f 100644 --- a/src/components/Header/Header.scss +++ b/src/components/Header/Header.scss @@ -1,5 +1,9 @@ .header { display: flex; - flex-flow: column nowrap; + flex-flow: row nowrap; align-items: center; + + img { + max-width: 200px; + } } diff --git a/src/components/Header/Header.tsx b/src/components/Header/Header.tsx index deb569d..f44d086 100644 --- a/src/components/Header/Header.tsx +++ b/src/components/Header/Header.tsx @@ -1,6 +1,8 @@ import * as React from "react"; import "./Header.scss"; import Navigation from "../Navigation"; +// @ts-ignore +import * as TitleImage from "../../assets/img/SIK_RGB_W_side.png"; export interface HeaderProps {} export interface HeaderState {} @@ -9,7 +11,7 @@ class Header extends React.Component { render() { return (
-

Aalto-yliopiston Sähköinsinöörikilta

+
); diff --git a/src/components/Navigation/Navigation.scss b/src/components/Navigation/Navigation.scss index dc56d87..f165726 100644 --- a/src/components/Navigation/Navigation.scss +++ b/src/components/Navigation/Navigation.scss @@ -5,8 +5,9 @@ $border-width: 2px; width: 100%; display: flex; flex-flow: row nowrap; - justify-content: center; - margin-bottom: 3rem; + justify-content: flex-start; + align-items: center; + font-size: 12px; &__item { padding: 0.8rem 2rem; diff --git a/src/index.scss b/src/index.scss index 5722d6f..6933251 100644 --- a/src/index.scss +++ b/src/index.scss @@ -8,7 +8,6 @@ body { height: 100%; font-family: $font; color: $white; - text-align: center; overflow: auto; } @@ -18,8 +17,7 @@ body { } body { - max-width: 1200px; - padding: 0 0.5rem; + padding: 0 1rem; margin: auto !important; } diff --git a/src/pages/FrontPage/FrontPage.scss b/src/pages/FrontPage/FrontPage.scss index 9d9367c..131ffe0 100644 --- a/src/pages/FrontPage/FrontPage.scss +++ b/src/pages/FrontPage/FrontPage.scss @@ -1,5 +1,5 @@ .front-page { display: flex; flex-flow: row wrap; - justify-content: center; + justify-content: flex-start; }