diff --git a/app/views/aspects/index.html.haml b/app/views/aspects/index.html.haml index a7e42d6aa3f2512a9966705ee69efb519589af23..50a1903f7a854015f8ae435c42481311b249e868 100644 --- a/app/views/aspects/index.html.haml +++ b/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 - %b= link_to t('.mentions'), mentions_path, :class => 'home_selector' + %li + %b + = link_to t('.mentions'), mentions_path, :class => 'home_selector' .section#followed_tags_listing = render 'tags/followed_tags_listings' diff --git a/lib/stream/soup.rb b/lib/stream/soup.rb index 9bfcc5eb6f8f2b5b19933d3e09071a25b989c68a..ad81f77277546c73bdca12191341217ed8e2106d 100644 --- a/lib/stream/soup.rb +++ b/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 diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass index 23fa7af9c34a698da6438de3381473e1df74fa8c..7a5087297ded082e6119849120408627e5d4f2d3 100644 --- a/public/stylesheets/sass/application.sass +++ b/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 -.mentioned_soup - .indicator - :background-color blue + :background-color #DE5099 .followed_tags_soup .indicator - :background-color yellow + :background-color $blue +.aspects_soup + .indicator + :background-color $green +.mentioned_soup + .indicator + :background-color #E3E856