Fix calendar display with Redmine 5.1 (#270)

This commit is contained in:
Cyprien Devillez
2023-11-20 13:52:34 +01:00
committed by GitHub
parent bc5965aee3
commit 89ace106b2
3 changed files with 126 additions and 2 deletions

View File

@@ -2,7 +2,6 @@
// Calendar // Calendar
// -------------------------------------------------- // --------------------------------------------------
table.cal { table.cal {
width: 100%; width: 100%;
margin-bottom: $line-height-computed; margin-bottom: $line-height-computed;
@@ -59,9 +58,91 @@ table.cal {
} }
} }
ul.cal {
display: grid;
grid-template-columns: 2rem repeat(7, 1fr);
width: 100%;
margin: 0;
padding: 0;
border-spacing: 0;
list-style: none;
border: 1px solid $table-border-color;
border-radius: 3px;
li {
&.calhead {
padding: 4px;
background-color: $table-bg-active;
font-weight: bold;
text-align: center;
}
&.week-number {
padding: 4px;
border: none;
background-color: $table-bg-active;
font-size: 1em;
text-align: center;
span.label-week {
display: none;
}
}
&.calbody {
min-height: calc(1.2em * 6);
padding: 2px;
border: 1px solid $table-border-color;
border-right: 0;
border-bottom: 0;
font-size: 1em;
line-height: 1.6;
vertical-align: top;
p.day-num {
font-size: 1.1em;
text-align: right;
.abbr-day {
display: none;
}
}
.day-letter {
display: none;
}
&.odd {
p.day-num {
color: $gray-600;
}
}
&.today {
background: $highlight-bg;
p.day-num {
font-weight: $font-weight-bold;
}
}
.icon {
padding-top: 2px;
padding-bottom: 3px;
}
&.nwday:not(.odd) {
background-color: $table-bg-accent;
}
}
}
}
table.cal .starting a, table.cal .starting a,
ul.cal .starting a,
p.cal.legend .starting, p.cal.legend .starting,
table.cal .ending a, table.cal .ending a,
ul.cal .ending a,
p.cal.legend .ending { p.cal.legend .ending {
@extend %fa-icon; @extend %fa-icon;
@@ -73,6 +154,7 @@ p.cal.legend .ending {
} }
table.cal .ending a, table.cal .ending a,
ul.cal .ending a,
p.cal.legend .ending { p.cal.legend .ending {
&::before { &::before {
content: $fa-var-caret-left; content: $fa-var-caret-left;
@@ -81,6 +163,7 @@ p.cal.legend .ending {
} }
table.cal .starting.ending a, table.cal .starting.ending a,
ul.cal .starting.ending a,
p.cal.legend .starting.ending { p.cal.legend .starting.ending {
&::before { &::before {
content: $fa-var-square; content: $fa-var-square;

View File

@@ -433,6 +433,47 @@ body {
background-position: 8px center !important; // stylelint-disable-line declaration-no-important background-position: 8px center !important; // stylelint-disable-line declaration-no-important
} }
} }
/* Calendar */
ul.cal {
display: block;
.calhead {
display: none;
}
.calbody {
min-height: calc(1.2em * 3);
}
.calbody .day-letter {
display: inline;
}
.week-number {
border: none;
background-color: $table-bg-active;
font-weight: bold;
text-align: left;
span.label-week {
display: inline;
}
}
.week-number .label-week {
display: inline;
}
.calbody p.day-num {
font-size: 1.1em;
text-align: left;
.abbr-day {
display: inline;
}
}
}
} }
// Tweaks for smartphones, touchscreens // Tweaks for smartphones, touchscreens

File diff suppressed because one or more lines are too long