From 82836f05f2f83b12e3b2b89b11e40b74de25ee4a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 14 Nov 2024 10:53:41 -0800 Subject: [PATCH 01/28] chore(deps): bump sass from 1.80.6 to 1.80.7 (#2433) Bumps [sass](https://github.com/sass/dart-sass) from 1.80.6 to 1.80.7. - [Release notes](https://github.com/sass/dart-sass/releases) - [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md) - [Commits](https://github.com/sass/dart-sass/compare/1.80.6...1.80.7) --- updated-dependencies: - dependency-name: sass dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 16 ++++++++-------- package.json | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0add51da52..165eb104cc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -112,7 +112,7 @@ "jest-preview": "^0.3.1", "lint-staged": "^15.2.8", "postcss-modules": "^6.0.0", - "sass": "^1.80.6", + "sass": "^1.80.7", "tsx": "^4.19.1", "vite-plugin-svgr": "^4.2.0", "whatwg-fetch": "^3.6.20" @@ -10617,9 +10617,9 @@ } }, "node_modules/immutable": { - "version": "4.3.5", - "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.5.tgz", - "integrity": "sha512-8eabxkth9gZatlwl5TBuJnCsoTADlL6ftEr7A4qgdaTsPyreilDSnUk57SO+jfKcNtxPa22U5KK6DSeAYhpBJw==", + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/immutable/-/immutable-5.0.2.tgz", + "integrity": "sha512-1NU7hWZDkV7hJ4PJ9dur9gTNQ4ePNPN4k9/0YhwjzykTi/+3Q5pF93YU5QoVj8BuOnhLgaY8gs0U2pj4kSYVcw==", "devOptional": true }, "node_modules/import-fresh": { @@ -16284,13 +16284,13 @@ } }, "node_modules/sass": { - "version": "1.80.6", - "resolved": "https://registry.npmjs.org/sass/-/sass-1.80.6.tgz", - "integrity": "sha512-ccZgdHNiBF1NHBsWvacvT5rju3y1d/Eu+8Ex6c21nHp2lZGLBEtuwc415QfiI1PJa1TpCo3iXwwSRjRpn2Ckjg==", + "version": "1.80.7", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.80.7.tgz", + "integrity": "sha512-MVWvN0u5meytrSjsU7AWsbhoXi1sc58zADXFllfZzbsBT1GHjjar6JwBINYPRrkx/zqnQ6uqbQuHgE95O+C+eQ==", "devOptional": true, "dependencies": { "chokidar": "^4.0.0", - "immutable": "^4.0.0", + "immutable": "^5.0.2", "source-map-js": ">=0.6.2 <2.0.0" }, "bin": { diff --git a/package.json b/package.json index 892a1331e4..f31394fce1 100644 --- a/package.json +++ b/package.json @@ -146,7 +146,7 @@ "jest-preview": "^0.3.1", "lint-staged": "^15.2.8", "postcss-modules": "^6.0.0", - "sass": "^1.80.6", + "sass": "^1.80.7", "tsx": "^4.19.1", "vite-plugin-svgr": "^4.2.0", "whatwg-fetch": "^3.6.20" From a97314cbf994d3b02c24a458cd256db1a4148b27 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 14 Nov 2024 10:54:06 -0800 Subject: [PATCH 02/28] chore(deps): bump eslint-plugin-import from 2.30.0 to 2.31.0 (#2434) Bumps [eslint-plugin-import](https://github.com/import-js/eslint-plugin-import) from 2.30.0 to 2.31.0. - [Release notes](https://github.com/import-js/eslint-plugin-import/releases) - [Changelog](https://github.com/import-js/eslint-plugin-import/blob/main/CHANGELOG.md) - [Commits](https://github.com/import-js/eslint-plugin-import/compare/v2.30.0...v2.31.0) --- updated-dependencies: - dependency-name: eslint-plugin-import dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 13 +++++++------ package.json | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index 165eb104cc..872a2773ca 100644 --- a/package-lock.json +++ b/package-lock.json @@ -99,7 +99,7 @@ "babel-jest": "^29.7.0", "cross-env": "^7.0.3", "eslint-config-prettier": "^9.1.0", - "eslint-plugin-import": "^2.30.0", + "eslint-plugin-import": "^2.31.0", "eslint-plugin-jest": "^28.8.0", "eslint-plugin-prettier": "^5.2.1", "eslint-plugin-react": "^7.37.1", @@ -8910,9 +8910,9 @@ } }, "node_modules/eslint-plugin-import": { - "version": "2.30.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.30.0.tgz", - "integrity": "sha512-/mHNE9jINJfiD2EKkg1BKyPyUk4zdnT54YgbOgfjSakWT5oyX/qQLVNTkehyfpcMxZXMy1zyonZ2v7hZTX43Yw==", + "version": "2.31.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.31.0.tgz", + "integrity": "sha512-ixmkI62Rbc2/w8Vfxyh1jQRTdRTF52VxwRVHl/ykPAmqG+Nb7/kNn+byLP0LxPgI7zWA16Jt82SybJInmMia3A==", "dev": true, "dependencies": { "@rtsao/scc": "^1.1.0", @@ -8923,7 +8923,7 @@ "debug": "^3.2.7", "doctrine": "^2.1.0", "eslint-import-resolver-node": "^0.3.9", - "eslint-module-utils": "^2.9.0", + "eslint-module-utils": "^2.12.0", "hasown": "^2.0.2", "is-core-module": "^2.15.1", "is-glob": "^4.0.3", @@ -8932,13 +8932,14 @@ "object.groupby": "^1.0.3", "object.values": "^1.2.0", "semver": "^6.3.1", + "string.prototype.trimend": "^1.0.8", "tsconfig-paths": "^3.15.0" }, "engines": { "node": ">=4" }, "peerDependencies": { - "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8" + "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8 || ^9" } }, "node_modules/eslint-plugin-import/node_modules/debug": { diff --git a/package.json b/package.json index f31394fce1..89f47e405d 100644 --- a/package.json +++ b/package.json @@ -133,7 +133,7 @@ "babel-jest": "^29.7.0", "cross-env": "^7.0.3", "eslint-config-prettier": "^9.1.0", - "eslint-plugin-import": "^2.30.0", + "eslint-plugin-import": "^2.31.0", "eslint-plugin-jest": "^28.8.0", "eslint-plugin-prettier": "^5.2.1", "eslint-plugin-react": "^7.37.1", From 32eb6a9d37f08c9afa2670ddcd12c162a2d04c51 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 14 Nov 2024 10:54:35 -0800 Subject: [PATCH 03/28] chore(deps): bump @mui/x-charts from 7.22.1 to 7.22.2 (#2435) Bumps [@mui/x-charts](https://github.com/mui/mui-x/tree/HEAD/packages/x-charts) from 7.22.1 to 7.22.2. - [Release notes](https://github.com/mui/mui-x/releases) - [Changelog](https://github.com/mui/mui-x/blob/v7.22.2/CHANGELOG.md) - [Commits](https://github.com/mui/mui-x/commits/v7.22.2/packages/x-charts) --- updated-dependencies: - dependency-name: "@mui/x-charts" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 872a2773ca..a06030b145 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20,7 +20,7 @@ "@mui/material": "^6.1.6", "@mui/private-theming": "^6.1.6", "@mui/system": "^6.1.6", - "@mui/x-charts": "^7.22.1", + "@mui/x-charts": "^7.22.2", "@mui/x-data-grid": "^7.22.1", "@mui/x-date-pickers": "^7.22.1", "@pdfme/generator": "^5.1.7", @@ -3938,9 +3938,9 @@ } }, "node_modules/@mui/x-charts": { - "version": "7.22.1", - "resolved": "https://registry.npmjs.org/@mui/x-charts/-/x-charts-7.22.1.tgz", - "integrity": "sha512-zgr8CN4yLen5puqaX7Haj5+AoVG7E13HHsIiDoEAuQvuFDF0gKTxTTdLSKXqhd1qJUIIzJaztZtrr3YCVrENqw==", + "version": "7.22.2", + "resolved": "https://registry.npmjs.org/@mui/x-charts/-/x-charts-7.22.2.tgz", + "integrity": "sha512-0Y2du4Ed7gOT53l8vVJ4vKT+Jz4Dh/iHnLy8TtL3+XhbPH9Ndu9Q30WwyyzOn84yt37hSUru/njQ1BWaSvVPHw==", "dependencies": { "@babel/runtime": "^7.25.7", "@mui/utils": "^5.16.6 || ^6.0.0", diff --git a/package.json b/package.json index 89f47e405d..e1eba54ff0 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "@mui/material": "^6.1.6", "@mui/private-theming": "^6.1.6", "@mui/system": "^6.1.6", - "@mui/x-charts": "^7.22.1", + "@mui/x-charts": "^7.22.2", "@mui/x-data-grid": "^7.22.1", "@mui/x-date-pickers": "^7.22.1", "@pdfme/schemas": "^5.1.6", From ab509f625c2b086870e0d10971002391deefdec4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 14 Nov 2024 10:54:56 -0800 Subject: [PATCH 04/28] chore(deps): bump @types/react from 18.3.3 to 18.3.12 (#2436) Bumps [@types/react](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/react) from 18.3.3 to 18.3.12. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/react) --- updated-dependencies: - dependency-name: "@types/react" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index a06030b145..f54418a39c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -85,7 +85,7 @@ "@types/js-cookie": "^3.0.6", "@types/node": "^22.5.4", "@types/node-fetch": "^2.6.10", - "@types/react": "^18.3.3", + "@types/react": "^18.3.12", "@types/react-beautiful-dnd": "^13.1.8", "@types/react-bootstrap": "^0.32.37", "@types/react-chartjs-2": "^2.5.7", @@ -5602,9 +5602,9 @@ "integrity": "sha512-hCZTSvwbzWGvhqxp/RqVqwU999pBf2vp7hzIjiYOsl8wqOmUxkQ6ddw1cV3l8811+kdUFus/q4d1Y3E3SyEifA==" }, "node_modules/@types/react": { - "version": "18.3.3", - "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.3.tgz", - "integrity": "sha512-hti/R0pS0q1/xx+TsI73XIqk26eBsISZ2R0wUijXIngRK9R/e7Xw/cXVxQK7R5JjW+SV4zGcn5hXjudkN/pLIw==", + "version": "18.3.12", + "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.12.tgz", + "integrity": "sha512-D2wOSq/d6Agt28q7rSI3jhU7G6aiuzljDGZ2hTZHIkrTLUI+AF3WMeKkEZ9nN2fkBAlcktT6vcZjDFiIhMYEQw==", "dependencies": { "@types/prop-types": "*", "csstype": "^3.0.2" diff --git a/package.json b/package.json index e1eba54ff0..4560ea5d0e 100644 --- a/package.json +++ b/package.json @@ -119,7 +119,7 @@ "@types/js-cookie": "^3.0.6", "@types/node": "^22.5.4", "@types/node-fetch": "^2.6.10", - "@types/react": "^18.3.3", + "@types/react": "^18.3.12", "@types/react-beautiful-dnd": "^13.1.8", "@types/react-chartjs-2": "^2.5.7", "@types/react-bootstrap": "^0.32.37", From fb913e1882410386564f4c6f2540fe66e2471ae5 Mon Sep 17 00:00:00 2001 From: Peter Harrison <16875803+palisadoes@users.noreply.github.com> Date: Thu, 14 Nov 2024 11:32:40 -0800 Subject: [PATCH 05/28] Update pull-request.yml --- .github/workflows/pull-request.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index aaeebc8345..0cb1b76ee4 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -259,7 +259,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Check if the target branch is develop - if: github.event.pull_request.base.ref != 'develop' + if: github.event.pull_request.base.ref != 'develop-postgres' run: | - echo "Error: Pull request target branch must be 'develop'. Please refer PR_GUIDELINES.md" + echo "Error: Pull request target branch must be 'develop-postgres'. Please refer PR_GUIDELINES.md" exit 1 From 8d43aaed329f12ce7273f824c8f4cddb8f72d59f Mon Sep 17 00:00:00 2001 From: Ankit varshney Date: Sun, 24 Nov 2024 16:47:19 +0530 Subject: [PATCH 06/28] css for color blinds --- .../AdvertisementRegister.tsx | 6 +- .../EventCalendar/EventCalendar.module.css | 105 +++++++++- src/components/EventCalendar/EventHeader.tsx | 4 +- src/components/LeftDrawer/LeftDrawer.tsx | 11 +- .../LoginPortalToggle.module.css | 14 +- .../OrgListCard/OrgListCard.module.css | 8 + src/components/Venues/VenueModal.tsx | 7 +- src/screens/BlockUser/BlockUser.tsx | 36 +++- src/screens/LoginPage/LoginPage.module.css | 52 +++++ src/screens/LoginPage/LoginPage.tsx | 11 +- src/screens/OrgList/OrgList.module.css | 9 +- src/screens/OrgList/OrgList.tsx | 11 +- src/screens/OrgPost/OrgPost.tsx | 33 +-- .../OrganizationActionItems.tsx | 12 +- .../OrganizationEvents.module.css | 69 ++++++- .../OrganizationEvents/OrganizationEvents.tsx | 3 +- src/screens/OrganizationFunds/FundModal.tsx | 6 +- .../OrganizationFunds/OrganizationFunds.tsx | 40 ++-- .../OrganizationTags/OrganizationTags.tsx | 2 +- .../OrganizationVenues/OrganizationVenues.tsx | 18 +- src/screens/Requests/Requests.module.css | 120 ----------- src/screens/Requests/Requests.tsx | 12 +- src/style/app.module.css | 193 +++++++++++++++--- 23 files changed, 519 insertions(+), 263 deletions(-) delete mode 100644 src/screens/Requests/Requests.module.css diff --git a/src/components/Advertisements/core/AdvertisementRegister/AdvertisementRegister.tsx b/src/components/Advertisements/core/AdvertisementRegister/AdvertisementRegister.tsx index 1d5c51ce84..c347ae8959 100644 --- a/src/components/Advertisements/core/AdvertisementRegister/AdvertisementRegister.tsx +++ b/src/components/Advertisements/core/AdvertisementRegister/AdvertisementRegister.tsx @@ -1,6 +1,6 @@ import React, { useState, useEffect } from 'react'; import PropTypes from 'prop-types'; -import styles from './AdvertisementRegister.module.css'; +import styles from '../../../../style/app.module.css'; import { Button, Form, Modal } from 'react-bootstrap'; import { ADD_ADVERTISEMENT_MUTATION, @@ -263,7 +263,7 @@ function advertisementRegister({ )} - + {formStatus === 'register' ? ( {t('addNew')} ) : ( @@ -405,6 +405,7 @@ function advertisementRegister({ diff --git a/src/components/EventCalendar/EventCalendar.module.css b/src/components/EventCalendar/EventCalendar.module.css index 67ecd2dec6..d4bd1c8411 100644 --- a/src/components/EventCalendar/EventCalendar.module.css +++ b/src/components/EventCalendar/EventCalendar.module.css @@ -1,21 +1,38 @@ +:root { + --dropdown-border-color: #555555; + --dropdown-text-color: #555555; + --dropdown-hover-color: #eff1f7; + --grey-bg-color: #eaebef; + --subtle-blue-grey: #7c9beb; + --subtle-blue-grey-hover: #5f7e91; + --input-shadow-color: #dddddd; + --delete-button-bg: #f8d6dc; + --delete-button-color: #ff4d4f; + --search-button-bg: #a8c7fa; + --search-button-border: #555555; +} + .calendar { font-family: sans-serif; font-size: 1.2rem; margin-bottom: 20px; - background: rgb(255, 255, 255); + background: var(--grey-bg-color); border-radius: 10px; padding: 5px; } + .calendar__header { display: flex; margin-bottom: 2rem; align-items: center; margin: 0px 10px 0px 10px; } + .input { flex: 1; position: relative; } + .calendar__header_month { margin: 0.5rem; color: #707070; @@ -25,17 +42,37 @@ gap: 23px; flex-direction: row; } + .calendar__header_month div { font-weight: 400; color: black; font-family: Outfit; } + +.searchbutton { + background-color: var(--search-button-bg); + border-color: var(--search-button-border); + position: absolute; + z-index: 10; + bottom: 0; + right: 0; + display: flex; + justify-content: center; + align-items: center; +} + +.searchbutton:hover { + background-color: var(--search-button-bg); + border-color: var(--search-button-border); +} + .space { flex: 1; display: flex; align-items: center; justify-content: space-around; } + .button { border-radius: 100px; color: #707070; @@ -52,10 +89,12 @@ font-family: Outfit; height: 60px; } + .calendar__scroll { height: 80vh; padding: 10px; } + .weekday { display: flex; justify-content: center; @@ -63,11 +102,13 @@ background-color: white; font-weight: 600; } + .calendar__days { display: grid; grid-template-columns: repeat(7, minmax(0, 1fr)); grid-template-rows: repeat(6, 1fr); } + .calendar_hour_text_container { display: flex; flex-direction: row; @@ -75,6 +116,7 @@ border-right: 1px solid #8d8d8d55; width: 40px; } + .calendar_hour_text { top: -10px; left: -5px; @@ -82,6 +124,7 @@ color: #707070; font-size: 12px; } + .calendar_timezone_text { top: -10px; left: -11px; @@ -89,6 +132,7 @@ color: #707070; font-size: 9px; } + .calendar_hour_block { display: flex; flex-direction: row; @@ -97,18 +141,22 @@ height: 50px; border-bottom-right-radius: 5px; } + .event_list_parent { position: relative; width: 100%; } + .event_list_parent_current { background-color: #def6e1; position: relative; width: 100%; } + .dummyWidth { width: 1px; } + .day { background-color: #ffffff; padding-left: 0.3rem; @@ -122,26 +170,32 @@ height: 9rem; position: relative; } + .day_weekends { background-color: rgba(49, 187, 107, 0.2); } + .day__outside { background-color: white; color: #89898996; } + .day__selected { background-color: #007bff; color: #707070; } + .day__today { background-color: #def6e1; font-weight: 700; text-decoration: underline; color: #31bb6b; } + .day__events { background-color: white; } + .btn__today { transition: ease-in all 200ms; font-family: Arial; @@ -152,6 +206,7 @@ margin-left: 20px; border: none; } + .btnsContainer { display: flex; margin: 2.5rem 0 2.5rem 0; @@ -169,10 +224,17 @@ } .dropdown { - border-color: #31bb6b; + border: 1px solid var(--dropdown-border-color); background-color: white; - color: #31bb6b; - box-shadow: 0px 2px 1px rgba(49, 187, 107, 0.5); /* Added blur effect */ + color: var(--dropdown-text-color); + box-shadow: 0px 2px 1px var(--grey-bg-color); + /* Added blur effect */ +} + +.dropdown:is(:hover, :focus, :active, :focus-visible, .show) { + background-color: transparent !important; + border: 1px solid var(--dropdown-border-color); + color: var(--dropdown-text-color) !important; } .btnsContainer .input { @@ -187,6 +249,7 @@ .btnsContainer .input button { width: 52px; } + .searchBtn { margin-bottom: 10px; } @@ -195,12 +258,14 @@ margin-top: 10px; margin-bottom: 10px; background-color: white; - box-shadow: 0 1px 1px #31bb6b; + box-shadow: 0 1px 1px var(--search-button-bg); } + .inputField > button { padding-top: 10px; padding-bottom: 10px; } + .btn__more { border: 0px; font-size: 14px; @@ -212,6 +277,7 @@ display: block; margin: 2px; } + .btn__more:hover { color: #454645; } @@ -219,16 +285,32 @@ .expand_event_list { display: block; } + .list_container { padding: 5px; width: fit-content; display: flex; flex-direction: row; } + .event_list_hour { display: flex; flex-direction: row; } + +.createButton { + background-color: var(--grey-bg-color) !important; + color: black !important; + + border: 1px solid var(--dropdown-border-color); +} + +.createButton:hover { + background-color: var(--grey-bg-color) !important; + color: black !important; + border: 1px solid var(--dropdown-border-color) !important; +} + .expand_list_container { width: 200px; max-height: 250px; @@ -243,6 +325,7 @@ border-radius: 5px; margin: 5px; } + .flex_grow { flex-grow: 1; } @@ -251,10 +334,12 @@ .event_list { display: none; } + .expand_list_container { width: 150px; padding: 4px 4px 0px 4px; } + .day { height: 5rem; } @@ -273,6 +358,7 @@ gap: 10px; margin-top: 35px; } + .card__holidays { background-color: rgba(246, 242, 229, 1); display: flex; @@ -285,24 +371,29 @@ overflow: hidden; white-space: nowrap; } + .month__holidays { display: flex; flex-direction: column; } + .holiday__data { display: flex; flex-direction: row; gap: 10px; } + .holiday__date { font-size: 20px; color: rgba(234, 183, 86, 1); font-weight: 700; } + .holiday__name { font-size: 20px; margin-left: 35px; } + .card__events { background-color: rgba(244, 244, 244, 1); display: flex; @@ -312,21 +403,25 @@ border-radius: 20px; padding: 30px; } + .innercard__events { display: flex; flex-direction: row; align-items: center; gap: 1rem; } + .innercard__events p { margin-bottom: 0; } + .orgEvent__color { height: 15px; width: 40px; background-color: rgba(82, 172, 255, 0.5); border-radius: 10px; } + .holidays__color { height: 15px; width: 40px; diff --git a/src/components/EventCalendar/EventHeader.tsx b/src/components/EventCalendar/EventHeader.tsx index 1e4653ebf4..08039796e2 100644 --- a/src/components/EventCalendar/EventHeader.tsx +++ b/src/components/EventCalendar/EventHeader.tsx @@ -55,7 +55,7 @@ function eventHeader({ onChange={(e) => setEventName(e.target.value)} /> -
+
{/* Dropdown for filtering members */} {/* Dropdown for sorting by name */}