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

9-Calendar-Styling-Is-A-Bit-Wrong #21

Merged
merged 1 commit into from
Oct 31, 2023
Merged

9-Calendar-Styling-Is-A-Bit-Wrong #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 5 additions & 3 deletions eliis-front-end/src/components/pages/Events/Calendar/Calendar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import timeGridPlugin from '@fullcalendar/timegrid';
import interactionPlugin from '@fullcalendar/interaction';
import { INITIAL_EVENTS, createEventId } from './event-utils';
import axios from 'axios';
import './CalendarS.css';
import './index.css';

const SERVER_URL = 'http://localhost:3001';
Expand Down Expand Up @@ -38,22 +39,23 @@ export default class DemoApp extends React.Component {

render() {
return (
<div className='demo-app'>
<div id="custom-calendar" className='demo-app'>
<div className='demo-app-main'>
<FullCalendar
ref={(ref) => (this.calendarRef = ref)}
plugins={[dayGridPlugin, timeGridPlugin, interactionPlugin]}
headerToolbar={{
left: 'createEventButton prev,next today',
left: 'createEventButton',
center: 'title',
right: 'dayGridMonth,timeGridWeek,timeGridDay'
right: 'prev next'
}}
initialView='dayGridMonth'
editable={true}
selectable={true}
selectMirror={true}
dayMaxEvents={true}
updateSize={true}
//Color events based on type: TODO eventColor='red'
height={'auto'}
weekends={this.state.weekendsVisible}
initialEvents={INITIAL_EVENTS}
Expand Down
26 changes: 23 additions & 3 deletions eliis-front-end/src/components/pages/Events/Calendar/CalendarS.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,25 @@
/* CalendarS.css */
.calendar-container {
width: 100%; /* Set the width to 100% */
height: 60vh; /* Set the height to 60% of the viewport height */
}
width: 100%; /* Set the width to 100% */
height: 60vh; /* Set the height to 60% of the viewport height */
}
.fc-button-primary {
color: #FFF;
background: linear-gradient(#f79e80,#e58565);
border-color: #FFFFFF !important;
}

.fc-col-header-cell-cushion {
color: black;
text-decoration: none;
}

#custom-calendar .fc-day-sat,
#custom-calendar .fc-day-sun {
color: #eb5e5d;
}

.fc-daygrid-day-number {
color: black;
text-decoration: none;
}
Loading