L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-60576-master' of git://github.com/andrewnicols/moodle

Browse Source
This commit is contained in:
Damyon Wiese
2017-11-02 11:38:57 +08:00
parent fca7e60c81 a1b696f943
commit 671440d708
4 changed files with 50 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
calendar/templates/month_detailed.mustache
+1 -1
View File
@@ -109,7 +109,7 @@
 
</span>
{{> core_calendar/event_icon}}
{{name}}
<span class="eventname">{{name}}</span>
</a>
</li>
{{/underway}}
theme/boost/scss/moodle/calendar.scss
+18 -2
View File
@@ -96,9 +96,7 @@ $calendarEventUserColor: #dce7ec !default; // Pale blue.
.calendarmonth {
width: 98%;
margin: 10px auto;
}
.calendarmonth {
ul {
margin: 0;
padding: 0;
@@ -110,6 +108,14 @@ $calendarEventUserColor: #dce7ec !default; // Pale blue.
@include text-truncate;
max-width: 100%;
display: inline-block;
&:hover {
text-decoration: $link-decoration;
.eventname {
text-decoration: $link-hover-decoration;
}
}
}
.icon {
@@ -367,6 +373,16 @@ $calendarEventUserColor: #dce7ec !default; // Pale blue.
.icon {
vertical-align: initial;
}
> a {
&:hover {
text-decoration: $link-decoration;
.eventname {
text-decoration: $link-hover-decoration;
}
}
}
}
}
theme/bootstrapbase/less/moodle/calendar.less
+19 -2
View File
@@ -85,8 +85,7 @@
.calendarmonth {
width: 98%;
margin: 10px auto;
}
.calendarmonth {
ul {
margin: 0;
padding: 0;
@@ -97,6 +96,14 @@
.text-truncate;
max-width: 100%;
display: inline-block;
&:hover {
text-decoration: none;
.eventname {
text-decoration: underline;
}
}
}
.icon {
@@ -370,6 +377,16 @@
padding: 0;
margin-left: 0.25em;
}
> a {
&:hover {
text-decoration: none;
.eventname {
text-decoration: underline;
}
}
}
}
}
.content {
theme/bootstrapbase/style/moodle.css
+12
View File
@@ -5652,6 +5652,12 @@ img.iconsmall {
max-width: 100%;
display: inline-block;
}
.path-calendar .maincalendar .calendarmonth ul li > a:hover {
text-decoration: none;
}
.path-calendar .maincalendar .calendarmonth ul li > a:hover .eventname {
text-decoration: underline;
}
.path-calendar .maincalendar .calendarmonth ul li .icon {
margin-left: 0.25em;
margin-right: 0.25em;
@@ -5882,6 +5888,12 @@ img.iconsmall {
padding: 0;
margin-left: 0.25em;
}
.block .calendar_filters li > a:hover {
text-decoration: none;
}
.block .calendar_filters li > a:hover .eventname {
text-decoration: underline;
}
.block .content h3.eventskey {
margin-top: 0.5em;
}