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

@ -8,16 +8,6 @@
margin: 15px 0 25px;
}
.course_category_tree .controls {
color: #888;
font-size: 0.9em;
margin-top: 10px;
}
.course_category_tree .controls div {
margin: 0 5px 0 0;
}
#page-course-index-category .generalbox.info {
margin: 25px auto 30px;
width: 75%;