Merge branch 'wip-MDL-40087_master' of git://github.com/gjb2048/moodle

Conflicts:
	theme/bootstrapbase/style/moodle.css
This commit is contained in:
Dan Poltawski 2013-06-11 16:00:18 +08:00
commit e2ac6a848b
2 changed files with 2 additions and 2 deletions

View File

@ -76,7 +76,7 @@ select {
.breadcrumb-button { .breadcrumb-button {
float: right; float: right;
margin-top: 3px; margin-top: 4px;
} }
.dir-rtl .navbar .brand { .dir-rtl .navbar .brand {
float: right; float: right;

File diff suppressed because one or more lines are too long