resolving styling merge conflicts

2012-12-13 11:43:48 -05:00
parent 9f863fd96e 299b28007b
commit 7d823d9ed9
1 changed files with 12 additions and 0 deletions
--- a/cms/static/sass/_courseware.scss
+++ b/cms/static/sass/_courseware.scss
@@ -1,3 +1,4 @@
+
 input.courseware-unit-search-input {
 	float: left;
 	width: 260px;
@@ -192,6 +193,17 @@ input.courseware-unit-search-input {
 	}
 }

+.collapse-all-button {
+	float: right;
+	margin-top: 10px;
+	font-size: 13px;
+	color: $darkGrey;
+
+	.collapse-all-icon {
+		margin-right: 6px;
+	}
+}
+
 .new-section-name,
 .new-subsection-name-input {
 	width: 515px;