Skip to content

changed gradients Feature/window cards #161

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

Merged
merged 4 commits into from
Jan 15, 2025
Merged

changed gradients Feature/window cards #161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f3aef75
changed gradient for window cards
Jan 11, 2025
59ded90
changed color cradient for what to expect icons
Jan 11, 2025
c839681
changed window cards gradient for 2024
Jan 11, 2025
feb18bd
Merge branch 'develop' of github.com:HackHPI/hackhpi.github.io into f…
DerCed Jan 15, 2025
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
2 changes: 1 addition & 1 deletion src/components/Features/Features.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import React from "react";
export function IconContainer(props) {
return (
<Card sx={{
background: "linear-gradient(45deg, rgba(58,12,163,1) 0%, rgba(114,9,183,1) 100%)",
background: "linear-gradient(45deg, rgba(58,12,163,1) 0%, rgba(76,201,240,1) 100%)",
width: "80%",
aspectRatio: "1 / 1",
display: "flex",
Expand Down
2 changes: 1 addition & 1 deletion src/components/Jury/Jury.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ function Jury() {
<Grid item xs={12} md={12}>
<Stack spacing={3}>
{jury.primary.map(judge => (
<WindowCard elevation={5} key={judge.name}>
<WindowCard elevation={5} key={judge.name} is2024>
<Grid container spacing={5}>
<Grid item xs={12} md={3}>
<Paper sx={{
Expand Down
2 changes: 1 addition & 1 deletion src/components/Speakers/Speakers.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ function Speakers() {
<Grid item xs={12} md={12}>
<Stack spacing={3}>
{speakers.primary.map(speaker => (
<WindowCard elevation={5} key={speaker.name}>
<WindowCard elevation={5} key={speaker.name} is2024>
<Grid container spacing={5}>
<Grid item xs={12} md={3}>
<Paper sx={{
Expand Down
6 changes: 4 additions & 2 deletions src/components/WindowCard/WindowCard.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
import {Box, Card, Stack} from "@mui/material";

export function WindowCard(props) {

let backgroundSecondColor = props.is2024? "rgba(114,9,183,1)":"rgba(76,201,240,1)";
const backgroundGradient = `linear-gradient(90deg, rgba(58,12,163,1) 0%, ${backgroundSecondColor} 100%)`;
return (
<Card elevation={7}>
<Box sx={{
//backgroundColor: "primary.main",
//rgba(247,37,133,1)
background: "linear-gradient(90deg, rgba(58,12,163,1) 0%, rgba(114,9,183,1) 100%)",
//rgba()
background: backgroundGradient,
display: "flex",
justifyContent: "right",
alignItems: "center",
Expand Down