From c5e0c616b5f96a18a66a2f8e765443f224c7d7d7 Mon Sep 17 00:00:00 2001 From: danielvincent Date: Fri, 7 Jan 2011 18:08:53 -0800 Subject: [PATCH] share with pane styles fixed --- app/views/aspects/_new_aspect.haml | 5 ++- app/views/aspects/edit.html.haml | 2 +- app/views/people/share_with.html.haml | 11 +++--- public/stylesheets/sass/application.sass | 50 ++++++++++++------------ 4 files changed, 34 insertions(+), 34 deletions(-) diff --git a/app/views/aspects/_new_aspect.haml b/app/views/aspects/_new_aspect.haml index 2fb7a18f9..e15eab1f3 100644 --- a/app/views/aspects/_new_aspect.haml +++ b/app/views/aspects/_new_aspect.haml @@ -3,8 +3,9 @@ -# the COPYRIGHT file. .span-12.last - .modal_title_bar - %h4= t('aspects.manage.add_a_new_aspect') + #facebox_header + %h4 + = t('aspects.manage.add_a_new_aspect') = form_for Aspect.new do |aspect| = aspect.error_messages diff --git a/app/views/aspects/edit.html.haml b/app/views/aspects/edit.html.haml index 0e56711b8..011a1d473 100644 --- a/app/views/aspects/edit.html.haml +++ b/app/views/aspects/edit.html.haml @@ -6,7 +6,7 @@ = include_javascripts :aspects #aspect_edit_pane - #aspect_edit_pane_header + #facebox_header %h4 = @aspect .description diff --git a/app/views/people/share_with.html.haml b/app/views/people/share_with.html.haml index b6fc5d144..851f17ffe 100644 --- a/app/views/people/share_with.html.haml +++ b/app/views/people/share_with.html.haml @@ -3,12 +3,13 @@ -# the COPYRIGHT file. #share_with - .share_with_header - = person_image_link(@person, :size => :thumb_medium) - %h3 + #facebox_header + = person_image_link(@person, :size => :thumb_small) + %h4 = t('.share_with', :name => @person.name) - %p - = t('.accepts', :name => @person.first_name) + + .description + = t('.accepts', :name => @person.first_name) = render :partial => 'share_with_pane', :locals => {:person => @person, diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass index 8a5f6cc2d..3e42c35d8 100644 --- a/public/stylesheets/sass/application.sass +++ b/public/stylesheets/sass/application.sass @@ -2052,18 +2052,17 @@ h3,h4 :min-width 400px :max-width 400px - .share_with_header - :min-height 100px - .avatar - :width 100px - :height 100px + :width 50px + :height 50px :float left - h3,p + + h4,p :padding - :left 120px - h3 - :margin 0 + :left 64px + + p + :color #eee #aspects_list :height auto @@ -2125,23 +2124,6 @@ ul.show_comments :right 0.5em #aspect_edit_pane - - #aspect_edit_pane_header - :padding 1em - :background - :color #222 - :border - :bottom 1px solid #777 - - :-webkit-border-radius 5px 5px 0 0 - :-moz-border-radius 5px 5px 0 0 - :border-radius 5px 5px 0 0 - - h4 - :color #eee - :margin - :bottom 0 - :width 400px .person_tiles .tile @@ -2162,6 +2144,22 @@ ul.show_comments :position absolute :left 6px +#facebox_header + :padding 1em + :background + :color #222 + :border + :bottom 1px solid #777 + + :-webkit-border-radius 5px 5px 0 0 + :-moz-border-radius 5px 5px 0 0 + :border-radius 5px 5px 0 0 + + h4 + :color #eee + :margin + :bottom 0 + #aspect_edit_controls :margin :top 8px