Permalink
Browse files

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

…o MOODLE_25_STABLE

Conflicts:
	theme/bootstrapbase/style/moodle.css
  • Loading branch information...
2 parents 6a3a3bd + 039c787 commit f32e55c8d7d945ad14e4c0313ca76fe7c975e1a5 @damyon damyon committed May 27, 2013
Showing with 7 additions and 2 deletions.
  1. +6 −1 theme/bootstrapbase/less/moodle/debug.less
  2. +1 −1 theme/bootstrapbase/style/moodle.css
@@ -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;
}

Large diffs are not rendered by default.

Oops, something went wrong.

0 comments on commit f32e55c

Please sign in to comment.