From 9a8fee0da55bcd5dcf314253b7f3944957fc549d Mon Sep 17 00:00:00 2001 From: Gurram Karthik <167804249+gurramkarthiknetha@users.noreply.github.com> Date: Fri, 24 Jan 2025 00:36:31 +0530 Subject: [PATCH 1/7] fixed issue 3318 --- .../OrganizationCard.module.css | 46 ----- .../OrganizationCard/OrganizationCard.tsx | 2 +- src/style/app.module.css | 158 ++++++++++++------ 3 files changed, 104 insertions(+), 102 deletions(-) diff --git a/src/components/OrganizationCard/OrganizationCard.module.css b/src/components/OrganizationCard/OrganizationCard.module.css index 6c65b8258b..e69de29bb2 100644 --- a/src/components/OrganizationCard/OrganizationCard.module.css +++ b/src/components/OrganizationCard/OrganizationCard.module.css @@ -1,46 +0,0 @@ -.alignimg { - border-radius: 50%; - background-blend-mode: darken; - height: 65px; - width: 65px; -} - -.box { - color: #ffbd59; -} - -.box :hover { - color: #ffbd59; -} - -.first_box { - display: flex; - flex-direction: row; - padding-bottom: 10px; - padding-top: 10px; -} - -.second_box { - padding-left: 20px; - padding-top: 10px; -} - -.second_box > h4 { - font-size: 10; - font-weight: bold; - text-decoration: none; - color: black; -} - -.second_box > h5 { - text-decoration: none; - font-size: 10; - font-weight: 100; - color: #969696; -} - -.deco { - border: 1px solid #dfdfdf; - width: 65vw; - height: 0px !important; -} diff --git a/src/components/OrganizationCard/OrganizationCard.tsx b/src/components/OrganizationCard/OrganizationCard.tsx index d283fa6fe9..90aa4fa29f 100644 --- a/src/components/OrganizationCard/OrganizationCard.tsx +++ b/src/components/OrganizationCard/OrganizationCard.tsx @@ -1,5 +1,5 @@ import React, { useEffect, useState } from 'react'; -import styles from './OrganizationCard.module.css'; +import styles from '../../style/app.module.css'; import { Button } from 'react-bootstrap'; import { Tooltip } from '@mui/material'; import { useTranslation } from 'react-i18next'; diff --git a/src/style/app.module.css b/src/style/app.module.css index 77a3057d69..bd386daa14 100644 --- a/src/style/app.module.css +++ b/src/style/app.module.css @@ -41,7 +41,7 @@ /* Neutral Colors */ --grey-light: #eaebef; --grey-dark: #707070; - --grey-border: #e8e5e5; + --border-color: #e8e5e5; --input-shadow: #dddddd; /* Blue Shades */ @@ -74,12 +74,12 @@ --off-light-green: #31bb6a60; --dark-emerald-green: #23864c; --light-neon-green: #afffe8; - --white-color: #ffffff; + --primary-bg-color: #ffffff; --off-white-color: #ffffff97; --black-color: #000000; --black-shadow-color: #00000029; --white-shadow-color: #ffffff33; - --light-orange: #febc59; + --warning-text-color: #febc59; --grey-border-box-color: #e8e5e5; --subtle-blue-grey: #7c9beb; --subtle-blue-grey-hover: #5f7e91; @@ -89,12 +89,12 @@ --events-card-background-color: #eaebef; --organization-indicator-color: #a8c7fa; --white: #fff; - --black: black; + --primary-text-color: black; --rating-star-filled: #ff6d75; --rating-star-hover: #ff3d47; --info-button-text: var(--davys-grey); --close-button-text: var(--remove-button-color); - --close-button-bg: var(--white-color); + --close-button-bg: var(--primary-bg-color); --checkbox-focus-border: var(--bs-gray-300); --checkbox-bg: var(--dark-blue); --checkbox-border: var(--dark-blue); @@ -199,7 +199,7 @@ --bs-gray-300: #d1d5db; --toggle-button-bg: #1e4e8c; --table-head-bg: #eaebef; - --table-head-color: var(--bs-white, var(--white-color)); + --table-head-color: var(--bs-white, var(--primary-bg-color)); --table-header-color: #000000; --input-area-color: #f1f3f6; --date-picker-background: #f2f2f2; @@ -261,7 +261,7 @@ .capacityLabel { background-color: var(--bs-primary); - color: var(--white-color); + color: var(--primary-bg-color); height: 22.19px; font-size: 12px; font-weight: bolder; @@ -1263,7 +1263,7 @@ hr { .eventDetailsBox { position: relative; box-sizing: border-box; - background: var(--white-color); + background: var(--primary-bg-color); width: 66%; padding: 0.3rem; box-shadow: 0 3px 8px rgba(0, 0, 0, 0.1); @@ -1275,7 +1275,7 @@ hr { padding: 20px; width: 100%; display: flex; - background-color: var(--white-color); + background-color: var(--primary-bg-color); margin: 0 4px; justify-content: space-between; box-shadow: 0 3px 8px var(--black-shadow-color); @@ -1307,13 +1307,13 @@ hr { color: var(--delete-button-color); margin-right: 5px; background-color: var(--delete-button-bg); - border: var(--white-color); + border: var(--primary-bg-color); } .closeButtonOrganizationEvents:hover { color: var(--delete-button-bg) !important; background-color: var(--delete-button-color) !important; - border: var(--white-color); + border: var(--primary-bg-color); } .datedivOrganizationEvents { @@ -1373,7 +1373,7 @@ hr { .createButtonOrganizationEvents:hover { background-color: var(--bs-primary) !important; - color: var(--white-color) !important; + color: var(--primary-bg-color) !important; border: 1px solid var(--search-button-border) !important; } @@ -1385,7 +1385,7 @@ hr { width: 33%; box-sizing: border-box; - background: var(--white-color); + background: var(--primary-bg-color); box-shadow: 0 3px 8px rgba(0, 0, 0, 0.1); border-radius: 20px; margin-bottom: 0; @@ -1470,7 +1470,7 @@ hr { color: var(--blue-color); } .actionBtn { - background-color: var(--white-color) !important; + background-color: var(--primary-bg-color) !important; } .actionBtn:hover, .actionBtn:focus, @@ -1479,7 +1479,7 @@ hr { } .table-body > .table-row { - background-color: var(--white-color) !important; + background-color: var(--primary-bg-color) !important; } .table-body > .table-row:nth-child(2n) { @@ -1850,7 +1850,7 @@ hr { .modalHeader { border: none; padding-bottom: 0; - background-color: var(--white-color) !important; + background-color: var(--primary-bg-color) !important; padding: 1rem 1rem; color: #000000; } @@ -2471,7 +2471,7 @@ input[type='radio']:checked + label:hover { flex-direction: column; width: 30%; padding: 40px 30px; - background: var(--white-color); + background: var(--primary-bg-color); border-color: var(--grey-border-box-color); border-width: 5px; border-radius: 10px; @@ -2660,14 +2660,14 @@ input[type='radio']:checked + label:hover { .activeBtn { width: 100%; display: flex; - color: var(--white-color); + color: var(--primary-bg-color); border: 1px solid var(--black-color); background-color: var(--grey-bg-color); transition: 0.5s; } .activeBtn:hover { - color: var(--white-color); + color: var(--primary-bg-color); background: var(--dark-emerald-green); transition: 0.5s; } @@ -2677,12 +2677,12 @@ input[type='radio']:checked + label:hover { display: flex; color: var(--grey-bg-color-dark); border: 1px solid var(--off-light-green); - background-color: var(--white-color); + background-color: var(--primary-bg-color); transition: 0.5s; } .inactiveBtn:hover { - color: var(--white-color); + color: var(--primary-bg-color); background: var(--grey-bg-color); transition: 0.5s; } @@ -2709,7 +2709,7 @@ input[type='radio']:checked + label:hover { } .activeBtn .bgFill { - background-color: var(--white-color); + background-color: var(--primary-bg-color); } .activeBtn i { @@ -2721,11 +2721,11 @@ input[type='radio']:checked + label:hover { } .inactiveBtn:hover .bgFill { - background-color: var(--white-color); + background-color: var(--primary-bg-color); } .inactiveBtn i { - color: var(--white-color); + color: var(--primary-bg-color); } .inactiveBtn:hover i { @@ -3378,7 +3378,7 @@ form > input { .cardTemplate { padding: 2rem; - background-color: var(--white-color); + background-color: var(--primary-bg-color); border-radius: 0.8rem; border: 1px solid var(--bs-gray-200, var(--bs-gray-300)); } @@ -3931,7 +3931,7 @@ button[data-testid='createPostBtn'] { .leftDrawer .titleHeader { margin: 2rem 0 1rem 0; font-weight: 600; - color: var(--black) !important; + color: var(--primary-text-color) !important; } .leftDrawer .optionList button { @@ -3981,7 +3981,7 @@ button[data-testid='createPostBtn'] { .leftDrawer .profileContainer:focus { outline: none; - background-color: var(--bs-gray-100, var(--white-color)); + background-color: var(--bs-gray-100, var(--primary-bg-color)); } .leftDrawer .imageContainer { @@ -4897,7 +4897,7 @@ button[data-testid='createPostBtn'] { .updateTimeoutCard { width: 700px; - background: var(--white-color); + background: var(--primary-bg-color); border: none; border-radius: 16px; filter: drop-shadow(0px 4px 15.3px rgba(0, 0, 0, 0.08)); @@ -4969,7 +4969,7 @@ button[data-testid='createPostBtn'] { font-family: 'Lato', sans-serif; font-weight: 500; font-size: 16px; - color: var(--white-color); + color: var(--primary-bg-color); display: flex; align-items: center; justify-content: center; @@ -5045,7 +5045,7 @@ button[data-testid='createPostBtn'] { border-radius: 7px; border-color: var(--light-green); background-color: var(--light-green); - color: var(--white-color); + color: var(--primary-bg-color); padding-right: 10px; padding-left: 10px; justify-content: flex-end; @@ -5075,11 +5075,11 @@ button[data-testid='createPostBtn'] { /* UserPasswordUpdate.tsx */ .userupdatediv { - border: 1px solid var(--grey-border); - box-shadow: 2px 1px var(--grey-border); + border: 1px solid var(--border-color); + box-shadow: 2px 1px var(--border-color); padding: 25px 16px; border-radius: 5px; - background: var(--white-color); + background: var(--primary-bg-color); } .dispflexUserPasswordUpdate { @@ -5102,8 +5102,8 @@ button[data-testid='createPostBtn'] { .whitebtn { margin: 1rem 0 0; margin-top: 10px; - border: 1px solid var(--grey-border); - box-shadow: 0 2px 2px var(--grey-border); + border: 1px solid var(--border-color); + box-shadow: 0 2px 2px var(--border-color); padding: 10px 20px; border-radius: 5px; background: none; @@ -5189,7 +5189,7 @@ button[data-testid='createPostBtn'] { } .yearlyCalender { - background-color: var(--white-color); + background-color: var(--primary-bg-color); box-sizing: border-box; } @@ -5237,7 +5237,7 @@ button[data-testid='createPostBtn'] { display: flex; justify-content: center; align-items: center; - background-color: var(--white-color); + background-color: var(--primary-bg-color); font-weight: 600; } @@ -5277,7 +5277,7 @@ button[data-testid='createPostBtn'] { overflow: auto; padding: 10px 4px 0px 4px; background-color: var(--grey-bg-color); - border: 1px solid var(--grey-border); + border: 1px solid var(--border-color); border-radius: 5px; margin: 5px; } @@ -5427,14 +5427,14 @@ button[data-testid='createPostBtn'] { } .agendaItemRow { - border: 1px solid var(--grey-border); + border: 1px solid var(--border-color); border-radius: 4px; transition: box-shadow 0.2s ease; - background-color: var(--white-color); + background-color: var(--primary-bg-color); } .agendaItemRow:hover { - background-color: var(--white-color); + background-color: var(--primary-bg-color); } .dragging { @@ -5636,7 +5636,7 @@ button[data-testid='createPostBtn'] { .editHeader { background-color: var(--light-green); - color: var(--white-color); + color: var(--primary-bg-color); } .link_check { @@ -5651,7 +5651,7 @@ button[data-testid='createPostBtn'] { font-family: sans-serif; font-size: 1.2rem; margin-bottom: 10px; - background: var(--white-color); + background: var(--primary-bg-color); border-radius: 10px; padding-left: 70px; padding-right: 70px; @@ -5723,7 +5723,7 @@ button[data-testid='createPostBtn'] { display: flex; flex-direction: row; align-items: flex-end; - border-right: 1px solid var(--grey-border); + border-right: 1px solid var(--border-color); width: 40px; } @@ -5738,7 +5738,7 @@ button[data-testid='createPostBtn'] { .calendar_hour_block { display: flex; flex-direction: row; - border-bottom: 1px solid var(--grey-border); + border-bottom: 1px solid var(--border-color); position: relative; height: 50px; border-bottom-right-radius: 5px; @@ -5748,7 +5748,7 @@ button[data-testid='createPostBtn'] { border: 0px; font-size: 14px; background-color: initial; - color: var(--black); + color: var(--primary-text-color); font-weight: 600; transition: all 200ms; position: relative; @@ -5782,7 +5782,7 @@ button[data-testid='createPostBtn'] { border-radius: 10px; margin: 5px; background-color: var(--white); - border: 1px solid var(--grey-border); + border: 1px solid var(--border-color); color: var(--grey-dark); font-weight: 600; height: 9rem; @@ -5832,8 +5832,8 @@ button[data-testid='createPostBtn'] { right: auto; overflow: auto; padding: 10px 4px 0px 4px; - background-color: var(--white-color); - border: 1px solid var(--grey-border); + background-color: var(--primary-bg-color); + border: 1px solid var(--border-color); border-radius: 5px; margin: 5px; } @@ -6135,7 +6135,7 @@ button[data-testid='createPostBtn'] { background: var(--subtle-blue-grey) !important; padding: 2px 3px; border-radius: 5px; - border: 1px solid var(--grey-border); + border: 1px solid var(--border-color); box-shadow: 0 3px 2px var(--grey-border-box-color); color: var(--grey-dark); box-sizing: border-box; @@ -6162,7 +6162,7 @@ button[data-testid='createPostBtn'] { } .cardsEventListCard a { - color: var(--white-color); + color: var(--primary-bg-color); font-weight: 600; } @@ -6344,7 +6344,7 @@ button[data-testid='createPostBtn'] { right: 10px; padding: 4px; background-color: var(--red-delete-bg); - color: var(--white-color); + color: var(--primary-bg-color); border: none; cursor: pointer; } @@ -6408,7 +6408,7 @@ button[data-testid='createPostBtn'] { cursor: pointer; border: none; font-size: 12px; - background-color: var(--white-color); + background-color: var(--primary-bg-color); } .toggleClickBtnNone { @@ -6419,7 +6419,7 @@ button[data-testid='createPostBtn'] { display: flex; align-items: center; justify-content: center; - background-color: var(--white-color); + background-color: var(--primary-bg-color); padding-top: 20px; max-width: 700px; max-height: 500px; @@ -6435,7 +6435,7 @@ button[data-testid='createPostBtn'] { .menuOptions li { padding: 10px; - border-bottom: 1px solid var(--grey-border); + border-bottom: 1px solid var(--border-color); padding-left: 100px; padding-right: 100px; cursor: pointer; @@ -7321,3 +7321,51 @@ button[data-testid='createPostBtn'] { width: 2rem; border-width: 0.2rem; } + +.alignimg { + border-radius: 50%; + background-blend-mode: darken; + background-color: var(--primary-bg-color); + height: 65px; + width: 65px; +} + +.box { + color: var(--warning-text-color); +} + +.box :hover { + color: var(--warning-text-color); +} + +.first_box { + display: flex; + flex-direction: row; + padding-bottom: 10px; + padding-top: 10px; +} + +.second_box { + padding-left: 20px; + padding-top: 10px; +} + +.second_box > h4 { + font-size: 10px; + font-weight: bold; + text-decoration: none; + color: var(--primary-text-color); +} + +.second_box > h5 { + text-decoration: none; + font-size: 10px; + font-weight: 100; + color: var(--gray-white); +} + +.deco { + border: 1px solid var(--border-color); + width: 65vw; + height: 0px !important; +} From aa25035af5b2825fbeb4837a48e0fe62fb7db3f0 Mon Sep 17 00:00:00 2001 From: Gurram Karthik <167804249+gurramkarthiknetha@users.noreply.github.com> Date: Fri, 24 Jan 2025 08:40:33 +0530 Subject: [PATCH 2/7] Delete OrganizationCard.module.css --- src/components/OrganizationCard/OrganizationCard.module.css | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 src/components/OrganizationCard/OrganizationCard.module.css diff --git a/src/components/OrganizationCard/OrganizationCard.module.css b/src/components/OrganizationCard/OrganizationCard.module.css deleted file mode 100644 index e69de29bb2..0000000000 From a1e8f4b95046018a45eb4254992ed4e7224bbcd8 Mon Sep 17 00:00:00 2001 From: Gurram Karthik <167804249+gurramkarthiknetha@users.noreply.github.com> Date: Sat, 25 Jan 2025 10:36:27 +0530 Subject: [PATCH 3/7] Update app.module.css --- src/style/app.module.css | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/style/app.module.css b/src/style/app.module.css index a224329312..c3ce519a92 100644 --- a/src/style/app.module.css +++ b/src/style/app.module.css @@ -7437,7 +7437,7 @@ button[data-testid='createPostBtn'] { border-width: 0.2rem; } -.alignimg { +.organizationCard_avatar { border-radius: 50%; background-blend-mode: darken; background-color: var(--primary-bg-color); @@ -7445,7 +7445,7 @@ button[data-testid='createPostBtn'] { width: 65px; } -.box { +.organizationCard_warning { color: var(--warning-text-color); } @@ -7453,14 +7453,14 @@ button[data-testid='createPostBtn'] { color: var(--warning-text-color); } -.first_box { +.organizationCard_header { display: flex; flex-direction: row; padding-bottom: 10px; padding-top: 10px; } -.second_box { +.organizationCard_content { padding-left: 20px; padding-top: 10px; } @@ -7479,7 +7479,7 @@ button[data-testid='createPostBtn'] { color: var(--gray-white); } -.deco { +.organizationCard_divider { border: 1px solid var(--border-color); width: 65vw; height: 0px !important; From eadf6ade18e87f6ac588859d735933ec9325fd1f Mon Sep 17 00:00:00 2001 From: Gurram Karthik <167804249+gurramkarthiknetha@users.noreply.github.com> Date: Sat, 25 Jan 2025 10:42:12 +0530 Subject: [PATCH 4/7] Update app.module.css --- src/style/app.module.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/style/app.module.css b/src/style/app.module.css index c3ce519a92..9f792c79a1 100644 --- a/src/style/app.module.css +++ b/src/style/app.module.css @@ -7450,7 +7450,7 @@ button[data-testid='createPostBtn'] { } .box :hover { - color: var(--warning-text-color); + color: #b85c00; /* Example of a darker, accessible orange */ } .organizationCard_header { From 22c669550d34830771370b21b2eda363918013cf Mon Sep 17 00:00:00 2001 From: Gurram Karthik <167804249+gurramkarthiknetha@users.noreply.github.com> Date: Sat, 25 Jan 2025 17:48:14 +0530 Subject: [PATCH 5/7] Update app.module.css --- src/style/app.module.css | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/style/app.module.css b/src/style/app.module.css index 9f792c79a1..81c21984f1 100644 --- a/src/style/app.module.css +++ b/src/style/app.module.css @@ -65,7 +65,7 @@ --blue-color: #0000ff; --light-blue-color: #286fe0; --dimp-white: #b5b5b5; - --gray-white: #808080; + --background-primary: #808080; --dropdown-hover-color: #eff1f7; --grey-bg-color: #eaebef; --light-dark-green: #08780b; @@ -1502,7 +1502,7 @@ hr { .startDate, .endDate { - color: var(--gray-white); + color: var(--background-primary); font-size: 14px; } @@ -1518,7 +1518,7 @@ hr { } .description { - color: var(--gray-white); + color: var(--background-primary); font-weight: 300; font-size: 14px; word-wrap: break-word; @@ -1532,7 +1532,7 @@ hr { } .toporgloc span { - color: var(--gray-white); + color: var(--background-primary); } .eventAgendaItemContainer h2 { @@ -2355,8 +2355,8 @@ input[type='radio']:checked + label:hover { } .sampleHover:hover { - border-color: var(--gray-white); - color: var(--gray-white); + border-color: var(--background-primary); + color: var(--background-primary); } .sampleModalTitle { @@ -5829,7 +5829,7 @@ button[data-testid='createPostBtn'] { justify-content: center; align-items: center; background-color: var(--white); - color: var(--gray-white); + color: var(--background-primary); font-size: medium; font-weight: 600; } @@ -7476,7 +7476,7 @@ button[data-testid='createPostBtn'] { text-decoration: none; font-size: 10px; font-weight: 100; - color: var(--gray-white); + color: var(--background-primary); } .organizationCard_divider { From 83971a640a862d7d9b2bdd826999fc2f06c3b889 Mon Sep 17 00:00:00 2001 From: Gurram Karthik <167804249+gurramkarthiknetha@users.noreply.github.com> Date: Sat, 25 Jan 2025 17:59:37 +0530 Subject: [PATCH 6/7] Update app.module.css --- src/style/app.module.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/style/app.module.css b/src/style/app.module.css index 81c21984f1..7da0749a3e 100644 --- a/src/style/app.module.css +++ b/src/style/app.module.css @@ -7450,7 +7450,7 @@ button[data-testid='createPostBtn'] { } .box :hover { - color: #b85c00; /* Example of a darker, accessible orange */ + color: var(--hover-shadow); /* Example of a darker, accessible orange */ } .organizationCard_header { From 6b18050246f682da5367ec0da12726b0116ea0e8 Mon Sep 17 00:00:00 2001 From: Gurram Karthik <167804249+gurramkarthiknetha@users.noreply.github.com> Date: Sat, 25 Jan 2025 18:13:56 +0530 Subject: [PATCH 7/7] Update app.module.css --- src/style/app.module.css | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/style/app.module.css b/src/style/app.module.css index 7da0749a3e..265a43c870 100644 --- a/src/style/app.module.css +++ b/src/style/app.module.css @@ -7449,8 +7449,9 @@ button[data-testid='createPostBtn'] { color: var(--warning-text-color); } -.box :hover { - color: var(--hover-shadow); /* Example of a darker, accessible orange */ +.box:hover { + box-shadow: var(--hover-shadow); + transition: box-shadow 0.2s ease; } .organizationCard_header { @@ -7466,7 +7467,7 @@ button[data-testid='createPostBtn'] { } .second_box > h4 { - font-size: 10px; + font-size: 0.625rem; font-weight: bold; text-decoration: none; color: var(--primary-text-color); @@ -7474,7 +7475,7 @@ button[data-testid='createPostBtn'] { .second_box > h5 { text-decoration: none; - font-size: 10px; + font-size: 0.625rem; font-weight: 100; color: var(--background-primary); }