Merge branch 'MDL-41569-master' of git://github.com/damyon/moodle

Conflicts:
	theme/bootstrapbase/style/moodle.css
This commit is contained in:
Dan Poltawski 2014-04-07 16:01:56 +08:00
commit 5e8be14cb9
3 changed files with 1 additions and 5 deletions

View file

@ -130,7 +130,6 @@ img.uihint {cursor: help;}
#addmembersform table {margin-left: auto;margin-right: auto;}
.formtable tbody th,
.generaltable th.header {vertical-align: top;}
.flexible th {white-space: nowrap;}
.cell {vertical-align: top;}
img.emoticon {vertical-align: middle;width: 15px;height: 15px;}
form.popupform,

View file

@ -312,9 +312,6 @@ img.uihint {
margin-left: auto;
margin-right: auto;
}
.flexible th {
white-space: nowrap;
}
table.flexible .emptyrow {
display: none;
}

File diff suppressed because one or more lines are too long