Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixed:#1887 Event and Holiday Calendar View #2534

Closed
wants to merge 8 commits into from
Closed

fixed:#1887 Event and Holiday Calendar View #2534

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a0705d5
fixed Event and Holiday Calendar View
gurramkarthiknetha Dec 1, 2024
98d32de
fixed the inline css
gurramkarthiknetha Dec 1, 2024
d141177
changed some changes acc to bot
gurramkarthiknetha Dec 1, 2024
ba21ae5
changed acc to the bot 2
gurramkarthiknetha Dec 1, 2024
b717e05
removed unnessary changes
gurramkarthiknetha Dec 2, 2024
71ba035
changed inline css to css file
gurramkarthiknetha Dec 3, 2024
0f42c29
Merge remote-tracking branch 'upstream/develop-postgres' into issues/…
gurramkarthiknetha Dec 4, 2024
ee7dbfc
revert unwanted changed
gurramkarthiknetha Dec 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
167 changes: 164 additions & 3 deletions src/components/EventCalendar/EventCalendar.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,8 @@
padding: 5px;
width: fit-content;
display: flex;
flex-direction: row;
align-items: center;
gap: var(--indicator-spacing);
}

.event_list_hour {
Expand Down Expand Up @@ -316,7 +317,7 @@
flex-grow: 1;
}

@media only screen and (max-width: 700px) {
@media only screen and (max-width: var(--mobile-breakpoint)) {
.event_list {
display: none;
}
Expand All @@ -331,7 +332,7 @@
}
}

@media only screen and (max-width: 500px) {
@media only screen and (max-width: var(--small-mobile-breakpoint)) {
.btn__more {
font-size: 12px;
}
Expand All @@ -344,7 +345,21 @@
gap: 10px;
margin-top: 35px;
}
.holidays_card {
flex: 1;
padding: 20px;
background-color: var(--holiday-card-bg);
border-radius: 10px;
box-shadow: var(--card-shadow);
}

.events_card {
flex: 1;
padding: 20px;
background-color: #ffffff;
border-radius: 10px;
box-shadow: var(--card-shadow);
}
.card__holidays {
background-color: rgba(246, 242, 229, 1);
display: flex;
Expand Down Expand Up @@ -421,3 +436,149 @@
background: rgba(146, 200, 141, 0.5);
border-radius: 10px;
}

.baseIndicator {
border-radius: 5px;
width: 20px;
height: 12px;
display: inline-block;
}

.holidayText {
font-size: 14px;
color: #555555;
}
.eventsLegend {
display: flex;
align-items: center;
gap: 8px;
}

.listContainer {
width: fit-content;
display: flex;
align-items: center;
gap: 8px;
}

.holidayIndicator {
background-color: rgba(0, 0, 0, 0.15);
border-radius: 5px;
width: 20px;
height: 12px;
display: inline-block;
}

.holidayText {
font-size: 14px;
color: #555555;
}
.eventsLegend {
display: flex;
align-items: center;
gap: 8px;
}
:root {
--holiday-indicator-color: rgba(0, 0, 0, 0.15);

--holiday-date-color: rgba(255, 152, 0, 1);

--text-color-primary: rgba(51, 51, 51, 1);

--text-color-secondary: rgba(85, 85, 85, 1);
}
.organizationIndicator {
background-color: rgba(82, 172, 255, 0.5);
border-radius: 5px;
width: 20px;
height: 12px;
display: inline-block;
}

.legendText {
font-size: 14px;
color: #555555;
}
@media only screen and (max-width: 700px) {
.listContainer,
.eventsLegend {
gap: 4px;
}

.holidayIndicator,
.organizationIndicator {
width: 16px;
height: 10px;
}

.holidayText,
.legendText {
font-size: 12px;
}
}
.card_title {
font-size: 16px;
font-weight: 600;
color: var(--text-color-primary);
margin-bottom: 15px;
}

.card_list {
list-style: none;
padding: 0;
margin: 0;
}

.card_list_item {
display: flex;
justify-content: space-between;
align-items: center;
margin-bottom: 10px;
font-size: 14px;
color: var(--text-color-secondary);
}

.holiday_date {
font-weight: 500;
color: var(--holiday-date-color);
}

.calendar_infocards {
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: flex-start;
gap: 20px;
padding: 20px;
background-color: var(--grey-bg-color);
}

.holidays_card,
.events_card {
flex: 1;
padding: 20px;
border-radius: 10px;
box-shadow: var(--card-shadow);
}

.holidays_card {
background-color: var(--holiday-card-bg);
}

.events_card {
background-color: white;
}

.legend {
display: flex;
flex-direction: column;
gap: 12px;
}

.userEvents__color {
background-color: rgba(139, 195, 74, 1);
border-radius: 5px;
width: 20px;
height: 12px;
display: inline-block;
}
Loading
Loading