Skip to content

Commit 8d45dd7

Browse files
authored
Upgrade fullcalendar to version 6.1.17 (#78)
Looks good
1 parent ba560a8 commit 8d45dd7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

119 files changed

+15100
-36384
lines changed

assets/static/css/calendar.css

Lines changed: 45 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -18,44 +18,38 @@ main {
1818
padding-bottom: 1em;
1919
}
2020

21-
#calendar {
22-
overflow: visible;
23-
}
24-
2521
/* Calendar header */
26-
#calendar .fc-center {
22+
#calendar .fc-toolbar-title {
2723
color: #FF9900;
2824
}
2925

26+
#calendar .fc-icon-info {
27+
background-image: url(/static/img/calendar-info.svg);
28+
}
29+
3030
/* Calendar table border */
31-
#calendar table td, #calendar table th {
31+
#calendar table, #calendar table td, #calendar table th {
3232
border-color: #46b6ee;
3333
}
3434

3535
/* Calender header row */
36-
#calendar .ui-widget-header th {
36+
#calendar table.fc-col-header th {
3737
color: #FF9900;
3838
font-weight: normal;
3939
padding: 0.15em 0;
4040
background-color: #22374C;
4141
}
4242

4343
/* Regular calendar cells */
44-
#calendar .ui-widget-content {
45-
background-color: rgba(34, 55, 76, 0.2);
46-
font-size: 0.95em;
47-
}
48-
49-
/* All-day/event with time divider in week and day views */
50-
#calendar hr.fc-divider {
51-
border-color: #46b6ee;
52-
background-color: #22374C;
44+
#calendar td.fc-day {
45+
background-color: rgba(34, 55, 76, 0.5);
46+
font-size: 0.9em;
5347
}
5448

5549
/* Day number in month view */
56-
#calendar .fc-day-number {
50+
#calendar .fc-daygrid-day-number {
5751
padding: 3px !important;
58-
min-width: 1.1em;
52+
min-width: 1.8em;
5953
font-weight: bold;
6054
font-size: 0.85em;
6155
border-left: 1px solid #46b6ee;
@@ -66,35 +60,60 @@ main {
6660
}
6761

6862
/* Time column in week and day views */
69-
#calendar .fc-axis {
70-
font-size: 0.8em;
63+
#calendar .fc-timegrid-axis, #calendar .fc-timegrid-slot {
64+
font-size: 0.75em;
7165
color: #fff;
7266
}
7367

7468
/* Calendar event */
75-
#calendar .fc-content {
69+
#calendar .fc-event {
7670
color: #fff;
7771
cursor: pointer;
78-
white-space: pre-line !important;
72+
white-space: pre-line;
7973
padding: 0.2em;
74+
overflow: hidden;
75+
}
76+
77+
/* Container for event time and title */
78+
#calendar .fc-event .fc-event-main-frame {
79+
display: block;
80+
}
81+
82+
/* Event time and title placement */
83+
#calendar .fc-event .fc-event-time, #calendar .fc-event .fc-event-title-container, #calendar .fc-event .fc-event-title {
84+
display: inline;
85+
}
86+
87+
/* Event time */
88+
#calendar .fc-event .fc-event-time {
89+
font-weight: bold;
90+
}
91+
/*
92+
#calendar .fc-event .fc-event-time::after {
93+
content: " ";
94+
}*/
95+
96+
/* Event title */
97+
#calendar .fc-event .fc-event-title {
98+
font-weight: normal;
8099
}
81100

82101
/* Today */
83-
#calendar .ui-widget-content.fc-today {
102+
#calendar td.fc-day-today {
84103
background-color: #46b6ee66;
85104
}
86105

87106
/* Calendar buttons, dialog buttons */
88-
#calendar .ui-button, .ui-dialog .ui-button {
107+
#calendar .fc-header-toolbar button {
89108
border: 1px solid #46b6ee;
90109
background-color: #22374C;
91110
color: #FF9900;
92111
}
93112

94113
/* Hover states for calendar buttons and dialog buttons */
95-
#calendar .ui-button:hover, .ui-dialog .ui-button:hover,
114+
#calendar .fc-header-toolbar button:hover,
96115
/* Active state for monat, week, day buttons */
97-
#calendar .ui-button.ui-state-active {
116+
#calendar .fc-header-toolbar button.fc-button-active {
98117
background-color: #0c1c2a;
99118
border: 1px solid #FF9900;
100119
color: #FF9900;

assets/static/css/home.css

Lines changed: 31 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -150,44 +150,58 @@ main {
150150
}
151151
}
152152

153-
#upcoming table {
154-
width: 100%;
153+
#upcoming a:hover {
154+
text-decoration: none;
155155
}
156156

157-
#upcoming .fc-list-heading .ui-widget-header {
158-
padding-top: 1em;
159-
font-weight: bold;
160-
border-bottom: 1px solid var(--default-text-color);
157+
#upcoming .fc-upcoming-view, #upcoming th, #upcoming td {
158+
border: none;
159+
background: none;
161160
}
162161

163-
#upcoming td {
162+
#upcoming table {
163+
border-collapse: separate;
164+
}
165+
166+
#upcoming th, #upcoming td {
164167
vertical-align: top;
165-
padding-top: 0.3em;
166-
padding-bottom: 0.3em;
168+
padding: 0.3em 0;
167169
}
168170

169-
#upcoming td.fc-list-item-time {
170-
padding-right: 0.6em;
171+
#upcoming .fc-list-day th {
172+
padding-top: 1em;
173+
border-bottom: 1px solid var(--default-text-color);
171174
}
172175

173-
#upcoming .fc-list-heading-main {
176+
#upcoming .fc-list-day-cushion {
177+
font-weight: bold;
174178
color: var(--highlight-color);
179+
padding: 0;
180+
background: none;
181+
}
182+
183+
#upcoming td.fc-list-event-time {
184+
padding-right: 1em;
175185
}
176186

177-
#upcoming .fc-list-heading-alt {
178-
color: var(--highlight-color);
179-
float: right;
187+
#upcoming td.fc-list-event-graphic {
188+
display: none;
180189
}
181190

182-
#upcoming td.fc-list-item-title {
191+
#upcoming td.fc-list-event-title {
183192
width: 90%;
184193
}
185194

186-
#upcoming .fc-list-item-title a {
195+
#upcoming .fc-list-event-title a {
187196
color: var(--highlight-color);
188197
cursor: pointer;
189198
}
190199

200+
#upcoming .fc-list-event-title a:hover {
201+
text-decoration: underline;
202+
}
203+
191204
#upcoming .fc-list-empty {
192205
margin-top: 1em;
206+
background: none;
193207
}

assets/static/img/calendar-info.svg

Lines changed: 1 addition & 0 deletions
Loading

0 commit comments

Comments
 (0)