Merge branch 'MDL-39680-M25' of git://github.com/lazydaisy/moodle into MOODLE_25_STABLE

Conflicts:
	theme/bootstrapbase/style/moodle.css
This commit is contained in:
Damyon Wiese
2013-05-27 16:21:44 +08:00
2 changed files with 7 additions and 2 deletions
+6 -1
View File
@@ -25,7 +25,6 @@
font-weight: bold;
}
#page-footer .performanceinfo {
text-align: center;
margin: 10px 20%;
}
#page-footer .performanceinfo span {
@@ -72,4 +71,10 @@
}
.cache-store-stats.hihits {
background-color: @successBackground;
}
#page-footer,
#page-footer .validators,
#page-footer .purgecaches,
#page-footer .performanceinfo {
text-align: center;
}
File diff suppressed because one or more lines are too long