diff --git a/app/controllers/aspects_controller.rb b/app/controllers/aspects_controller.rb index 24a59a2d0..c64464a1e 100644 --- a/app/controllers/aspects_controller.rb +++ b/app/controllers/aspects_controller.rb @@ -25,7 +25,7 @@ class AspectsController < ApplicationController @aspect_hashes = hashes_for_aspects @aspects, @contacts, :limit => 8 @contact_hashes = hashes_for_contacts @contacts - #@aspect = @aspects.first + @aspect = :all unless params[:a_ids] if current_user.getting_started == true redirect_to getting_started_path diff --git a/app/views/aspects/index.js.erb b/app/views/aspects/index.js.erb deleted file mode 100644 index aa27af5a0..000000000 --- a/app/views/aspects/index.js.erb +++ /dev/null @@ -1 +0,0 @@ -$('#main_stream').html("<%= escape_javascript(render('shared/stream', :posts => @post_hashes)) %>"); diff --git a/app/views/layouts/_header.html.haml b/app/views/layouts/_header.html.haml index a47ff351d..abd6baa92 100644 --- a/app/views/layouts/_header.html.haml +++ b/app/views/layouts/_header.html.haml @@ -48,7 +48,7 @@ - for aspect in @all_aspects %li{:data=>{:guid=>aspect.id}, :class => ("selected" if current_aspect?(aspect))} - = link_to aspect.name, '#' + = link_to aspect.name, '#', :class => 'aspect_selector' %li = link_to '+', '#add_aspect_pane', :class => "add_aspect_button", :title => t('aspects.manage.add_a_new_aspect') diff --git a/public/javascripts/aspect-filters.js b/public/javascripts/aspect-filters.js index dfc140e4a..b720c67d6 100644 --- a/public/javascripts/aspect-filters.js +++ b/public/javascripts/aspect-filters.js @@ -16,7 +16,7 @@ $(function(){ } }); - $("#aspect_nav a").click(function(e){ + $("#aspect_nav a.aspect_selector").click(function(e){ e.preventDefault(); diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass index 5620ee404..034883106 100644 --- a/public/stylesheets/sass/application.sass +++ b/public/stylesheets/sass/application.sass @@ -117,15 +117,17 @@ header :min-height 40px :background - :color #222 + :color #111 :color rgba(30,30,30,0.98) - :-webkit-box-shadow 0 0px 3px #000 - :-moz-box-shadow 0 0px 3px #000 - :box-shadow 0 0px 3px #000 + :background -webkit-gradient(linear, 0% 0%, 0% 100%, from(rgba(30,30,30,0.94)), to(rgba(0,0,0,0.96))) + + :-webkit-box-shadow 0 1px 3px #111 + :-moz-box-shadow 0 1px 2px #111 + :box-shadow 0 1px 3px #111 :border - :bottom 1px solid #999 + :bottom 1px solid #777 :padding 0 :top 5px @@ -147,7 +149,7 @@ header .right :top 10px :height 45px - + ul#user_menu :overflow hidden :white-space nowrap @@ -943,9 +945,8 @@ label :text-shadow 0 1px 0 #444 - :padding 2px 7px - :margin - :left -1px + :padding 1px 7px + :color #CCC :max-width 120px :overflow hidden @@ -961,7 +962,10 @@ label :font :weight bold :background - :color rgb(252,252,252) + :color rgb(235,235,235) + + :border + :bottom 1px solid #fff :color #444 &:hover