Merge branch 'wip-MDL-39746-master' of git://github.com/phalacee/moodle

Conflicts:
	theme/bootstrapbase/style/moodle.css
This commit is contained in:
Dan Poltawski 2013-06-11 11:24:31 +08:00
commit fd6f924c08
2 changed files with 4 additions and 1 deletions

View File

@ -221,6 +221,9 @@
.path-mod-forum .forumsearch #search { .path-mod-forum .forumsearch #search {
width: 120px; width: 120px;
} }
.path-mod-forum .forumheaderlist .picture {
display: none;
}
} }
// Stuart's 2,1,3 layout // Stuart's 2,1,3 layout

File diff suppressed because one or more lines are too long