From b56236dd557d2bc0cd0ae3ed8c6eefb4ed36071e Mon Sep 17 00:00:00 2001 From: Rishabh Date: Tue, 10 Oct 2023 00:34:37 +0530 Subject: [PATCH 1/2] fixed --- .../winningTeamCard/WinningTeamCard.css | 28 ++++++++----------- src/pages/home/sections/section6/Section6.css | 5 ++-- 2 files changed, 14 insertions(+), 19 deletions(-) diff --git a/src/components/winningTeamCard/WinningTeamCard.css b/src/components/winningTeamCard/WinningTeamCard.css index bdba4a7..a0d8f71 100644 --- a/src/components/winningTeamCard/WinningTeamCard.css +++ b/src/components/winningTeamCard/WinningTeamCard.css @@ -110,11 +110,12 @@ border: 2px solid black; } .codeutsava__section11-problemModal-body { + padding: 50px; overflow: hidden; position: fixed; width: 60%; height: 85%; - top: 10%; + top: 12%; left: 20%; display: flex; flex-direction: column; @@ -160,6 +161,7 @@ @media screen and (max-width: 200px) { .codeutsava__section11-problemModal-body { + padding: 5px; height: 65%; width: 90%; padding: 10px; @@ -170,7 +172,7 @@ } .codeutsava__section11-problemModal-body h1 { - font-size: 16px; + font-size: 10px; text-align: center; margin: 4px 4px; } @@ -188,7 +190,7 @@ } .codeutsava__section11-problemModal-body table { - width: 80%; + width: 100%; margin: 1rem 0; border-collapse: collapse; box-shadow: 0 0 20px rgba(0, 0, 0, 0.1); @@ -215,21 +217,13 @@ } @media screen and (max-width: 900px) { - .codeutsava__section11-problemModal-body { - width: 24%; - height: 20%; - top: 75%; - left: 4%; + .codeutsava__section11-problemModal-body table { + width: 100%; + height: 100%; } } @media screen and (max-width: 400px) { - .codeutsava__section11-problemModal-body { - width: 23%; - height: 22%; - top: 75%; - left: 1%; - } - .codeutsava__section11-problemsModal-body td{ - font-size: 10px; + .codeutsava__section11-problemModal-body table { + height: 40vh; } -} +} \ No newline at end of file diff --git a/src/pages/home/sections/section6/Section6.css b/src/pages/home/sections/section6/Section6.css index 95c4be0..c2d6c1d 100644 --- a/src/pages/home/sections/section6/Section6.css +++ b/src/pages/home/sections/section6/Section6.css @@ -5,6 +5,7 @@ } .codeutsava__section6-body { + overflow: hidden; display: flex; justify-content: center; align-items: center; @@ -154,8 +155,8 @@ } } -@media screen and (max-width: 350px) { +/* @media screen and (max-width: 350px) { .codeutsava__section6-sponser-list { max-width: 200px; } -} +} */ From f793757cc413d0589c2992569ac467f4ff2cb920 Mon Sep 17 00:00:00 2001 From: Rishabh Date: Mon, 18 Mar 2024 09:06:27 +0530 Subject: [PATCH 2/2] Team Fixed --- src/components/teamCard/TeamCard.js | 5 ++++- src/components/teamCard3/TeamCard3.js | 5 ++++- .../winningTeamCard/WinningTeamCard.css | 20 ------------------- 3 files changed, 8 insertions(+), 22 deletions(-) diff --git a/src/components/teamCard/TeamCard.js b/src/components/teamCard/TeamCard.js index 00ed7ce..9969ae8 100644 --- a/src/components/teamCard/TeamCard.js +++ b/src/components/teamCard/TeamCard.js @@ -10,11 +10,14 @@ const TeamCard = ({ linkedin, domain, }) => { + const imgIdRegex = /\/uc\?id=([\w-]+)&?/; + const match = img.match(imgIdRegex); + const extractedId = match ? match[1] : null; return (
- +

{name}

diff --git a/src/components/teamCard3/TeamCard3.js b/src/components/teamCard3/TeamCard3.js index b5c3063..31d7f21 100644 --- a/src/components/teamCard3/TeamCard3.js +++ b/src/components/teamCard3/TeamCard3.js @@ -5,6 +5,9 @@ import spider from "../../assets/images/spider.svg"; import pumpkin from "../../assets/images/pumpkin.svg"; const TeamCard3 = ({ img, name, position, linkedin, email, domain }) => { + const imgIdRegex = /\/uc\?id=([\w-]+)&?/; + const match = img.match(imgIdRegex); + const extractedId = match ? match[1] : null; return (
@@ -12,7 +15,7 @@ const TeamCard3 = ({ img, name, position, linkedin, email, domain }) => {
- +

{name}

diff --git a/src/components/winningTeamCard/WinningTeamCard.css b/src/components/winningTeamCard/WinningTeamCard.css index 96c5a18..33485bb 100644 --- a/src/components/winningTeamCard/WinningTeamCard.css +++ b/src/components/winningTeamCard/WinningTeamCard.css @@ -119,17 +119,10 @@ padding: 50px; overflow: hidden; position: fixed; -<<<<<<< HEAD - width: 60%; - height: 85%; - top: 12%; - left: 20%; -======= width: 80%; height: 80%; top: 15%; left: 10%; ->>>>>>> 18c430455f323107ebbb8b9f94460c705a6d50df display: flex; flex-direction: column; align-items: center; @@ -231,18 +224,6 @@ } @media screen and (max-width: 900px) { -<<<<<<< HEAD - .codeutsava__section11-problemModal-body table { - width: 100%; - height: 100%; - } -} -@media screen and (max-width: 400px) { - .codeutsava__section11-problemModal-body table { - height: 40vh; - } -} -======= .codeutsava__section11-problemModal-body td, .codeutsava__section11-problemModal-body th { font-size: 16px !important; @@ -263,4 +244,3 @@ padding: 1rem; } } ->>>>>>> 18c430455f323107ebbb8b9f94460c705a6d50df