Skip to content

Commit f94f119

Browse files
authored
Merge branch 'main' into feature/contentDisplay
2 parents e235099 + b163335 commit f94f119

File tree

3 files changed

+30
-28
lines changed

3 files changed

+30
-28
lines changed

src/components/LandingPage.tsx

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import { useLocation, useNavigate } from "react-router-dom";
33
import "./styles/LandingPage.css";
44
import LandingPageLink from "./LandingPageLink";
55
import { animated, useTransition } from "react-spring";
6-
import AuthContext from "../contexts/AuthContext";
76
import pixelBG from "../img/pixelBG_LowRes.png";
87
import pixelFadeBG from "../img/animated-14fps.png";
98
import AppContext from "../contexts/AppContext";
@@ -54,9 +53,7 @@ const LandingPage = ({ setIsLanding }: Props) => {
5453

5554
useEffect(() => {
5655
setCurrentPathContext(currentPath);
57-
if (
58-
// If current path is 'complete', transition to HomeView
59-
currentPath.includes("/gamedev") ||
56+
if (currentPath.includes("/gamedev") ||
6057
currentPath.includes("/webdev")
6158
) {
6259
setCurrBG(pixelFadeBG);

src/components/styles/HomeViewHeader.css

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@
5454
.HomeViewHeader .nav-ctr {
5555
display: flex;
5656
justify-content: center;
57-
width: 120px;
5857
}
5958

6059
.HomeViewHeader .nav-ctr ul {

src/components/styles/LandingPage.css

Lines changed: 29 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -10,26 +10,6 @@
1010
z-index: 5;
1111
}
1212

13-
.LandingPage .lp-content-ctr {
14-
/* . . . Positioning . . . */
15-
position: absolute;
16-
display: flex;
17-
flex-direction: column;
18-
align-items: center;
19-
justify-content: center;
20-
box-sizing: border-box;
21-
height: 100%;
22-
max-height: 100%;
23-
width: 100%;
24-
/* . . . Fonts . . . */
25-
font-family: "munro";
26-
font-weight: 400;
27-
font-size: 18px;
28-
letter-spacing: 4px;
29-
font-smooth: never;
30-
z-index: 1;
31-
}
32-
3313
.LandingPage .bg-img-ctr {
3414
height: 100%;
3515
max-height: 100%;
@@ -56,25 +36,44 @@
5636
z-index: 0;
5737
}
5838

39+
.LandingPage .lp-content-ctr {
40+
/* . . . Positioning . . . */
41+
position: absolute;
42+
display: flex;
43+
flex-direction: column;
44+
align-items: center;
45+
box-sizing: border-box;
46+
height: 100%;
47+
max-height: 100%;
48+
width: 100%;
49+
/* . . . Fonts . . . */
50+
font-family: "munro";
51+
font-weight: 400;
52+
font-size: 18px;
53+
letter-spacing: 4px;
54+
font-smooth: never;
55+
z-index: 1;
56+
}
57+
5958
.LandingPage .lp-content-ctr a {
6059
text-decoration: none;
6160
color: rgb(208, 247, 239);
6261
}
6362

6463
.LandingPage .lp-content-ctr .header-ctr {
6564
display: flex;
66-
flex: 1;
65+
flex: 6;
6766
align-items: center;
6867
justify-content: center;
6968
box-sizing: border-box;
7069
margin-bottom: 0%;
7170
width: 100%;
71+
height: fit-content;
7272
z-index: 1;
7373
}
7474

7575
.LandingPage .lp-content-ctr .PersonalIntro {
7676
display: flex;
77-
flex: 1;
7877
align-items: center;
7978
justify-content: center;
8079
box-sizing: border-box;
@@ -91,14 +90,21 @@
9190

9291
.LandingPage .lp-content-ctr .nav-ctr {
9392
display: flex;
94-
flex: 1;
93+
flex: 5;
9594
flex-direction: row;
9695
justify-content: space-evenly;
9796
box-sizing: border-box;
9897
width: 100%;
9998
z-index: 1;
10099
}
101100

101+
.LandingPage .lp-content-ctr .lp-link {
102+
display: flex;
103+
align-items: center;
104+
justify-content: center;
105+
height: 90px;
106+
}
107+
102108
.LandingPage .lp-content-ctr .lp-link h1,
103109
.LandingPage .lp-content-ctr .lp-link h2 {
104110
font-weight: 600;

0 commit comments

Comments
 (0)