Merge branch 'MDL-41342_master' of git://github.com/dmonllao/moodle

Conflicts:
	theme/bootstrapbase/style/moodle.css
This commit is contained in:
Eloy Lafuente (stronk7)
2013-09-25 02:11:51 +02:00
6 changed files with 36 additions and 5 deletions
@@ -208,6 +208,7 @@ img.iconsmall {
#page-admin-index .releasenoteslink,
#page-admin-index .adminwarning,
#page-admin-index .maturitywarning,
#page-admin-index .testsitewarning,
#page-admin-index .maturityinfo {
.alert;
width: 60%;
@@ -215,6 +216,7 @@ img.iconsmall {
margin: auto;
}
#page-admin-index .maturitywarning,
#page-admin-index .testsitewarning,
#page-admin-index .adminwarning.maturityinfo.maturity50 {
.alert-error;
}
File diff suppressed because one or more lines are too long