visual touchups

This commit is contained in:
danielvincent 2010-12-02 23:19:30 -08:00
parent 7a89c1d3e4
commit 30668bf2e6
6 changed files with 29 additions and 42 deletions

View file

@ -26,7 +26,7 @@
.right .right
.avatar .avatar
= owner_image_tag = owner_image_tag(:thumb_small)
= link_to current_user.name, '#' = link_to current_user.name, '#'
%li= link_to t('.view_profile'), current_user.person %li= link_to t('.view_profile'), current_user.person
%li= link_to t('.edit_profile'), edit_person_path(current_user.person) %li= link_to t('.edit_profile'), edit_person_path(current_user.person)

View file

@ -89,7 +89,7 @@
%footer %footer
.container .container
= image_tag 'powered_by_diaspora.png' = image_tag 'powered_by_diaspora.png', :height => "11px", :width => "145px"
%ul#footer_nav %ul#footer_nav
%li= link_to '@joindiaspora', "http://twitter.com/joindiaspora" %li= link_to '@joindiaspora', "http://twitter.com/joindiaspora"
%li= link_to 'github', "https://github.com/diaspora/diaspora" %li= link_to 'github', "https://github.com/diaspora/diaspora"

View file

@ -11,8 +11,6 @@
.right{:style => "top:0;"} .right{:style => "top:0;"}
%span.description %span.description
= @person.diaspora_handle = @person.diaspora_handle
/= info_text(t('aspects.index.handle_explanation'))
#person_nav_links #person_nav_links
= link_to t('layouts.header.view_profile'), person_path(@person) = link_to t('layouts.header.view_profile'), person_path(@person)
@ -22,8 +20,13 @@
= render :partial => 'people/profile_sidebar', :locals => {:person => @person, :is_contact => @is_contact} = render :partial => 'people/profile_sidebar', :locals => {:person => @person, :is_contact => @is_contact}
.span-15.last .span-15.last
- if @contact || current_user.person == @person %h4
-if @post_type == :photos
Photos
- else
Recent Posts
- if @contact || current_user.person == @person
- if @posts.count > 0 - if @posts.count > 0
-if @post_type == :photos -if @post_type == :photos
= render 'photos/index', :photos => @posts = render 'photos/index', :photos => @posts

View file

@ -40,7 +40,7 @@
#original_post_info #original_post_info
%h4{:style=>"position:relative;"} %h4{:style=>"position:relative;"}
= t('.original_post') = t('.original_post')
= link_to t('.view'), @photo.status_message = link_to "#{t('.view')} →", @photo.status_message
%p %p
= @photo.status_message.message = @photo.status_message.message

View file

@ -13,10 +13,13 @@
- for photo in @status_message.photos - for photo in @status_message.photos
= link_to (image_tag photo.url(:thumb_small)), photo_path(photo) = link_to (image_tag photo.url(:thumb_small)), photo_path(photo)
.time %p.time
= how_long_ago(@status_message) = how_long_ago(@status_message)
%p
=link_to "public permalink", post_path(@status_message) %hr
= link_to "permalink", post_path(@status_message)
%br
- if current_user.owns? @status_message - if current_user.owns? @status_message
= link_to t('.destroy'), @status_message, :confirm => t('are_you_sure'), :method => :delete = link_to t('.destroy'), @status_message, :confirm => t('are_you_sure'), :method => :delete

View file

@ -7,7 +7,6 @@ body
:padding 2em :padding 2em
:margin 0 :margin 0
:background-color rgb(252,252,252) :background-color rgb(252,252,252)
:font-family Arial, sans-serif
a a
:color #107FC9 :color #107FC9
:text :text
@ -23,6 +22,8 @@ p
h1, h2, h3, h4 h1, h2, h3, h4
:color #444 :color #444
:position relative :position relative
:font
:weight bold
h4 h4
:margin :margin
@ -244,11 +245,6 @@ header
:height 370px :height 370px
:width 500px :width 500px
.avatar
:-webkit-border-radius 5px
:-moz-border-radius 5px
:border-radius 5px
img img
:-webkit-box-shadow 0 1px 2px #666 :-webkit-box-shadow 0 1px 2px #666
:-moz-box-shadow 0 1px 2px #666 :-moz-box-shadow 0 1px 2px #666
@ -258,8 +254,6 @@ header
:border-radius 5px :border-radius 5px
.from .from
:font
:family 'Helvetica neue', Arial, Helvetica, sans-serif
:text :text
:shadow 0 1px #fff :shadow 0 1px #fff
@ -300,7 +294,8 @@ header
:bottom 12px :bottom 12px
img img
:border-radius none :position relative
:top 5px
:display inline-block :display inline-block
.from .from
@ -313,7 +308,6 @@ header
:padding 0 :padding 0
h2 h2
:display inline
:margin :margin
:bottom -2px :bottom -2px
@ -328,10 +322,6 @@ header
:margin :margin
:right 2em :right 2em
.avatar
:-webkit-border-radius 5px
:-moz-border-radius 5px
:border-radius 5px
li.message li.message
:position relative :position relative
@ -360,7 +350,7 @@ li.message
p p
:margin :margin
:bottom 0 :bottom 6px
.photo_attachments .photo_attachments
:margin :margin
@ -532,7 +522,6 @@ li.message
:border none :border none
.stream ul.comments .stream ul.comments
.avatar .avatar
:width 35px :width 35px
:height 35px :height 35px
@ -607,6 +596,7 @@ ul.comments
img img
:height 300px :height 300px
:width 300px :width 300px
:-webkit-box-shadow 0 2px 2px #333
#profile #profile
h3 h3
@ -817,15 +807,6 @@ label
:border :border
:bottom 2px #777 solid :bottom 2px #777 solid
.avatar
:position absolute
:margin
:right 15px
:-webkit-border-radius 5px
:-moz-border-radius 5px
:border-radius 5px
&.closed &.closed
&:hover &:hover
:background :background
@ -936,8 +917,6 @@ label
:margin :margin
:top 4px :top 4px
:color #000 :color #000
:font
:family 'Arial', 'Helvetica', sans-serif
ul ul
:margin 0 :margin 0
@ -998,20 +977,22 @@ label
input input
:display inline :display inline
:border none :background-color #888
:background-color #eee :border
:top 1px solid #111
:font :font
:size 12px :size 12px
:-webkit-box-shadow 0 1px 1px #666
:border 1px solid #000 :border 1px solid #000
:opacity 0.5
&:hover &:hover
:opacity 0.8 :background-color #ccc
&.active &.active
:opacity 1 :background-color #eee
input[type='search'] input[type='search']
:width 200px :width 200px