Merge branch 'feature/kevin/flagging' of github.com:MITx/mitx into feature/kevin/flagging

2012-12-05 11:21:16 -05:00
parent 3a7624d384 13581bcfcb
commit 70d0fd11b7
4 changed files with 10 additions and 2 deletions
--- a/lms/static/images/flagged.png
+++ b/lms/static/images/flagged.png
--- a/lms/static/images/notflagged.png
+++ b/lms/static/images/notflagged.png
--- a/lms/static/images/resolvedflag.png
+++ b/lms/static/images/resolvedflag.png
--- a/lms/static/sass/_discussion.scss
+++ b/lms/static/sass/_discussion.scss
@@ -2419,11 +2419,9 @@ body.discussion {

 .discussion-flag-abuse {
      font-size: 12px;
-      color: #888;
      float:right;
      padding-right: 5px;
      font-style: italic; 
-      width:100px;
    }  
    
 .notflagged .icon
@@ -2443,3 +2441,13 @@ body.discussion {
  padding-right: 3px;
  background: transparent url('../images/flagged.png') no-repeat 0 0; 
 }
+
+.flagged span {
+  color: #B82066;
+  font-style: italic;
+}
+
+.notflagged span {
+  color: #888;
+  font-style: italic;
+}