Skip to content

Commit aaf7724

Browse files
authored
Merge pull request #161 from HackHPI/feature/WindowCards
changed gradients Feature/window cards
2 parents 2c1d06f + feb18bd commit aaf7724

File tree

4 files changed

+7
-5
lines changed

4 files changed

+7
-5
lines changed

src/components/Features/Features.jsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import React from "react";
55
export function IconContainer(props) {
66
return (
77
<Card sx={{
8-
background: "linear-gradient(45deg, rgba(58,12,163,1) 0%, rgba(114,9,183,1) 100%)",
8+
background: "linear-gradient(45deg, rgba(58,12,163,1) 0%, rgba(76,201,240,1) 100%)",
99
width: "80%",
1010
aspectRatio: "1 / 1",
1111
display: "flex",

src/components/Jury/Jury.jsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ function Jury() {
4747
<Grid item xs={12} md={12}>
4848
<Stack spacing={3}>
4949
{jury.primary.map(judge => (
50-
<WindowCard elevation={5} key={judge.name}>
50+
<WindowCard elevation={5} key={judge.name} is2024>
5151
<Grid container spacing={5}>
5252
<Grid item xs={12} md={3}>
5353
<Paper sx={{

src/components/Speakers/Speakers.jsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ function Speakers() {
2727
<Grid item xs={12} md={12}>
2828
<Stack spacing={3}>
2929
{speakers.primary.map(speaker => (
30-
<WindowCard elevation={5} key={speaker.name}>
30+
<WindowCard elevation={5} key={speaker.name} is2024>
3131
<Grid container spacing={5}>
3232
<Grid item xs={12} md={3}>
3333
<Paper sx={{

src/components/WindowCard/WindowCard.jsx

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
import {Box, Card, Stack} from "@mui/material";
22

33
export function WindowCard(props) {
4-
4+
let backgroundSecondColor = props.is2024? "rgba(114,9,183,1)":"rgba(76,201,240,1)";
5+
const backgroundGradient = `linear-gradient(90deg, rgba(58,12,163,1) 0%, ${backgroundSecondColor} 100%)`;
56
return (
67
<Card elevation={7}>
78
<Box sx={{
89
//backgroundColor: "primary.main",
910
//rgba(247,37,133,1)
10-
background: "linear-gradient(90deg, rgba(58,12,163,1) 0%, rgba(114,9,183,1) 100%)",
11+
//rgba()
12+
background: backgroundGradient,
1113
display: "flex",
1214
justifyContent: "right",
1315
alignItems: "center",

0 commit comments

Comments
 (0)