From 05a7d664f7a24801e5fa47fe7bc1effc6090ce0a Mon Sep 17 00:00:00 2001
From: marco <marcotuts@gmail.com>
Date: Fri, 14 Jun 2013 15:04:39 -0400
Subject: [PATCH] updated flag icons to be font-awesome based

---
 lms/static/images/flagged.png                     | Bin 327 -> 0 bytes
 lms/static/images/notflagged.png                  | Bin 320 -> 0 bytes
 lms/static/sass/_discussion.scss                  |  10 ++++------
 .../discussion/_underscore_templates.html         |   8 ++++----
 4 files changed, 8 insertions(+), 10 deletions(-)
 delete mode 100644 lms/static/images/flagged.png
 delete mode 100644 lms/static/images/notflagged.png

diff --git a/lms/static/images/flagged.png b/lms/static/images/flagged.png
deleted file mode 100644
index ad2b0dac55ce48b9da87b2f801bafa72d6460163..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 327
zcmeAS@N?(olHy`uVBq!ia0vp@K+MO%1|+}KPrC%9Sc;uILpXq-h9ji|$mcBZh%9Dc
z;0Cg}I~bq#X?g+$WlCHlN`mv#O3D+9QW+dm@{>{(+%k(&%kzt}ixr%M&0g%;)B{u}
z3R34>l$uzQnV+W+l9`*zV5)Cu3`9>Ry!HSpSm5d67@{%p>cx$Mha7lV4wyRoasHQO
zkQK06!rZZsSEKQUV9A3I&X*ZW8mt@mI1G&C+Mb*YSh0JupL*R&nV>U@x?U!sd@uVX
zr<LB1De@33Jdj^{|IRUPfz>jXQWa!39Q%{}q4Gf3jij)r6TaP;dSmvK3IAP8{$8?P
zc=)dN*|Qwg4?c*+7P?sf<G!VMm!tH4i9-99^NOXa-|F_g?AYe=h2`Q2O^bt8tgnD>
OW$<+Mb6Mw<&;$U-G<hNb

diff --git a/lms/static/images/notflagged.png b/lms/static/images/notflagged.png
deleted file mode 100644
index fda47d5ab59647f9c3cccc7a62e8ce8c7880f142..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 320
zcmeAS@N?(olHy`uVBq!ia0vp@K+MO%1|+}KPrC%9Sc;uILpXq-h9ji|$mcBZh%9Dc
z;0Cg}I~bq#X?g+$WlCHlN`mv#O3D+9QW+dm@{>{(+%k(&%kzt}ixr%M&0g%;)B{u}
z3R34>l$uzQnV+W+l9`*zV5)Cu3`9>Ry!HSpnCa=_7@{%p>cq3WO$h=n@@>|-7aF4)
zr)`kUP!D2KO<-To@`k~B0n3{M%<^p#e230@e%rKpb3JqPf@!Z3d)0#37cle*UR<df
zpti5Sqt1>&!+5K=tEs?&f2%(#7p6bp60uY$@ZQ)G+{Is(o%d5XaNmU8%(?~!b)StM
z$2r(`&U0Y4_|6)z)?=Tmi*>5@*4WMWp3RnWYpy>g?OUenW#X;=1n5WxPgg&ebxsLQ
E0Av4ang9R*

diff --git a/lms/static/sass/_discussion.scss b/lms/static/sass/_discussion.scss
index 672caddd97..2894b59184 100644
--- a/lms/static/sass/_discussion.scss
+++ b/lms/static/sass/_discussion.scss
@@ -2692,26 +2692,24 @@ display:none;
 
     }  
     
-.notflagged .icon
-{
+.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; 
+  color: $gray-l2;
 }
 
-.flagged .icon
-{
+.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; 
+  color: $pink;
 }
 
 .flagged span {
diff --git a/lms/templates/discussion/_underscore_templates.html b/lms/templates/discussion/_underscore_templates.html
index fcbcf1a52c..034aa4f28f 100644
--- a/lms/templates/discussion/_underscore_templates.html
+++ b/lms/templates/discussion/_underscore_templates.html
@@ -48,7 +48,7 @@
 
       <div class="post-body">${'<%- body %>'}</div>
       <div class="discussion-flag-abuse notflagged" data-role="thread-flag" data-tooltip="Report Misuse">                
-      <i class="icon"></i><span class="flag-label">Report Misuse</span></div>      
+      <i class="icon icon-flag"></i><span class="flag-label">Report Misuse</span></div>      
         
         
       % if course and has_permission(user, 'openclose_thread', course.id):
@@ -126,7 +126,7 @@
     </header>
     <div class="response-local"><div class="response-body">${"<%- body %>"}</div>
     <div class="discussion-flag-abuse notflagged" data-role="thread-flag" data-tooltip="report misuse">                
-      <i class="icon"></i><span class="flag-label">Report Misuse</span></div>
+      <i class="icon icon-flag"></i><span class="flag-label">Report Misuse</span></div>
     </div>
     <ul class="moderator-actions response-local">
         <li style="display: none"><a class="action-edit" href="javascript:void(0)"><span class="edit-icon"></span> Edit</a></li>
@@ -150,8 +150,8 @@
 <script type="text/template" id="response-comment-show-template">
   <div id="comment_${'<%- id %>'}">
     <div class="response-body">${'<%- body %>'}</div>
-    <div class="discussion-flag-abuse notflagged" data-role="thread-flag" data-tooltip="report misuse">                
-      <i class="icon"></i><span class="flag-label"></span></div> 
+    <div class="discussion-flag-abuse notflagged" data-role="thread-flag" data-tooltip="Report Misuse">                
+      <i class="icon icon-flag"></i><span class="flag-label"></span></div> 
     <p class="posted-details">&ndash;posted <span class="timeago" title="${'<%- created_at %>'}">${'<%- created_at %>'}</span> by
         ${"<% if (obj.username) { %>"}
         <a href="${'<%- user_url %>'}" class="profile-link">${'<%- username %>'}</a>