DG MS; changed coloring of indicators; changed indicator precidence; added soup link

app/views/aspects/index.html.haml

@@ -18,13 +18,20 @@
         %li
           = link_to "Welcome", getting_started_path, :class => "home_selector"
 
+  .section
+    %ul.left_nav
+      %li
+        %b
+          = link_to "Soup", soup_path, :class => 'home_selector'
+
   .section
     = render 'aspects/aspect_listings', :stream => @stream
 
   .section
     %ul.left_nav
-      .li
+      %li
-        %b= link_to t('.mentions'), mentions_path, :class => 'home_selector'
+        %b
+          = link_to t('.mentions'), mentions_path, :class => 'home_selector'
 
   .section#followed_tags_listing
     = render 'tags/followed_tags_listings'

lib/stream/soup.rb

@@ -26,7 +26,7 @@ class Stream::Soup < Stream::Base
   #emits an enum of the groups which the post appeared
   # :spotlight, :aspects, :tags, :mentioned
   def post_from_group(post)
-    [:community_spotlight, :aspects, :followed_tags, :mentioned].collect do |source| 
+    [:mentioned, :aspects, :followed_tags, :community_spotlight].collect do |source| 
       is_in?(source, post)
     end.compact
   end

public/stylesheets/sass/application.sass

@@ -885,15 +885,15 @@ label
     :cursor pointer
 
 #publisher
-
   :z-index 1
   :color #999
   :position relative
   :margin
-    :bottom 10px
     :top 0
+    :bottom 0
   :padding 12px
     :top 0
+    :bottom 22px
   :top 0
 
   :border
@@ -3500,15 +3500,16 @@ ul#getting_started
   :height 4px
   :float right
 
-.aspects_soup
+
-  .indicator
-    :background-color red
 .community_spotlight_soup
   .indicator
-    :background-color green
+    :background-color #DE5099
-.mentioned_soup
-  .indicator
-    :background-color blue
 .followed_tags_soup
   .indicator
-    :background-color yellow
+    :background-color $blue
+.aspects_soup
+  .indicator
+    :background-color $green
+.mentioned_soup
+  .indicator
+    :background-color #E3E856