From fb9a22eab9bde9f85d50fd459fbbb99a9d6086b3 Mon Sep 17 00:00:00 2001 From: Anushka Gupta Date: Mon, 27 Jan 2025 18:58:06 +0530 Subject: [PATCH 1/9] Refactoring AgendaCategorgyContainer to import css from app.module --- .../AgendaCategoryContainer.module.css | 20 ---------------- .../AgendaCategoryContainer.tsx | 2 +- src/style/app.module.css | 24 +++++++++++++++++++ 3 files changed, 25 insertions(+), 21 deletions(-) delete mode 100644 src/components/AgendaCategory/AgendaCategoryContainer.module.css diff --git a/src/components/AgendaCategory/AgendaCategoryContainer.module.css b/src/components/AgendaCategory/AgendaCategoryContainer.module.css deleted file mode 100644 index 7ad16b4c7c..0000000000 --- a/src/components/AgendaCategory/AgendaCategoryContainer.module.css +++ /dev/null @@ -1,20 +0,0 @@ -.createModal { - margin-top: 20vh; - margin-left: 13vw; - max-width: 80vw; -} - -.titlemodal { - color: var(--bs-gray-600); - font-weight: 600; - font-size: 20px; - margin-bottom: 20px; - padding-bottom: 5px; - border-bottom: 3px solid var(--bs-primary); - width: 65%; -} - -.agendaCategoryOptionsButton { - width: 24px; - height: 24px; -} diff --git a/src/components/AgendaCategory/AgendaCategoryContainer.tsx b/src/components/AgendaCategory/AgendaCategoryContainer.tsx index 3a02dcc416..2adf3eb9e7 100644 --- a/src/components/AgendaCategory/AgendaCategoryContainer.tsx +++ b/src/components/AgendaCategory/AgendaCategoryContainer.tsx @@ -10,7 +10,7 @@ import { UPDATE_AGENDA_ITEM_CATEGORY_MUTATION, } from 'GraphQl/Mutations/mutations'; import type { InterfaceAgendaItemCategoryInfo } from 'utils/interfaces'; -import styles from './AgendaCategoryContainer.module.css'; +import styles from '../../style/app.module.css'; import AgendaCategoryDeleteModal from 'components/OrgSettings/AgendaItemCategories/AgendaCategoryDeleteModal'; import AgendaCategoryPreviewModal from 'components/OrgSettings/AgendaItemCategories/AgendaCategoryPreviewModal'; diff --git a/src/style/app.module.css b/src/style/app.module.css index 5efd03ee96..8297510d21 100644 --- a/src/style/app.module.css +++ b/src/style/app.module.css @@ -9101,3 +9101,27 @@ button[data-testid='createPostBtn'] { gap: 10px; align-items: center; } + + +/* AgendaCategory.tsx */ + +.createModalAgendaCategory { + margin-top: 20vh; + margin-left: 13vw; + max-width: 80vw; +} + +.titlemodalAgendaCategory { + color: var(--bs-gray-600); + font-weight: 600; + font-size: 20px; + margin-bottom: 20px; + padding-bottom: 5px; + border-bottom: 3px solid var(--bs-primary); + width: 65%; +} + +.agendaCategoryOptionsButton { + width: 24px; + height: 24px; +} \ No newline at end of file From 0b65d395369f0f950cc8e22189750559912a69f9 Mon Sep 17 00:00:00 2001 From: Anushka Gupta Date: Mon, 27 Jan 2025 20:45:57 +0530 Subject: [PATCH 2/9] Prettier Fix --- src/style/app.module.css | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/style/app.module.css b/src/style/app.module.css index 8297510d21..9a5f1b6f50 100644 --- a/src/style/app.module.css +++ b/src/style/app.module.css @@ -9102,7 +9102,6 @@ button[data-testid='createPostBtn'] { align-items: center; } - /* AgendaCategory.tsx */ .createModalAgendaCategory { @@ -9124,4 +9123,4 @@ button[data-testid='createPostBtn'] { .agendaCategoryOptionsButton { width: 24px; height: 24px; -} \ No newline at end of file +} From 72ee71b0d7330529a2c77b5ac1964304284bef3d Mon Sep 17 00:00:00 2001 From: Anushka Gupta Date: Tue, 28 Jan 2025 19:52:32 +0530 Subject: [PATCH 3/9] Test Fix: Prettier app.module --- src/style/app.module.css | 1 - 1 file changed, 1 deletion(-) diff --git a/src/style/app.module.css b/src/style/app.module.css index 297616d872..7ba16f09dd 100644 --- a/src/style/app.module.css +++ b/src/style/app.module.css @@ -9127,7 +9127,6 @@ button[data-testid='createPostBtn'] { } } - /* AgendaCategory.tsx */ .createModalAgendaCategory { From 0b7cebfc97e537386ad26b6a1c4e6216bed5858f Mon Sep 17 00:00:00 2001 From: Anushka Gupta Date: Tue, 28 Jan 2025 20:34:04 +0530 Subject: [PATCH 4/9] codeRabbit fix --- 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 7ba16f09dd..cd09cc5b3f 100644 --- a/src/style/app.module.css +++ b/src/style/app.module.css @@ -9135,7 +9135,7 @@ button[data-testid='createPostBtn'] { max-width: 80vw; } -.titlemodalAgendaCategory { +.titleModalAgendaCategory { color: var(--bs-gray-600); font-weight: 600; font-size: 20px; From 42ebdc193365f19f2712b14a47c139c895af54c6 Mon Sep 17 00:00:00 2001 From: Anushka Gupta Date: Tue, 28 Jan 2025 21:19:51 +0530 Subject: [PATCH 5/9] CodeRabbit review comment fix --- src/style/app.module.css | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/src/style/app.module.css b/src/style/app.module.css index cd09cc5b3f..143f8a13bc 100644 --- a/src/style/app.module.css +++ b/src/style/app.module.css @@ -9130,12 +9130,18 @@ button[data-testid='createPostBtn'] { /* AgendaCategory.tsx */ .createModalAgendaCategory { - margin-top: 20vh; - margin-left: 13vw; + position: fixed; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); max-width: 80vw; + + @media (max-width: 768px) { + max-width: 95vw; + } } -.titleModalAgendaCategory { +.titlemodalAgendaCategory { color: var(--bs-gray-600); font-weight: 600; font-size: 20px; @@ -9145,7 +9151,18 @@ button[data-testid='createPostBtn'] { width: 65%; } -.agendaCategoryOptionsButton { - width: 24px; - height: 24px; +.agenda-category-options-button { + width: 1.5rem; + height: 1.5rem; + cursor: pointer; + transition: transform 0.2s ease; +} + +.agenda-category-options-button:hover { + transform: scale(1.1); +} + +.agenda-category-options-button:focus-visible { + outline: 2px solid var(--light-blue); + outline-offset: 2px; } From 8456338dd14bc3379d89b172853290f8035e8798 Mon Sep 17 00:00:00 2001 From: Anushka Gupta Date: Tue, 28 Jan 2025 23:32:42 +0530 Subject: [PATCH 6/9] review comment fix using meaning names for model color --- src/style/app.module.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/style/app.module.css b/src/style/app.module.css index 143f8a13bc..1a604d7409 100644 --- a/src/style/app.module.css +++ b/src/style/app.module.css @@ -216,6 +216,7 @@ --input-area-color: #f1f3f6; --date-picker-background: #f2f2f2; --grey-bg-color-dark: #707070; + --gret-bg-color: #4b5563; --dropdown-border-color: #cccccc; --primary-border-solid: 1px solid var(--dropdown-border-color); --disabled-btn: #e7f0fe; @@ -9142,7 +9143,7 @@ button[data-testid='createPostBtn'] { } .titlemodalAgendaCategory { - color: var(--bs-gray-600); + color: var(--grey-bg-color); font-weight: 600; font-size: 20px; margin-bottom: 20px; From b61598f446cbc4e6440a5867e7b91b99b12373ce Mon Sep 17 00:00:00 2001 From: Anushka Gupta Date: Wed, 29 Jan 2025 00:07:16 +0530 Subject: [PATCH 7/9] Prettier FIx --- 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 0861af482e..8e81e936fe 100644 --- a/src/style/app.module.css +++ b/src/style/app.module.css @@ -9160,7 +9160,7 @@ button[data-testid='createPostBtn'] { } .titlemodalAgendaCategory { - color: var( --grey-bg-color-agenda-category); + color: var(--grey-bg-color-agenda-category); font-weight: 600; font-size: 20px; margin-bottom: 20px; From 96f4229ae3ef3b41f6efe46d477c929a71011b24 Mon Sep 17 00:00:00 2001 From: Anushka Gupta Date: Wed, 29 Jan 2025 20:31:26 +0530 Subject: [PATCH 8/9] review comment fix --- 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 8e81e936fe..7be1f978c2 100644 --- a/src/style/app.module.css +++ b/src/style/app.module.css @@ -9181,6 +9181,6 @@ button[data-testid='createPostBtn'] { } .agenda-category-options-button:focus-visible { - outline: 2px solid var(--light-blue); + outline: 2px solid var(--outlineBtn-color); outline-offset: 2px; } From 4d7530f6d75378c3a5c83757ba7a83751f6dceeb Mon Sep 17 00:00:00 2001 From: Anushka Gupta Date: Wed, 29 Jan 2025 21:44:50 +0530 Subject: [PATCH 9/9] CodeRabbit fix --- 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 7be1f978c2..c739c28fb7 100644 --- a/src/style/app.module.css +++ b/src/style/app.module.css @@ -9160,7 +9160,7 @@ button[data-testid='createPostBtn'] { } .titlemodalAgendaCategory { - color: var(--grey-bg-color-agenda-category); + color: var(--agenda-category-title-color); font-weight: 600; font-size: 20px; margin-bottom: 20px;