Merge branch 'MDL-42853-master' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE

Conflicts:
	theme/bootstrapbase/style/moodle.css
This commit is contained in:
Sam Hemelryk
2013-11-19 10:09:18 +13:00
3 changed files with 14 additions and 5 deletions
+1 -3
View File
@@ -12,7 +12,7 @@
.dir-rtl .section_add_menus .urlselect select { margin-right: .2em; margin-left: 0;}
.section_add_menus .urlselect img.iconhelp { padding: 0; margin: 0; vertical-align: text-bottom;}
.site-topic ul.section,
.sitetopic ul.section { margin: 5px; padding: 0; }
.course-content ul.section { margin: 1em;}
.sitetopic .section .activity img.activityicon,
.course-content .section .activity img.activityicon {
@@ -205,8 +205,6 @@ li.section.hidden span.commands a.editing_show {cursor:default;}
.section img.movetarget {height:16px;width:80px;}
.course ul.section {margin:5px;padding:0;}
.weeks-format, /* Window-width: 800 pixels.IE doesn't support, see inline IE conditional comment. */
.topics-format {margin-top: 8px;min-width: 763px;}
+12 -1
View File
@@ -34,7 +34,9 @@
vertical-align: text-bottom;
}
.site-topic ul.section,
.sitetopic ul.section {
margin: 0;
}
.course-content ul.section {
margin: 1em;
}
@@ -777,6 +779,15 @@ span.editinstructions {
}
}
.dir-rtl .section {
.editing_title {
.iconsmall {
margin: 8px 0 0 8px;
padding: 4px 0 0 8px;
}
}
}
/**
* Course management page
* Palette
File diff suppressed because one or more lines are too long