From ee9e187e5c238b03407dfc53f85d3becc625a2f2 Mon Sep 17 00:00:00 2001 From: danielvincent Date: Sat, 18 Dec 2010 19:45:50 -0800 Subject: [PATCH] fixed build, add photos has a solid border --- app/views/shared/_publisher.haml | 11 +++++------ features/step_definitions/posts_steps.rb | 2 +- public/stylesheets/sass/application.sass | 18 +++++++----------- 3 files changed, 13 insertions(+), 18 deletions(-) diff --git a/app/views/shared/_publisher.haml b/app/views/shared/_publisher.haml index 1f3313662..2fa8878ae 100644 --- a/app/views/shared/_publisher.haml +++ b/app/views/shared/_publisher.haml @@ -17,9 +17,8 @@ }); $("#publisher form").live("ajax:success", function(){ - $("#publisher").addClass("closed", function(){ - $("#photodropzone").find('li').remove(); - }); + $("#publisher").addClass("closed"); + $("#photodropzone").find('li').remove(); }); $("#click_to_share").find("a").bind("click", function(evt){ @@ -31,11 +30,11 @@ #publisher{:class=>"closed"} #click_to_share - = image_tag 'icons/doc_edit.png', :id => 'share_bubble' + = image_tag 'icons/doc_edit.png' - if aspect == :all - = link_to t('.share_with_all'), '#' + = link_to t('.share_with_all'), '#', :id => 'expand_publisher' - else - = link_to t('.post_a_message_to', :aspect => aspect), '#' + = link_to t('.post_a_message_to', :aspect => aspect), '#', :id => 'expand_publisher' .content_creation = form_for(StatusMessage.new, :remote => true) do |status| diff --git a/features/step_definitions/posts_steps.rb b/features/step_definitions/posts_steps.rb index 78e932678..2e10a5552 100644 --- a/features/step_definitions/posts_steps.rb +++ b/features/step_definitions/posts_steps.rb @@ -1,3 +1,3 @@ When /^I click share across aspects$/ do - find("#content_creation_button").click + find("#expand_publisher").click end diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass index 450053904..8c0096ba6 100644 --- a/public/stylesheets/sass/application.sass +++ b/public/stylesheets/sass/application.sass @@ -376,7 +376,7 @@ li.message :right 5px &:hover - div.info, .time + div.info, .time, .from a :color #107FC9 &:hover @@ -640,14 +640,6 @@ li.message .right li.message:hover .right :display inline - .from - h4 - a - :color #107FC9 - &:hover - :color #22AAE0 - &:active - :color #005D9C .request_buttons :position absolute @@ -848,7 +840,7 @@ label :weight bold :text-shadow 0 1px 0 #fff - #share_bubble + img :display inline :position absolute :top 1em @@ -865,13 +857,17 @@ label :-moz-border-radius 5px :border-radius 5px - :border 2px dashed #ccc + :border 2px solid #ccc + :background + :color #fafafa :padding 0.3em + :cursor pointer :font :weight bold :size smaller + :text :align center :shadow 0 1px 0 #eee