Skip to content

Commit 233c4f4

Browse files
committed
perdo si m'estic carregant algo
1 parent 22ee2f1 commit 233c4f4

8 files changed

Lines changed: 51 additions & 15 deletions

File tree

public/IMG_6219.jpeg

1.96 MB
Loading

src/app/components/Departments.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@ import {
55
} from "@/app/genericComponents/General";
66
import { departments_data } from "@data/departments_data";
77
import DepartmentInfoCard from "@/app/genericComponents/DepartmentInfoCard";
8-
import styled from "styled-components";
8+
import styled from "styled-components";
99
import { SpacingM } from "@/app/genericComponents/tokens";
1010

11+
1112
const DepartmentsCards = styled.div`
1213
display: flex;
1314
flex-wrap: wrap;
@@ -16,6 +17,7 @@ const DepartmentsCards = styled.div`
1617
margin-top: ${SpacingM};
1718
`;
1819

20+
1921
export default function Departments() {
2022
return (
2123
<SectionContainer id={"departments"}>

src/app/components/Hero.tsx

Lines changed: 28 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,27 +6,49 @@ import {
66
SpacingM,
77
SpacingXXL,
88
TitleXL,
9+
Primary300,
910
} from "@/app/genericComponents/tokens";
1011
import { hero_data } from "@data/hero_data";
1112
import { PrimaryButton } from "@/app/genericComponents/General";
1213

1314
const Container = styled.div`
14-
margin: ${SpacingL} auto;
15+
position: relative;
16+
margin-top: 5%;
17+
margin-right: 10%;
18+
margin-left: 10%;
1519
padding: ${SpacingXXL};
16-
background-image: url("/hackupcLogo.svg");
17-
background-repeat: no-repeat;
18-
background-position: center;
19-
background-size: contain;
20+
border-radius: 20px;
21+
border: 0.3333rem solid ${Primary300};
22+
overflow: hidden;
2023
2124
@media (max-width: ${MobileBreakpoint}) {
2225
padding: ${SpacingM};
2326
}
27+
28+
&::before {
29+
content: "";
30+
position: absolute;
31+
inset: 0;
32+
background-image: url("/IMG_6219.jpeg");
33+
background-position: center 60%;
34+
background-size: cover;
35+
opacity: 0.3;
36+
z-index: 0;
37+
}
38+
39+
> * {
40+
position: relative;
41+
z-index: 1;
42+
}
2443
`;
2544

45+
2646
const Title = styled.h1`
2747
text-align: center;
2848
font-size: ${TitleXL};
2949
background: transparent;
50+
color: #fff;
51+
text-shadow: 0 2px 6px rgba(0, 0, 0, 0);
3052
3153
@media (max-width: ${MobileBreakpoint}) {
3254
font-size: ${MobileTitleXL};
@@ -37,6 +59,7 @@ const ButtonContainer = styled.div`
3759
display: flex;
3860
justify-content: center;
3961
margin-top: ${SpacingM};
62+
4063
`;
4164

4265
export default function Hero() {

src/app/components/Socials.tsx

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,17 @@ import {
1212
SpacingS,
1313
SpacingXS,
1414
TitleM,
15+
Primary300,
1516
} from "@/app/genericComponents/tokens";
1617
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
1718
import { faUpRightFromSquare } from "@fortawesome/free-solid-svg-icons";
1819

20+
const BorderedSection = styled(SectionContainer)`
21+
border-radius: 10px;
22+
border: 0.3333rem solid ${Primary300};
23+
padding: ${SpacingM};
24+
`;
25+
1926
const HeaderSocials = styled.a`
2027
font-size: ${TitleM};
2128
font-weight: bold;
@@ -56,9 +63,10 @@ const SocialItem = styled.div`
5663

5764
export default function Socials() {
5865
return (
59-
<SectionContainer>
66+
<BorderedSection>
6067
<SectionTitle>{socials_data.title}</SectionTitle>
6168
<SocialsDescription>{socials_data.description}</SocialsDescription>
69+
6270
<HeaderSocials href={"https://hackupc.com/"} target={"_blank"}>
6371
HackUPC
6472
<FontAwesomeIcon
@@ -67,6 +75,7 @@ export default function Socials() {
6775
style={{ marginLeft: "8px" }}
6876
/>
6977
</HeaderSocials>
78+
7079
<SocialsList>
7180
{socials_data.socialsHackUPC.map((social) => (
7281
<SocialItem key={social.label}>
@@ -81,6 +90,7 @@ export default function Socials() {
8190
</SocialItem>
8291
))}
8392
</SocialsList>
93+
8494
<HeaderSocials href={"https://hackersatupc.org/"} target={"_blank"}>
8595
Hackers@UPC{" "}
8696
<FontAwesomeIcon
@@ -89,6 +99,7 @@ export default function Socials() {
8999
style={{ marginLeft: "8px" }}
90100
/>
91101
</HeaderSocials>
102+
92103
<SocialsList>
93104
{socials_data.socialsHackersUPC.map((social) => (
94105
<SocialItem key={social.label}>
@@ -103,6 +114,6 @@ export default function Socials() {
103114
</SocialItem>
104115
))}
105116
</SocialsList>
106-
</SectionContainer>
117+
</BorderedSection>
107118
);
108119
}

src/app/data/socials_data.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,9 @@ const listSocialsHackersUPC: SocialsItem[] = [
8484
];
8585

8686
export const socials_data: Socials = {
87-
title: "Estigues atent i no et perdis res!",
87+
title: "Estem en contacte!",
8888
description:
89-
"Si tens qualsevol dubte o pregunta, contacta amb nosaltres a través de qualsevol xarxa social!",
89+
"Si tens qualsevol dubte o pregunta, contacta amb nosaltres a través de qualsevol xarxa social.",
9090
socialsHackUPC: listSocialsHackUPC,
9191
socialsHackersUPC: listSocialsHackersUPC,
9292
};

src/app/genericComponents/DepartmentInfoCard.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ const Answer = styled.p<{ isVisible: boolean }>`
5757

5858
const QuestionBox = styled.div`
5959
border-radius: ${SpacingS};
60-
background-color: ${Primary200};
60+
background-color: #304697;
6161
padding: ${SpacingS};
6262
cursor: pointer;
6363

src/app/genericComponents/General.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ export const TransparentBackground = styled.div`
3636
`;
3737

3838
export const Background = styled(TransparentBackground)`
39-
background: ${BackgroundAccent};
39+
background: #1d1e3b;
4040
`;
4141

4242
export const CardWithBorder = styled.div`

src/app/globals.css

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ html,
99
body {
1010
max-width: 100vw;
1111
overflow-x: hidden; /* Prevents horizontal scrollbar */
12-
background-color: #181c19;
12+
background-color: #1c1e3b;
1313
}
1414

1515
.embla {
@@ -58,7 +58,7 @@ body {
5858
align-items: center;
5959
}
6060
.embla__button {
61-
-webkit-tap-highlight-color: rgba(49, 49, 49, 0.5);
61+
-webkit-tap-highlight-color: rgba(255, 255, 255, 0.5);
6262
-webkit-appearance: none;
6363
appearance: none;
6464
background-color: transparent;
@@ -79,7 +79,7 @@ body {
7979
justify-content: center;
8080
}
8181
.embla__button:disabled {
82-
color: rgb(192, 192, 192);
82+
color: rgb(255, 255, 255);
8383
}
8484
.embla__button__svg {
8585
width: 35%;

0 commit comments

Comments
 (0)