Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove hex colours from tw #142

Merged
merged 2 commits into from
Jul 15, 2024
Merged

Remove hex colours from tw #142

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f3878c7
remove-hex-from-tw
Jul 11, 2024
d0f3553
tw-colours-changes
Jul 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion web/src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ const router = createBrowserRouter([
{
path: '/',
element: <MainMenu />,

},
{
path: '*',
Expand Down
6 changes: 3 additions & 3 deletions web/src/components/OurAchievements.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import MainPageButtonHeadings from "./MainPageButtonHeadings";

const OurAchievements = () => {
return (
<div className="flex flex-col items-center h-screen bg-white font-medium">
<div className="flex flex-col items-center h-screen bg-neutral font-medium">
<MainPageButtonHeadings heading="Our Achievements" />
<div className="achievements flex flex-row gap-4 items-center mt-8">
<img
Expand All @@ -12,7 +12,7 @@ const OurAchievements = () => {
alt="img1"
/>

<div className="w-[180px] h-[250px] bg-[#D9D9D9] font-semibold tracking-[-1px] rounded-[30px]">
<div className="w-[180px] h-[250px] bg-lightGrey font-semibold tracking-[-1px] rounded-[30px]">
<p className="text-center text-lg leading-[8px] mt-12">
Relay for life:
</p>
Expand All @@ -30,7 +30,7 @@ const OurAchievements = () => {
alt="img2"
/>

<div className="w-[180px] h-[250px] bg-[#D9D9D9] font-semibold tracking-[-1px] rounded-[30px]">
<div className="w-[180px] h-[250px] bg-lightGrey font-semibold tracking-[-1px] rounded-[30px]">
<p className="text-center text-lg leading-[8px] mt-12">
UoA Clubs Awards:
</p>
Expand Down
10 changes: 6 additions & 4 deletions web/src/components/OurCommunity.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
import MainPageButtonHeadings from "./MainPageButtonHeadings";

const OurCommunity = () => {
return (
<div className="flex flex-col items-center h-screen bg-white text-black font-medium">
<div className="flex flex-col items-center h-screen bg-neutral text-black font-medium">

<div className="relative w-full h-screen">
<MainPageButtonHeadings heading="Our Community"/>
<div className="flex flex-col items-center">
<MainPageButtonHeadings heading="Our Community"/>
</div>
<div className="flex flex-col items-center">
<div className="text-center font-medium w-[36rem] leading-[1.2rem] mt-[4rem]">
Join our community to start tracking your efforts!
Expand All @@ -15,7 +17,7 @@ const OurCommunity = () => {
</div>
<div className="text-center text-[5rem] leading-[150%] font-semibold mt-[3.5rem]">1,200</div>
<div className="text-center text-[1.4rem]">volunteers in our club</div>
<button className="text-white text-[0.7rem] py-[1rem] mt-[2.2rem] rounded-[30px] px-8 leading-[0.5rem] bg-[#3B87DD]">
<button className="text-white text-[0.7rem] py-[1rem] mt-[2.2rem] rounded-[30px] px-8 leading-[0.5rem] bg-primary">
Sign me up!
</button>
</div>
Expand Down
4 changes: 2 additions & 2 deletions web/src/components/SponsorDiscount.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
const SponsorDiscount = (props: any) => {
return (
<div className="flex flex-col items-center">
<div className="w-0 h-0 border-l-[10px] border-l-transparent border-r-[10px] border-r-transparent border-b-[15px] border-b-[#D9D9D9] mt-2"></div>
<div className="bg-[#D9D9D9] h-[70px] rounded-[10px] flex flex-col justify-center">
<div className="w-0 h-0 border-l-[10px] border-l-transparent border-r-[10px] border-r-transparent border-b-[15px] border-b-lightGrey mt-2"></div>
<div className="bg-lightGrey h-[70px] rounded-[10px] flex flex-col justify-center">
<div className="ml-[0.7rem] mt-[-0.7rem] text-[0.6rem]">{props.name}</div>
<div className="mx-auto px-[2.5rem] mt-[0.1rem]">{props.discount}</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions web/src/components/Sponsors.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { useState } from 'react';
import SponsorDiscount from './SponsorDiscount';
import MainPageButtonHeadings from './MainPageButtonHeadings';

interface SponsorsProps {
data: { imageSrcBw: string; imageSrcColour: string; alt: string; id: number }[]
}
Expand Down Expand Up @@ -29,7 +29,7 @@ const Sponsors = ({ data }: SponsorsProps) => {
];

return (
<div className="flex flex-col items-center h-[85vh] bg-white text-black font-medium">
<div className="flex flex-col items-center h-[85vh] bg-neutral text-black font-medium">
<div className="flex flex-col items-center">
<MainPageButtonHeadings heading="Our Sponsors"/>
<div className="text-center mt-[1rem]">
Expand Down
2 changes: 1 addition & 1 deletion web/src/components/UpcomingEvent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ const UpcomingEvent = () => {
<p className="text-[6px] bg-gray-200 px-2 py-1 rounded-xl mt-1 ml-[0.5rem] mr-[3rem]">Club Event</p>
</div>
<div className="flex items-center mx-4">
<button className="bg-[#3C9DDD] rounded-full text-[12px] px-[6.5px] py-[0px] hover:bg-[#60ABF6]">&gt;</button>
<button className="bg-primary rounded-full text-[12px] px-[6.5px] py-[0px] hover:bg-blueButtonHover">&gt;</button>
</div>
</div>
);
Expand Down
2 changes: 1 addition & 1 deletion web/src/data/SponsorList.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"sponsors": [
"sponsors": [
{
"id": 1,
"imageSrcColour": "../../assets/gallery/sponsors/colour/kompass-logo-colour.png",
Expand Down
Loading