re-ordering activity feed items as per feedback

opentech/apply/funds/templates/funds/includes/feed-item.html

@@ -11,18 +11,20 @@
             <p class="feed__label feed__label--{{type}} feed__label--mobile">{{type|capfirst}}</p>
             <p class="feed__meta-item">mm.dd.yy</p>
             <p class="feed__meta-item">4:47pm cet</p>
-            <p class="feed__meta-item feed__meta-item--progress"><span>(In discussion</span> <span>Proposal requested)</span></p>
+            {% if type == 'note' or type == 'determination' or type == 'message' %}
+                <p class="feed__meta-item feed__meta-item--progress"><span>(In discussion</span> <span>Proposal requested)</span></p>
+            {% endif %}
         </div>
 
         <div class="feed__heading">
             <h4 class="feed__name">Sandra Ordonez <span class="feed__company">(OTF)</span></h4>
-
-            {% if type == 'note' or type == 'determination' or type == 'message' %}
-                <p class="feed__heading-status">Posted</p>
-                <h6>for</h6>
-                <h6><a href="#">Submission Title</a></h6>
-            {% endif %}
+            <p class="feed__heading-status">Posted</p>
+            <h6>for</h6>
+            <h6><a href="#">Submission Title</a></h6>
         </div>
+        {% if type == "action" %}
+            <p class="feed__meta-item feed__meta-item--progress"><span>(In discussion</span> <span>Proposal requested)</span></p>
+        {% endif %}
 
         {% if type == 'note' or type == 'determination' or type == 'message' %}
             <p class="feed__teaser">Team review call:  Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit</p>

opentech/static_src/src/sass/apply/components/_feed.scss

@@ -134,6 +134,10 @@
         > * {
             margin: 0 10px 0 0;
         }
+
+        .feed__item--action & {
+            margin: 5px 0 0;
+        }
     }
 
     &__heading-status {