From 746c60e51913374124c0dd8655bfcd709533c768 Mon Sep 17 00:00:00 2001
From: tommy <tommyew7@gmail.com>
Date: Thu, 24 Sep 2020 15:09:14 +0200
Subject: [PATCH] Moved css to MainPage
---
frontend/src/Components/ArtPage.tsx | 1 +
frontend/src/Components/LandingPage.tsx | 1 +
frontend/src/Style/ArtPage.css | 16 ---------------
frontend/src/Style/LandingPage.css | 26 ++++++++++++-------------
frontend/src/Style/MainPage.css | 25 +++++++++++++++++-------
5 files changed, 33 insertions(+), 36 deletions(-)
diff --git a/frontend/src/Components/ArtPage.tsx b/frontend/src/Components/ArtPage.tsx
index 362e2de..0cdf90f 100644
--- a/frontend/src/Components/ArtPage.tsx
+++ b/frontend/src/Components/ArtPage.tsx
@@ -4,6 +4,7 @@ import FavoriteButton from './FavoriteButton';
import DropDown from './DropDown';
import NavButton from './NavButton';
import '../Style/ArtPage.css';
+import '../Style/MainPage.css'
import Music from "./Music";
diff --git a/frontend/src/Components/LandingPage.tsx b/frontend/src/Components/LandingPage.tsx
index 2e3bc0d..ad37105 100644
--- a/frontend/src/Components/LandingPage.tsx
+++ b/frontend/src/Components/LandingPage.tsx
@@ -1,6 +1,7 @@
import React, { ReactElement} from 'react';
import NavButton from './NavButton';
import "../Style/LandingPage.css"
+import "../Style/MainPage.css"
import FavoriteLink from "./FavoriteLink";
import LandingpageSvg from "./LandingpageSVG";
diff --git a/frontend/src/Style/ArtPage.css b/frontend/src/Style/ArtPage.css
index 11cc67c..87a53f9 100644
--- a/frontend/src/Style/ArtPage.css
+++ b/frontend/src/Style/ArtPage.css
@@ -71,19 +71,3 @@ svg {
font-family: "Comic Sans MS", serif;
}
-
-.navbutton.left {
- grid-area: left;
- margin-right: 10rem;
-}
-.navbutton.right {
- grid-area: right;
- margin-left: 10rem;
-}
-
-.navbutton button {
- font-size: large;
- width: 5rem;
- height: 2rem;
- margin-bottom: 3rem;
-}
diff --git a/frontend/src/Style/LandingPage.css b/frontend/src/Style/LandingPage.css
index a0a6f9a..5bd0673 100644
--- a/frontend/src/Style/LandingPage.css
+++ b/frontend/src/Style/LandingPage.css
@@ -34,17 +34,8 @@
font-size: 15px;
}
-.navbutton.left {
- grid-area: left;
- place-self: center;
- position: fixed;
- top: 50%;
- left: 5%;
-}
-.navbutton.right {
- grid-area: navbutton-right;
-}
+
.flex2 {
@@ -72,12 +63,21 @@
font-size: large;
}
- .navbutton.right {
- }
-
.navbutton.left {
+ grid-area: left;
+ place-self: center;
+ position: static;
+ top: 90%;
+ left: 10%;
}
+ .navbutton.right {
+ grid-area: right;
+ place-self: center;
+ position: static;
+ top: 90%;
+ right: 5%;
+ }
.flex2 {
display: flex;
flex-direction: row;
diff --git a/frontend/src/Style/MainPage.css b/frontend/src/Style/MainPage.css
index 17ba418..d08bcf8 100644
--- a/frontend/src/Style/MainPage.css
+++ b/frontend/src/Style/MainPage.css
@@ -6,18 +6,13 @@
background-color: grey;
}
-.navbutton {
- grid-row: 3 / 4;
- display: flex;
-}
.navbutton.left {
- grid-column: 1 / 2;
- flex-direction: row-reverse;
+ grid-area: left;
margin-right: 10rem;
}
.navbutton.right {
- grid-column: 3 / 4;
+ grid-area: right;
margin-left: 10rem;
}
@@ -26,4 +21,20 @@
width: 5rem;
height: 2rem;
margin-bottom: 3rem;
+}
+
+.navbutton.left {
+ grid-area: left;
+ place-self: center;
+ position: fixed;
+ top: 50%;
+ left: 5%;
+}
+
+.navbutton.right {
+ grid-area: right;
+ place-self: center;
+ position: fixed;
+ top: 50%;
+ right: 5%;
}
\ No newline at end of file
--
GitLab