diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/stylesheets/publisher_blueprint.css.scss | 24 | ||||
| -rw-r--r-- | app/views/publisher/_publisher_blueprint.html.haml | 3 |
2 files changed, 13 insertions, 14 deletions
diff --git a/app/assets/stylesheets/publisher_blueprint.css.scss b/app/assets/stylesheets/publisher_blueprint.css.scss index 95ea2ac45..66d34b479 100644 --- a/app/assets/stylesheets/publisher_blueprint.css.scss +++ b/app/assets/stylesheets/publisher_blueprint.css.scss @@ -36,8 +36,14 @@ textarea { margin-bottom: 30px; } + + #publisher_textarea_wrapper.with_attachments { + textarea { + margin-bottom: 20px; + } + } } - + .mentions-autocomplete-list ul { width: 483px; } @@ -64,7 +70,7 @@ .public_toggle { text-align: right; - + .dropdown { text-align: left; } @@ -179,10 +185,11 @@ @include opacity(1); } } - + .markdownIndications { position: absolute; bottom: 0px; + left: 5px; } @include border-radius(2px); @@ -208,16 +215,11 @@ } &.with_attachments { - padding-bottom: 38px; + padding-bottom: 25px; } #photodropzone { - z-index: 3; - position: absolute; - bottom: 15px; - right: 35px; - width: 430px; - left: 5px; + margin: 0 5px; padding: 0; li { @@ -298,8 +300,6 @@ } #publisher-images { - padding-left: 5px; - #locator { bottom: 1px !important; display: inline-block; diff --git a/app/views/publisher/_publisher_blueprint.html.haml b/app/views/publisher/_publisher_blueprint.html.haml index b43ea5512..d3bb109bb 100644 --- a/app/views/publisher/_publisher_blueprint.html.haml +++ b/app/views/publisher/_publisher_blueprint.html.haml @@ -16,7 +16,6 @@ %params #publisher_textarea_wrapper = 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? = 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') ), @@ -24,7 +23,7 @@ - else = 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' - + %ul#photodropzone %span#publisher-images %span.markdownIndications != t('shared.publisher.formatWithMarkdown', markdown_link: link_to(t('help.markdown'), 'https://diasporafoundation.org/formatting', target: :blank)) |