added placeholder; force autofill off on comment fields; touched up mobile reshare view
This commit is contained in:
parent
744ab579bd
commit
9b057bdf16
4 changed files with 17 additions and 11 deletions
|
|
@ -2,9 +2,9 @@
|
||||||
-# licensed under the Affero General Public License version 3 or later. See
|
-# licensed under the Affero General Public License version 3 or later. See
|
||||||
-# the COPYRIGHT file.
|
-# the COPYRIGHT file.
|
||||||
|
|
||||||
= form_tag( post_comments_path(post_id), :id => "new_comment_on_#{post_id}", :class => 'new_comment') do
|
= form_tag( post_comments_path(post_id), :id => "new_comment_on_#{post_id}", :class => 'new_comment', :autocomplete => "off") do
|
||||||
= hidden_field_tag :post_id, post_id, :id => "post_id_on_#{post_id}"
|
= hidden_field_tag :post_id, post_id, :id => "post_id_on_#{post_id}"
|
||||||
= text_area_tag :text, nil, :rows => 2, :class => "comment_box",:id => "comment_text_on_#{post_id}"
|
= text_area_tag :text, nil, :rows => 2, :class => "comment_box",:id => "comment_text_on_#{post_id}", :placeholder => t('.comment')
|
||||||
|
|
||||||
.actions
|
.actions
|
||||||
= link_to "Cancel", post_path(post_id), :class => "cancel_new_comment btn"
|
= link_to "Cancel", post_path(post_id), :class => "cancel_new_comment btn"
|
||||||
|
|
|
||||||
|
|
@ -6,6 +6,3 @@
|
||||||
= render :partial => 'shared/stream_element',
|
= render :partial => 'shared/stream_element',
|
||||||
:locals => {:post => @post, :commenting_disabled => defined?(@commenting_disabled),
|
:locals => {:post => @post, :commenting_disabled => defined?(@commenting_disabled),
|
||||||
:expanded_info => true}
|
:expanded_info => true}
|
||||||
|
|
||||||
/.stream.show{:data=>{:guid=>@post.id}}
|
|
||||||
/ = render "comments/comments", :post => @post, :comments => @post.comments, :comments_expanded => true
|
|
||||||
|
|
|
||||||
|
|
@ -2,12 +2,18 @@
|
||||||
-# licensed under the Affero General Public License version 3 or later. See
|
-# licensed under the Affero General Public License version 3 or later. See
|
||||||
-# the COPYRIGHT file.
|
-# the COPYRIGHT file.
|
||||||
|
|
||||||
|
|
||||||
.reshare
|
.reshare
|
||||||
- if post
|
- if post
|
||||||
.content
|
.content
|
||||||
.from
|
.from
|
||||||
|
= person_image_link(post.author, :size => :thumb_small)
|
||||||
= person_link(post.author)
|
= person_link(post.author)
|
||||||
|
.info
|
||||||
|
%span.time{:integer => post.created_at.to_i}
|
||||||
|
= t('ago', :time => time_ago_in_words(post.created_at))
|
||||||
|
%span.via
|
||||||
|
- if post.activity_streams?
|
||||||
|
= t('.via', :link => link_to("#{post.provider_display_name}", post.actor_url)).html_safe
|
||||||
|
|
||||||
- if post.activity_streams?
|
- if post.activity_streams?
|
||||||
= link_to image_tag(post.image_url, 'data-small-photo' => post.image_url, 'data-full-photo' => post.image_url, :class => 'stream-photo'), post.object_url, :class => "stream-photo-link"
|
= link_to image_tag(post.image_url, 'data-small-photo' => post.image_url, 'data-full-photo' => post.image_url, :class => 'stream-photo'), post.object_url, :class => "stream-photo-link"
|
||||||
|
|
|
||||||
|
|
@ -55,7 +55,7 @@ body {
|
||||||
weight: bold !important; }; }
|
weight: bold !important; }; }
|
||||||
margin-bottom: 2px;
|
margin-bottom: 2px;
|
||||||
height: 45px; }
|
height: 45px; }
|
||||||
.content {
|
> .content {
|
||||||
padding: 10px {
|
padding: 10px {
|
||||||
bottom: 0; }; }
|
bottom: 0; }; }
|
||||||
padding: 10px 0;
|
padding: 10px 0;
|
||||||
|
|
@ -164,9 +164,12 @@ body {
|
||||||
|
|
||||||
.reshare {
|
.reshare {
|
||||||
.content {
|
.content {
|
||||||
|
border: {
|
||||||
|
left: 3px solid #ccc;
|
||||||
|
}
|
||||||
padding: {
|
padding: {
|
||||||
left: 15px;
|
left: 5px;
|
||||||
top: 10px; };
|
top: 0px; };
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -485,14 +488,14 @@ input[type=submit] {
|
||||||
.post_stats {
|
.post_stats {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
font-size: larger;
|
font-size: larger;
|
||||||
right: 11px;
|
right: 10px;
|
||||||
top: 38px;
|
top: 38px;
|
||||||
z-index: 2;
|
z-index: 2;
|
||||||
span {
|
span {
|
||||||
color: #666;
|
color: #666;
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
padding: 2px 7px;
|
padding: 2px 7px;
|
||||||
margin: 5px 5px;
|
margin: 5px 6px;
|
||||||
background: {
|
background: {
|
||||||
color: #eee;
|
color: #eee;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue