Merge branch 'wip-MDL-39798_master' of git://github.com/gjb2048/moodle

Conflicts:
	theme/bootstrapbase/style/moodle.css
This commit is contained in:
Sam Hemelryk 2013-06-12 08:51:59 +12:00
commit ec18f333bd
3 changed files with 20 additions and 1 deletions

View File

@ -42,6 +42,7 @@ body {
@import "moodle/blocks";
@import "moodle/forms";
@import "moodle/modules";
@import "moodle/reports";
@import "moodle/backup-restore";
@import "moodle/tables";
@import "moodle/buttons";

View File

@ -0,0 +1,18 @@
/* reports.less */
// The home for small tweaks to reports that don't require
// changes drastic enough to pull in the full module css
// and replace it completely.
#page-report-participation-index .participationselectform div label { // Using 'div' here to override the report styles.css
display: inline;
margin: 0 5px; // No top and bottom margin with a 5px left and right for LTR and RTL.
}
#page-report-participation-index.dir-ltr .participationselectform div label[for=menuinstanceid] {
margin-left: 0px; // No left margin for LTR.
}
#page-report-participation-index.dir-rtl .participationselectform div label[for=menuinstanceid] {
margin-right: 0px; // No right margin for RTL.
}

File diff suppressed because one or more lines are too long