Merge branch 'master' into drupal-new

lms/static/sass/_discussion.scss

@@ -95,6 +95,7 @@
 
 
 body.discussion {
+  
   .new-post-form-errors {
     display: none;
     background: $error-red;
@@ -1280,8 +1281,8 @@ body.discussion {
   .discussion-article {
     position: relative;
     padding: 40px;
-    min-height: 468px;
-
+    min-height: 468px;         
+    
     a {
       word-wrap: break-word;
     }
@@ -1334,6 +1335,9 @@ body.discussion {
         background-position: 0 0;
       }
     }
+    
+    
+    
   }
 
   .discussion-post {
@@ -2436,7 +2440,6 @@ body.discussion {
   @extend .discussion-module
 }
 
-
 .group-visibility-label {
     font-size: 12px;
     color:#000;
@@ -2448,7 +2451,19 @@ body.discussion {
       font-size: 12px;
       float:right;
       padding-right: 5px;
-      font-style: italic; 
+      font-style: italic;
+      cursor:pointer; 
+      margin-right: 10px;
+      opacity:.8;
+
+      span {
+        cursor: pointer;
+      }
+
+      &:hover {
+        @include transition(opacity .2s);
+        opacity: 1;
+      }
     }  
 
 .discussion-pin-inline {
@@ -2458,20 +2473,25 @@ body.discussion {
       position: relative;
       right:-20px;
       top:-13px;
+      margin-right:35px;
+      margin-top:13px;
+      opacity: 1;
     }  
-    
-.notpinned .icon
-{
-  display: inline-block; 
+
+.notpinned .icon {
+  display: block; 
+  float: left;
+  margin: 3px;
   width: 10px; 
   height: 14px;
   padding-right: 3px;
   background: transparent url('../images/unpinned.png') no-repeat 0 0; 
 }
 
-.pinned .icon
-{
-  display: inline-block; 
+.pinned .icon {
+  display: block; 
+  float: left;
+  margin: 3px;
   width: 10px; 
   height: 14px; 
   padding-right: 3px;
@@ -2481,14 +2501,65 @@ body.discussion {
 .pinned span {
   color: #B82066;
   font-style: italic;
+  //cursor change is here since pins are read-only for inline discussions. 
+  cursor: default;
 }
 
 .notpinned span {
   color: #888;
   font-style: italic;
+  //cursor change is here since pins are read-only for inline discussions. 
+  cursor: default;
 }
 
 .pinned-false
 {
 display:none;
+}
+
+.discussion-flag-abuse {
+      font-size: 12px;
+      float:right;
+      padding-right: 5px;
+      font-style: italic;
+      cursor:pointer;
+      opacity:.8;
+
+      &:hover {
+        @include transition(opacity .2s);
+        opacity: 1;
+      }
+
+    }  
+    
+.notflagged .icon
+{
+  display: block; 
+  float: left;
+  margin: 3px;
+  width: 10px; 
+  height: 14px;
+  padding-right: 3px;
+  background: transparent url('../images/notflagged.png') no-repeat 0 0; 
+}
+
+.flagged .icon
+{
+  display: block; 
+  float: left;
+  margin: 3px;
+  width: 10px; 
+  height: 14px; 
+  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;
 }