Rename Header to NavBar and add it to the bottom too

This commit is contained in:
2022-07-03 21:39:29 +03:00
parent d16f34a1ea
commit 136b775c2b
7 changed files with 15 additions and 24 deletions

View File

@@ -2,17 +2,18 @@ import '../styles/globals.scss';
import '../styles/transitions.scss'; import '../styles/transitions.scss';
import type { AppProps } from 'next/app'; import type { AppProps } from 'next/app';
import Footer from './components/Footer'; import Footer from './components/Footer';
import Header from './components/Header'; import NavBar from './components/NavBar';
import { Logo } from './components/Logo'; import { Logo } from './components/Logo';
function Runosaari({ Component, pageProps }: AppProps) { function Runosaari({ Component, pageProps }: AppProps) {
return ( return (
<> <>
<Header /> <NavBar />
<Logo /> <Logo />
<main> <main>
<Component {...pageProps} /> <Component {...pageProps} />
</main> </main>
<NavBar />
<Footer /> <Footer />
</> </>
); );

View File

@@ -1,10 +1,10 @@
import Link from 'next/link'; import Link from 'next/link';
import styles from '../../styles/Header.module.scss'; import styles from '../../styles/NavBar.module.scss';
const Header = () => { const NavBar = () => {
return ( return (
<> <>
<header className={styles.header}> <div className={styles.navBarContainer}>
<nav className={styles.navBar}> <nav className={styles.navBar}>
<Link href='/'> <Link href='/'>
<a className={styles.navBarLink}>Etusivu</a> <a className={styles.navBarLink}>Etusivu</a>
@@ -25,9 +25,9 @@ const Header = () => {
<a className={styles.navBarLink}>Arkisto</a> <a className={styles.navBarLink}>Arkisto</a>
</Link> </Link>
</nav> </nav>
</header> </div>
</> </>
); );
}; };
export default Header; export default NavBar;

View File

@@ -2,8 +2,6 @@ import type { NextPage } from 'next';
import Performers from './performers'; import Performers from './performers';
import Program from './program'; import Program from './program';
import Info from './info'; import Info from './info';
import Archive from './archive';
import Safety from './safety';
import styles from '../styles/Index.module.scss'; import styles from '../styles/Index.module.scss';
import Lead from './components/Lead'; import Lead from './components/Lead';
@@ -15,8 +13,6 @@ const Home: NextPage = () => {
<Performers /> <Performers />
<Program /> <Program />
<Info /> <Info />
<Archive />
<Safety />
</div> </div>
); );
}; };

View File

@@ -3,6 +3,7 @@
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
margin-bottom: 30px; margin-bottom: 30px;
margin-top: 3rem;
} }
.container { .container {

View File

@@ -3,7 +3,7 @@
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
text-align: center; text-align: center;
margin-bottom: 8rem;
width: 47rem; width: 47rem;
max-width: 100%; max-width: 100%;
margin-bottom: 4rem;
} }

View File

@@ -1,12 +1,15 @@
.header { .navBarContainer {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
margin-bottom: 1rem;
margin-top: 1rem;
} }
.navBar { .navBar {
display: flex; display: flex;
justify-content: center; justify-content: center;
flex-wrap: wrap;
} }
.navBarLink { .navBarLink {
@@ -14,10 +17,7 @@
padding-right: 15px; padding-right: 15px;
color: #2f273e; color: #2f273e;
text-decoration: none; text-decoration: none;
} font-size: 1.4rem;
.navBarLink:hover {
color: #69568b;
} }
@media screen and (max-width: 600px) { @media screen and (max-width: 600px) {
@@ -32,10 +32,4 @@
margin-right: 1rem; margin-right: 1rem;
width: auto; width: auto;
} }
.navBar {
flex-wrap: wrap;
margin-bottom: 1rem;
margin-top: 1rem;
}
} }

View File

@@ -16,7 +16,6 @@
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
text-align: center; text-align: center;
margin-bottom: 8rem;
width: 47rem; width: 47rem;
max-width: 100%; max-width: 100%;
} }