Commit c85cc5a3 by cahrens

Fix bad merge.

parent d72b6b05
...@@ -37,7 +37,7 @@ body.course.static-pages { ...@@ -37,7 +37,7 @@ body.course.static-pages {
//Overrides general edit-box mixin //Overrides general edit-box mixin
.row { .row {
margin-bottom: 0px; margin-bottom: 0px;
}
// This duplicates the styling from Unit page editing // This duplicates the styling from Unit page editing
.module-actions { .module-actions {
...@@ -190,3 +190,4 @@ body.course.static-pages { ...@@ -190,3 +190,4 @@ body.course.static-pages {
outline: 0; outline: 0;
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment