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

fixed build, add photos has a solid border

Browse source
This commit is contained in:
danielvincent 2010-12-18 19:45:50 -08:00
parent 7b4da22617
commit ee9e187e5c
3 changed files with 13 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/views/shared/_publisher.haml
View file

@ -17,9 +17,8 @@
}); });
$("#publisher form").live("ajax:success", function(){ $("#publisher form").live("ajax:success", function(){
$("#publisher").addClass("closed", function(){ $("#publisher").addClass("closed");
$("#photodropzone").find('li').remove(); $("#photodropzone").find('li').remove();
});
}); });
$("#click_to_share").find("a").bind("click", function(evt){ $("#click_to_share").find("a").bind("click", function(evt){
@ -31,11 +30,11 @@
#publisher{:class=>"closed"} #publisher{:class=>"closed"}
#click_to_share #click_to_share
= image_tag 'icons/doc_edit.png', :id => 'share_bubble' = image_tag 'icons/doc_edit.png'
- if aspect == :all - if aspect == :all
= link_to t('.share_with_all'), '#' = link_to t('.share_with_all'), '#', :id => 'expand_publisher'
- else - else
= link_to t('.post_a_message_to', :aspect => aspect), '#' = link_to t('.post_a_message_to', :aspect => aspect), '#', :id => 'expand_publisher'
.content_creation .content_creation
= form_for(StatusMessage.new, :remote => true) do |status| = form_for(StatusMessage.new, :remote => true) do |status|

2
features/step_definitions/posts_steps.rb
View file

@ -1,3 +1,3 @@
When /^I click share across aspects$/ do When /^I click share across aspects$/ do
find("#content_creation_button").click find("#expand_publisher").click
end end

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

@ -376,7 +376,7 @@ li.message
:right 5px :right 5px
&:hover &:hover
div.info, .time div.info, .time, .from
a a
:color #107FC9 :color #107FC9
&:hover &:hover
@ -640,14 +640,6 @@ li.message .right
li.message:hover li.message:hover
.right .right
:display inline :display inline
.from
h4
a
:color #107FC9
&:hover
:color #22AAE0
&:active
:color #005D9C
.request_buttons .request_buttons
:position absolute :position absolute
@ -848,7 +840,7 @@ label
:weight bold :weight bold
:text-shadow 0 1px 0 #fff :text-shadow 0 1px 0 #fff
#share_bubble img
:display inline :display inline
:position absolute :position absolute
:top 1em :top 1em
@ -865,13 +857,17 @@ label
:-moz-border-radius 5px :-moz-border-radius 5px
:border-radius 5px :border-radius 5px
:border 2px dashed #ccc :border 2px solid #ccc
:background
:color #fafafa
:padding 0.3em :padding 0.3em
:cursor pointer
:font :font
:weight bold :weight bold
:size smaller :size smaller
:text :text
:align center :align center
:shadow 0 1px 0 #eee :shadow 0 1px 0 #eee