Merge branch 'MDL-60576-master' of git://github.com/andrewnicols/moodle
authorDamyon Wiese <damyon@moodle.com>
Thu, 2 Nov 2017 03:38:57 +0000 (11:38 +0800)
committerDamyon Wiese <damyon@moodle.com>
Thu, 2 Nov 2017 03:38:57 +0000 (11:38 +0800)
calendar/templates/month_detailed.mustache
theme/boost/scss/moodle/calendar.scss
theme/bootstrapbase/less/moodle/calendar.less
theme/bootstrapbase/style/moodle.css

index 262cc78..e75e6e8 100644 (file)
                                                         &nbsp;
                                                     </span>
                                                     {{> core_calendar/event_icon}}
-                                                    {{name}}
+                                                    <span class="eventname">{{name}}</span>
                                                 </a>
                                             </li>
                                         {{/underway}}
index 29ffb50..3e3cb04 100644 (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;
+                    }
+                }
+            }
         }
     }
 
index 182add6..387623d 100644 (file)
@@ -85,8 +85,7 @@
         .calendarmonth {
             width: 98%;
             margin: 10px auto;
-        }
-        .calendarmonth {
+
             ul {
                 margin: 0;
                 padding: 0;
                         .text-truncate;
                         max-width: 100%;
                         display: inline-block;
+
+                        &:hover {
+                            text-decoration: none;
+
+                            .eventname {
+                                text-decoration: underline;
+                            }
+                        }
                     }
 
                     .icon {
                 padding: 0;
                 margin-left: 0.25em;
             }
+
+            > a {
+                &:hover {
+                    text-decoration: none;
+
+                    .eventname {
+                        text-decoration: underline;
+                    }
+                }
+            }
         }
     }
     .content {
index c852d88..f8ce4f4 100644 (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;
 }