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

Fix: displaying more than one row of image attachments broke publisher

Browse source
This commit is contained in:
Faldrian 2014-11-06 00:21:01 +01:00
parent c7f4051ac0
commit d928c69e36
2 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
app/assets/stylesheets/publisher_blueprint.css.scss
View file

@ -36,6 +36,12 @@
textarea { textarea {
margin-bottom: 30px; margin-bottom: 30px;
} }
#publisher_textarea_wrapper.with_attachments {
textarea {
margin-bottom: 20px;
}
}
} }
.mentions-autocomplete-list ul { .mentions-autocomplete-list ul {
@ -183,6 +189,7 @@
.markdownIndications { .markdownIndications {
position: absolute; position: absolute;
bottom: 0px; bottom: 0px;
left: 5px;
} }
@include border-radius(2px); @include border-radius(2px);
@ -208,16 +215,11 @@
} }
&.with_attachments { &.with_attachments {
padding-bottom: 38px; padding-bottom: 25px;
} }
#photodropzone { #photodropzone {
z-index: 3; margin: 0 5px;
position: absolute;
bottom: 15px;
right: 35px;
width: 430px;
left: 5px;
padding: 0; padding: 0;
li { li {
@ -298,8 +300,6 @@
} }
#publisher-images { #publisher-images {
padding-left: 5px;
#locator { #locator {
bottom: 1px !important; bottom: 1px !important;
display: inline-block; display: inline-block;

3
app/views/publisher/_publisher_blueprint.html.haml
View file

@ -16,7 +16,6 @@
%params %params
#publisher_textarea_wrapper #publisher_textarea_wrapper
= link_to(content_tag(:div, nil, :class => 'icons-deletelabel'), "#", :id => "hide_publisher", :title => t('shared.publisher.discard_post')) = link_to(content_tag(:div, nil, :class => 'icons-deletelabel'), "#", :id => "hide_publisher", :title => t('shared.publisher.discard_post'))
%ul#photodropzone
- if current_user.getting_started? - if current_user.getting_started?
= status.text_area :fake_text, :rows => 2, :value => h(publisher_formatted_text), :tabindex => 1, :placeholder => "#{t('contacts.index.start_a_conversation')}...", = status.text_area :fake_text, :rows => 2, :value => h(publisher_formatted_text), :tabindex => 1, :placeholder => "#{t('contacts.index.start_a_conversation')}...",
:title => popover_with_close_html( '1. ' + t('shared.public_explain.share') ), :title => popover_with_close_html( '1. ' + t('shared.public_explain.share') ),
@ -24,7 +23,7 @@
- else - else
= status.text_area :fake_text, :rows => 2, :value => h(publisher_formatted_text), :tabindex => 1, :placeholder => "#{t('contacts.index.start_a_conversation')}..." = status.text_area :fake_text, :rows => 2, :value => h(publisher_formatted_text), :tabindex => 1, :placeholder => "#{t('contacts.index.start_a_conversation')}..."
= status.hidden_field :text, :value => h(publisher_hidden_text), :class => 'clear_on_submit' = status.hidden_field :text, :value => h(publisher_hidden_text), :class => 'clear_on_submit'
%ul#photodropzone
%span#publisher-images %span#publisher-images
%span.markdownIndications %span.markdownIndications
!= t('shared.publisher.formatWithMarkdown', markdown_link: link_to(t('help.markdown'), 'https://diasporafoundation.org/formatting', target: :blank)) != t('shared.publisher.formatWithMarkdown', markdown_link: link_to(t('help.markdown'), 'https://diasporafoundation.org/formatting', target: :blank))