Merge branch 'wip-MDL-38900-master' of git://github.com/ds125v/moodle

Conflicts:
	theme/bootstrap/style/generated.css
This commit is contained in:
Sam Hemelryk 2013-04-22 11:10:51 +12:00
commit 6801246c50
3 changed files with 4 additions and 4 deletions

View File

@ -49,9 +49,6 @@ a.dimmed_text:visited,
margin: 0;
padding: 0;
}
.course-content .current {
background-color: @grayLighter;
}
.inline,
.inline-list li {
display: inline;

View File

@ -92,6 +92,9 @@
.editing .section .activity:hover {
background-color: @grayLighter;
}
.course-content .current {
background-color: @infoBackground;
}
.course-content .section-summary {
border: 1px solid #DDD;
margin-top: 5px;

File diff suppressed because one or more lines are too long