Skip to content

Commit

Permalink
Merge pull request #161 from HackHPI/feature/WindowCards
Browse files Browse the repository at this point in the history
changed gradients Feature/window cards
  • Loading branch information
miomiomathi authored Jan 15, 2025
2 parents 2c1d06f + feb18bd commit aaf7724
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 5 deletions.
2 changes: 1 addition & 1 deletion src/components/Features/Features.jsx
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
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
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
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

0 comments on commit aaf7724

Please sign in to comment.