merge master

2013-03-20 09:21:51 -04:00
parent 05ba082c8f
commit 359de858b4
2 changed files with 2 additions and 0 deletions
--- a/lms/templates/discussion/mustache/_inline_thread.mustache
+++ b/lms/templates/discussion/mustache/_inline_thread.mustache
@@ -1,4 +1,5 @@
 <article class="discussion-article" data-id="{{id}}">
+<div class="pinned-{{pinned}}"></div>
    <div class="thread-content-wrapper"></div>

    <ol class="responses post-extended-content">
--- a/lms/templates/discussion/mustache/_inline_thread_cohorted.mustache
+++ b/lms/templates/discussion/mustache/_inline_thread_cohorted.mustache
@@ -1,5 +1,6 @@
 <article class="discussion-article" data-id="{{id}}">
 <div class="group-visibility-label">{{group_string}}</div>
+<div class="pinned-{{pinned}}"></div>
    <div class="thread-content-wrapper"></div>

    <ol class="responses post-extended-content">