moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 00:46:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

1
theme/base/style/core.css
View file

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

3
theme/bootstrapbase/less/moodle/core.less
View file

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

2
theme/bootstrapbase/style/moodle.css
View file

File diff suppressed because one or more lines are too long