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

Improve no message text and delete icon for conversations, fix regressions

Browse source
This commit is contained in:
Steffen van Bergerem 2015-06-02 23:33:42 +02:00 committed by Jonne Haß
parent 0cbf581176
commit 8e9ceb9a2b
4 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/assets/stylesheets/conversations.scss
View file

@ -144,11 +144,12 @@
.hide_conversation, .delete_conversation {
display: block;
margin-top: 25px;
margin-top: 15px;
margin-left: 10px;
}
.avatar {
display: inline;
height: 30px;
width: 30px;
}
@ -224,10 +225,11 @@
#no_conversations,
#no_conversation_text {
color: $gray-light;
font-size: $font-size-h4;
font-weight: bold;
color: #ccc;
padding: 50px 0;
text-align: center;
margin-top: 100px;
}
#no_conversation_text {

2
app/assets/stylesheets/new_styles/_interactions.scss
View file

@ -13,7 +13,7 @@
}
&.hide_conversation i {
font-size: $line-height-base*1.5;
font-size: $line-height-computed*1.5;
}
&.delete_conversation i {

6
app/views/conversations/_message.haml
View file

@ -4,9 +4,9 @@
.stream_element{:data=>{:guid=>message.id}, :id => ('first_unread' if @first_unread_message_id == message.id)}
.media
.col-xs-1
= person_image_link(message.author, :size => :thumb_small)
.col-xs-11
.media-left
= person_image_link(message.author, size: :thumb_small, class: "media-object")
.media-body
= person_link(message.author, :class => 'author from')
= timeago(message.created_at)

5
app/views/conversations/_messages.haml
View file

@ -3,10 +3,9 @@
.stream_element.new_message
.media
.col-xs-1
.media-left
= owner_image_tag(:thumb_small)
.col-xs-11
.media-body
= form_for [conversation, Message.new], html: {class: "control-group"} do |message|
= message.text_area :text, rows: 5, tabindex: 1, class: "form-control form-group"
= message.submit t("conversations.show.reply").capitalize,