Merge branch 'MDL-56759-master' of git://github.com/lameze/moodle

This commit is contained in:
Andrew Nicols 2016-12-06 08:56:27 +08:00
commit 2e0e081b60
3 changed files with 28 additions and 66 deletions

View file

@ -1642,41 +1642,6 @@ table.collection {
@extend .table-striped; @extend .table-striped;
} }
table.collection .name {
text-align: left;
vertical-align: middle;
}
table.collection .awards {
width: 10%;
text-align: center;
vertical-align: middle;
}
table.collection .criteria {
width: 40%;
text-align: left;
vertical-align: top;
}
table.collection .badgeimage,
table.collection .status {
width: 15%;
text-align: center;
vertical-align: middle;
}
table.collection .description {
width: 25%;
text-align: left;
}
table.collection .actions {
width: 11em;
text-align: center;
vertical-align: middle;
}
a.criteria-action { a.criteria-action {
padding: 0 3px; padding: 0 3px;
float: right; float: right;

View file

@ -1761,36 +1761,34 @@ table.collection {
.table-bordered; .table-bordered;
.table-striped; .table-striped;
} }
table.collection .name { table.collection td.name {
text-align: left; text-align: left;
vertical-align: middle; vertical-align: middle;
} }
table.collection .awards { table.collection td.awards {
width: 10%;
text-align: center;
vertical-align: middle;
}
table.collection .criteria {
width: 40%;
text-align: left;
vertical-align: top;
}
table.collection .badgeimage,
table.collection .status {
width: 15%; width: 15%;
text-align: center; text-align: center;
vertical-align: middle; vertical-align: middle;
} }
table.collection .description { table.collection td.criteria {
width: 40%;
text-align: left;
vertical-align: top;
}
table.collection td.status {
width: 15%;
text-align: center;
vertical-align: middle;
}
table.collection td.description {
width: 25%; width: 25%;
text-align: left; text-align: left;
} }
table.collection .actions { table.collection td.actions {
width: 11em; width: 11em;
text-align: center; text-align: center;
vertical-align: middle; vertical-align: middle;
} }
a.criteria-action { a.criteria-action {
padding: 0 3px; padding: 0 3px;
float: right; float: right;

View file

@ -1896,31 +1896,30 @@ table.collection tbody > tr:nth-child(odd) > td,
table.collection tbody > tr:nth-child(odd) > th { table.collection tbody > tr:nth-child(odd) > th {
background-color: #f9f9f9; background-color: #f9f9f9;
} }
table.collection .name { table.collection td.name {
text-align: left; text-align: left;
vertical-align: middle; vertical-align: middle;
} }
table.collection .awards { table.collection td.awards {
width: 10%;
text-align: center;
vertical-align: middle;
}
table.collection .criteria {
width: 40%;
text-align: left;
vertical-align: top;
}
table.collection .badgeimage,
table.collection .status {
width: 15%; width: 15%;
text-align: center; text-align: center;
vertical-align: middle; vertical-align: middle;
} }
table.collection .description { table.collection td.criteria {
width: 40%;
text-align: left;
vertical-align: top;
}
table.collection td.status {
width: 15%;
text-align: center;
vertical-align: middle;
}
table.collection td.description {
width: 25%; width: 25%;
text-align: left; text-align: left;
} }
table.collection .actions { table.collection td.actions {
width: 11em; width: 11em;
text-align: center; text-align: center;
vertical-align: middle; vertical-align: middle;