Merge branch 'MDL-45380-26' of git://github.com/FMCorz/moodle into MO…

…ODLE_26_STABLE Conflicts: theme/bootstrapbase/style/moodle.css
moodle · May 19, 2014 · d18bc9d · d18bc9d
2 parents 17f8fb7 + 33c4973
commit d18bc9d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/theme/bootstrapbase/less/moodle/admin.less b/theme/bootstrapbase/less/moodle/admin.less
@@ -764,3 +764,9 @@ img.iconsmall {
     .alert;
     .alert-danger;
 }
+
+#adminsettings .form-overridden {
+    color: @infoText;
+    background-color: @infoBackground;
+}
+
diff --git a/theme/bootstrapbase/style/moodle.css b/theme/bootstrapbase/style/moodle.css