Merge branch 'MDL-49237-master' of git://github.com/mastnym/moodle

iFixit · Mar 2, 2015 · caa7022 · caa7022
2 parents 63b0d7a + 7e7c15f
commit caa7022
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/theme/base/style/calendar.css b/theme/base/style/calendar.css
@@ -55,6 +55,7 @@
 .block .minicalendar {width:100%;margin:10px auto;}
 .block .minicalendar th,
 .block .minicalendar td {padding:2px;font-size:0.8em;}
+.block .minicalendar caption {font-size: inherit;font-weight: inherit;line-height: inherit;text-align: center;}
 .block .minicalendar td.weekend {color:#A00;}
 .block .calendar-controls .previous {text-align: left;display: block;float: left;width: 12%;}
 .block .calendar-controls .current {float:left;text-align: center;display: block;width:76%;}

diff --git a/theme/bootstrapbase/less/moodle/calendar.less b/theme/bootstrapbase/less/moodle/calendar.less
@@ -316,6 +316,12 @@
                 .muted;
             }
         }
+        caption {
+            font-size: inherit;
+            font-weight: inherit;
+            line-height: inherit;
+            text-align: center;
+        }
     }
     .calendar-event-panel {
         background-color: @grayLighter;

diff --git a/theme/bootstrapbase/style/moodle.css b/theme/bootstrapbase/style/moodle.css