Merge branch 'MDL-38661-m-wip' of git://github.com/andrewnicols/moodle

Conflicts:
	theme/base/style/core.css
	theme/bootstrapbase/style/moodle.css
This commit is contained in:
Eloy Lafuente (stronk7) 2013-09-17 19:59:55 +02:00
commit 58c9faeaca
18 changed files with 1522 additions and 104 deletions

View file

@ -247,13 +247,13 @@ a.skip:active {position: static;display: block;}
.mform fieldset.hidden {border-width:0;}
.mform fieldset.group {margin-bottom: 0}
.mform fieldset.error {border: 1px solid #A00;}
.mform .collapsible-actions {display: none;}
.jsenabled .mform .collapsible-actions {text-align: right; display: block;}
.dir-rtl .mform .collapsible-actions {text-align: left;}
.mform .collapseexpand {background: url([[pix:t/collapsed]]) left center no-repeat; padding-left: 18px;}
.dir-rtl .mform .collapseexpand {background-image: url([[pix:t/collapsed_rtl]]); background-position: right center; padding-left: 0; padding-right: 18px;}
.mform .collapse-all,
.dir-rtl .mform .collapse-all {background-image: url([[pix:t/expanded]]);}
.collapsible-actions {display: none;}
.jsenabled .collapsible-actions {text-align: right; display: block;}
.dir-rtl .collapsible-actions {text-align: left;}
.collapseexpand {background: url([[pix:t/collapsed]]) left center no-repeat; padding-left: 18px;}
.dir-rtl .collapseexpand {background-image: url([[pix:t/collapsed_rtl]]); background-position: right center; padding-left: 0; padding-right: 18px;}
.collapse-all,
.dir-rtl .collapse-all {background-image: url([[pix:t/expanded]]);}
.mform fieldset legend {padding: 0 0.35em;}
.mform fieldset.collapsible legend a.fheader {padding-left: 18px; background: url([[pix:t/expanded]]) left center no-repeat;}
.mform fieldset.collapsed legend a.fheader {background-image: url([[pix:t/collapsed]]);}
@ -1514,3 +1514,10 @@ ul.dragdrop-keyboard-drag li { list-style-type: none; }
.pagelayout-coursecategory h6 {
text-align: inherit;
}
a.disabled:hover,
a.disabled {
text-decoration: none;
cursor: default;
font-style: italic;
color: #808080;
}

View file

@ -155,13 +155,9 @@ li.section.hidden span.commands a.editing_show {cursor:default;}
.course_category_tree .category .numberofcourse {font-size: 0.85em;}
.course_category_tree .controls {visibility: hidden;}
.course_category_tree .controls div {display:inline;cursor:pointer;}
.jsenabled .course_category_tree .controls {visibility: visible;}
.course_category_tree .category>.info .name {background-image:url([[pix:moodle|t/collapsed_empty]]);background-repeat: no-repeat;background-position:center left;}
.dir-rtl .course_category_tree .category>.info .name {background-image:url([[pix:moodle|t/collapsed_empty_rtl]]);background-position:center right;}
.course_category_tree .category.with_children>.info .name {background-image:url([[pix:moodle|t/expanded]]);}
.course_category_tree .category.with_children>.info .name {background-image:url([[pix:moodle|t/expanded]]);cursor: pointer;}
.course_category_tree .category.with_children.collapsed>.info .name {background-image:url([[pix:moodle|t/collapsed]]);}
.dir-rtl .course_category_tree .category.with_children.collapsed>.info .name {background-image:url([[pix:moodle|t/collapsed_rtl]]);}
.course_category_tree .category.collapsed>.content {display:none;}