Merge branch 'MDL-44323-26' of git://github.com/danpoltawski/moodle into MOODLE_26_STABLE

Conflicts: theme/bootstrapbase/less/moodle/admin.less theme/bootstrapbase/style/moodle.css
2014-05-20 15:45:21 +12:00
parent aa1d665a3a 247946725c
commit e77dcc602d
3 changed files with 3 additions and 9 deletions
@@ -759,12 +759,6 @@ img.iconsmall {
    padding-bottom: 0;
 }

-// Hacks for badly marked up admin warnings.
-#page-admin-roles-assign div.box.generalbox {
-    .alert;
-    .alert-danger;
-}
-
 #adminsettings .form-overridden {
    color: @infoText;
    background-color: @infoBackground;