merge with Marcos new design

lms/templates/discussion/_filter_dropdown.html

@@ -43,7 +43,7 @@
         %endif
         <li>
             <a href="#" class="drop-menu-meta-category">
-                <span class="board-name" data-discussion_id='#following'><i class="icon-star" style="padding-right:5px;"></i>Posts I'm Following</span>
+                <span class="board-name" data-discussion_id='#following'><i class="icon-star" style="padding-right:5px;"></i>Posts I&#39;m Following</span>
             </a>
         </li>
         ${render_dropdown(category_map)}

lms/templates/discussion/_thread_list_template.html

@@ -2,11 +2,13 @@
     <div class="browse-search">
         <div class="home">
             <a href="#" class="home-icon">
-                <i class="icon-home"></i>
+                <i class="icon icon-home"></i>
             </a>
         </div>
         <div class="browse is-open">
-            <a href="#" class="browse-topic-drop-icon"></a>
+            <a href="#" class="browse-topic-drop-icon">
+                <i class="icon icon-reorder"></i>
+            </a>
             <a href="#" class="browse-topic-drop-btn"><span class="current-board">Show All Discussions</span> <span class="drop-arrow">▾</span></a>
         </div>
         <%include file="_filter_dropdown.html" />

lms/templates/discussion/_underscore_templates.html

@@ -47,18 +47,18 @@
       </header>
 
       <div class="post-body">${'<%- body %>'}</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">Report Misuse</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">Report Misuse</span></div>
         
         
       % if course and has_permission(user, 'openclose_thread', course.id):
-      <div class="admin-pin discussion-pin notpinned" data-role="thread-pin" data-tooltip="pin this thread">                
-      <i class="icon icon-pushpin"></i><span class="pin-label">Pin Thread</span></div> 
+      <div class="admin-pin discussion-pin notpinned" data-role="thread-pin" data-tooltip="pin this thread">
+      <i class="icon icon-pushpin"></i><span class="pin-label">Pin Thread</span></div>
 
       %else:
       ${"<% if (pinned) { %>"}
-      <div class="discussion-pin notpinned" data-role="thread-pin" data-tooltip="pin this thread">                
-      <i class="icon icon-pushpin"></i><span class="pin-label">Pin Thread</span></div> 
+      <div class="discussion-pin notpinned" data-role="thread-pin" data-tooltip="pin this thread">
+      <i class="icon icon-pushpin"></i><span class="pin-label">Pin Thread</span></div>
       ${"<% }  %>"}  
       % endif
       

lms/templates/discussion/mustache/_inline_thread_show.mustache

@@ -4,10 +4,10 @@
         <a href="#" class="vote-btn discussion-vote discussion-vote-up" data-role="discussion-vote" data-tooltip="vote"><span class="plus-icon">+</span> <span class='votes-count-number'>{{votes.up_count}}</span></a>
         <h3>{{title}}</h3>
         <div class="discussion-flag-abuse notflagged" data-role="thread-flag" data-tooltip="Report Misuse">
-        <i class="icon"></i><span class="flag-label">Flagged</span></div>
+        <i class="icon icon-flag"></i><span class="flag-label">Flagged</span></div>
 
         <div class="discussion-pin-inline pinned  pinned-{{pinned}}" data-tooltip="This thread has been pinned by course staff.">                
-        <i class="icon"></i><span class="pin-label">Pinned</span></div>
+        <i class="icon icon-pushpin"></i><span class="pin-label">Pinned</span></div>
 
         <p class="posted-details">
             {{#user}}