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

Merge pull request #5776 from lislis/rewrite-conversation-hover-in-css

Browse source 
Rewrite hover effect on conversations with multiple participants in css

Conflicts:
	Changelog.md
This commit is contained in:
Steffen van Bergerem 2015-03-14 17:36:00 +01:00
commit 194fc3ea71
3 changed files with 10 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -102,6 +102,7 @@ diaspora.yml file**. The existing settings from 0.4.x and before will not work a
* Add rounded corners for avatars [#5733](https://github.com/diaspora/diaspora/pull/5733) * Add rounded corners for avatars [#5733](https://github.com/diaspora/diaspora/pull/5733)
* Move registration form to a partial [#5764](https://github.com/diaspora/diaspora/pull/5764) * Move registration form to a partial [#5764](https://github.com/diaspora/diaspora/pull/5764)
* Add tests for liking and unliking posts [#5741](https://github.com/diaspora/diaspora/pull/5741) * Add tests for liking and unliking posts [#5741](https://github.com/diaspora/diaspora/pull/5741)
* Rewrite slide effect in conversations as css transition for better performance [#5776](https://github.com/diaspora/diaspora/pull/5776)
## Bug fixes ## Bug fixes
* orca cannot see 'Add Contact' button [#5158](https://github.com/diaspora/diaspora/pull/5158) * orca cannot see 'Add Contact' button [#5158](https://github.com/diaspora/diaspora/pull/5158)

10
app/assets/javascripts/app/views/conversations_view.js
View file

@ -5,8 +5,6 @@ app.views.Conversations = Backbone.View.extend({
el: "#conversations_container", el: "#conversations_container",
events: { events: {
"mouseenter .stream_element.conversation" : "showParticipants",
"mouseleave .stream_element.conversation" : "hideParticipants",
"conversation:loaded" : "setupConversation" "conversation:loaded" : "setupConversation"
}, },
@ -45,14 +43,6 @@ app.views.Conversations = Backbone.View.extend({
} else { } else {
$("html").animate({scrollTop:0}); $("html").animate({scrollTop:0});
} }
},
hideParticipants: function(e){
$(e.currentTarget).find('.participants').slideUp('300');
},
showParticipants: function(e){
$(e.currentTarget).find('.participants').slideDown('300');
} }
}); });
// @license-end // @license-end

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

@ -39,6 +39,12 @@
&:hover, &.unread:hover, &.selected:hover { &:hover, &.unread:hover, &.selected:hover {
background-color: lighten($blue,5%); background-color: lighten($blue,5%);
cursor: pointer; cursor: pointer;
.participants {
height: 25px;
margin-top: 5px;
padding-top: 5px;
border-color: rgba($border-grey, 1)
}
} }
&.unread { background-color: darken($background-white, 5%); } &.unread { background-color: darken($background-white, 5%); }
&.selected { background-color: $blue; } &.selected { background-color: $blue; }
@ -81,15 +87,13 @@
} }
.participants { .participants {
display: none;
float: left; float: left;
clear: both; clear: both;
margin-top: 5px; height: 0;
padding-top: 5px;
height: 25px;
width: 100%; width: 100%;
overflow: hidden; overflow: hidden;
border-top: 1px dotted $border-grey; border-top: 1px dotted rgba($border-grey, 0);
transition: height ease 300ms;
.avatar { .avatar {
margin: 0 5px 0 0; margin: 0 5px 0 0;
height: 25px; height: 25px;