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

This commit is contained in:
Eloy Lafuente (stronk7) 2017-02-07 06:20:26 +01:00
commit 3587ee29c2
4 changed files with 41 additions and 30 deletions

View file

@ -785,8 +785,7 @@ span.editinstructions {
* Borders #e1e1e8
*/
#course-category-listings {
background-color: $body-bg;
margin-bottom: 200px;
margin-bottom: 0;
/** Two column layout */
&.columns-2 {
@ -1172,7 +1171,6 @@ span.editinstructions {
@media (max-width: 1199px) {
#course-category-listings.columns-2,
#course-category-listings.columns-3 {
background-color: $body-bg;
border: 0;
#category-listing,
@ -1181,12 +1179,6 @@ span.editinstructions {
width: 100%;
margin: 0 0 1em;
}
#category-listing > div,
#course-listing > div,
#course-detail > div {
background-color: $body-bg;
}
}
}

View file

@ -1054,6 +1054,14 @@ span.editinstructions {
}
}
#page-course-management .coursesearchbox input[type="text"] + input[type="submit"] {
margin-bottom: 0;
}
#page-course-management #course-category-listings .detail-pair .pair-value select {
max-width: 80%;
}
#course-category-listings #course-listing .listitem .drag-handle {
display: none;
}

View file

@ -4459,6 +4459,12 @@ span.editinstructions {
#course-category-listings .select-a-category .alert {
margin: 1em;
}
#page-course-management .coursesearchbox input[type="text"] + input[type="submit"] {
margin-bottom: 0;
}
#page-course-management #course-category-listings .detail-pair .pair-value select {
max-width: 80%;
}
#course-category-listings #course-listing .listitem .drag-handle {
display: none;
}