additional git rebase cleanup

2013-07-22 14:09:40 -04:00
parent 83b4dc634a f94ec6cf2a
commit 747102cfc2
2 changed files with 4 additions and 1 deletions
--- a/lms/static/sass/_discussion.scss
+++ b/lms/static/sass/_discussion.scss
@@ -845,6 +845,9 @@ body.discussion {
      .drop-arrow {
        font-size: 16px;
      }
+      .drop-arrow {
+        font-size: 16px;
+      }
    }

    .browse-topic-drop-icon {
@@ -1428,7 +1431,6 @@ body.discussion {
    .icon-envelope {color: $gray;}
  }

-
  .discussion-article {
    position: relative;
    padding: $baseline*2;
--- a/lms/static/sass/application.scss.mako
+++ b/lms/static/sass/application.scss.mako
@@ -40,6 +40,7 @@

 // base - starter
@import 'base/base';
+
 // shared - course 
@import 'shared/forms';
@import 'shared/footer';