Merge branch 'MDL-39680_master' of git://github.com/lazydaisy/moodle

Conflicts: theme/bootstrapbase/style/moodle.css
2025-01-19 06:18:28 +01:00 · 2013-05-27 16:24:34 +08:00 · 2013-05-27 16:24:34 +08:00 · 1833a3c449
commit 1833a3c449
parent d059d80ea6 38c96b9545
2 changed files with 7 additions and 2 deletions
--- a/theme/bootstrapbase/less/moodle/debug.less
+++ b/theme/bootstrapbase/less/moodle/debug.less
@ -25,7 +25,6 @@
    font-weight: bold;
 }
 #page-footer .performanceinfo {
-    text-align: center;
    margin: 10px 20%;
 }
 #page-footer .performanceinfo span {
@ -73,3 +72,9 @@
 .cache-store-stats.hihits {
    background-color: @successBackground;
 }
+#page-footer,
+#page-footer .validators,
+#page-footer .purgecaches,
+#page-footer .performanceinfo {
+    text-align: center;
+}
--- a/theme/bootstrapbase/style/moodle.css
+++ b/theme/bootstrapbase/style/moodle.css