nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

header touchup

Browse source
This commit is contained in:
danielvincent 2011-01-04 16:17:11 -08:00
parent f1564d068a
commit c64865d32e
5 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/aspects_controller.rb
View file

@ -25,7 +25,7 @@ class AspectsController < ApplicationController
@aspect_hashes = hashes_for_aspects @aspects, @contacts, :limit => 8 @aspect_hashes = hashes_for_aspects @aspects, @contacts, :limit => 8
@contact_hashes = hashes_for_contacts @contacts @contact_hashes = hashes_for_contacts @contacts
#@aspect = @aspects.first @aspect = :all unless params[:a_ids]
if current_user.getting_started == true if current_user.getting_started == true
redirect_to getting_started_path redirect_to getting_started_path

1
app/views/aspects/index.js.erb
View file

@ -1 +0,0 @@
$('#main_stream').html("<%= escape_javascript(render('shared/stream', :posts => @post_hashes)) %>");

2
app/views/layouts/_header.html.haml
View file

@ -48,7 +48,7 @@
- for aspect in @all_aspects - for aspect in @all_aspects
%li{:data=>{:guid=>aspect.id}, :class => ("selected" if current_aspect?(aspect))} %li{:data=>{:guid=>aspect.id}, :class => ("selected" if current_aspect?(aspect))}
= link_to aspect.name, '#' = link_to aspect.name, '#', :class => 'aspect_selector'
%li %li
= link_to '+', '#add_aspect_pane', :class => "add_aspect_button", :title => t('aspects.manage.add_a_new_aspect') = link_to '+', '#add_aspect_pane', :class => "add_aspect_button", :title => t('aspects.manage.add_a_new_aspect')

2
public/javascripts/aspect-filters.js
View file

@ -16,7 +16,7 @@ $(function(){
} }
}); });
$("#aspect_nav a").click(function(e){ $("#aspect_nav a.aspect_selector").click(function(e){
e.preventDefault(); e.preventDefault();

24
public/stylesheets/sass/application.sass
View file

@ -117,15 +117,17 @@ header
:min-height 40px :min-height 40px
:background :background
:color #222 :color #111
:color rgba(30,30,30,0.98) :color rgba(30,30,30,0.98)
:-webkit-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)))
:-moz-box-shadow 0 0px 3px #000
:box-shadow 0 0px 3px #000 :-webkit-box-shadow 0 1px 3px #111
:-moz-box-shadow 0 1px 2px #111
:box-shadow 0 1px 3px #111
:border :border
:bottom 1px solid #999 :bottom 1px solid #777
:padding 0 :padding 0
:top 5px :top 5px
@ -147,7 +149,7 @@ header
.right .right
:top 10px :top 10px
:height 45px :height 45px
ul#user_menu ul#user_menu
:overflow hidden :overflow hidden
:white-space nowrap :white-space nowrap
@ -943,9 +945,8 @@ label
:text-shadow 0 1px 0 #444 :text-shadow 0 1px 0 #444
:padding 2px 7px :padding 1px 7px
:margin
:left -1px
:color #CCC :color #CCC
:max-width 120px :max-width 120px
:overflow hidden :overflow hidden
@ -961,7 +962,10 @@ label
:font :font
:weight bold :weight bold
:background :background
:color rgb(252,252,252) :color rgb(235,235,235)
:border
:bottom 1px solid #fff
:color #444 :color #444
&:hover &:hover