grading - resolved rebase/merge conflicts

This commit is contained in:
Brian Talbot
2012-12-13 09:45:11 -05:00

View File

@@ -67,10 +67,12 @@ input.courseware-unit-search-input {
@include clearfix();
.item-details, .section-published-date {
}
.item-details {
float: none;
display: inline-block;
padding: 20px 0 10px 0;
@include clearfix();