make css nicer

update Changelog

remove weird merge thing

think of the padding and margin

Changelog.md

@@ -101,6 +101,7 @@ diaspora.yml file**. The existing settings from 0.4.x and before will not work a
 * Partial Backbone port of the notification dropdown [#5707](https://github.com/diaspora/diaspora/pull/5707)
 * 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)
+* Rewrite slide effect in conversations as css transition for better performance
 
 ## Bug fixes
 * orca cannot see 'Add Contact' button [#5158](https://github.com/diaspora/diaspora/pull/5158)

app/assets/javascripts/inbox.js

@@ -1,24 +1,5 @@
 // @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3-or-Later
 $(document).ready(function(){
-
-  if ($('#first_unread').length > 0) {
-    $("html").scrollTop($('#first_unread').offset().top-45);
-  }
-
-  $('time.timeago').each(function(i,e) {
-    var jqe = $(e);
-    jqe.attr('data-original-title', new Date(jqe.attr('datetime')).toLocaleString());
-    jqe.attr('title', '');
-  });
-
-  $('.timeago').tooltip();
-  $('.timeago').timeago();
-
-  $('time.timeago').each(function(i,e) {
-    var jqe = $(e);
-    jqe.attr('title', '');
-  });
-
   $(document).on('click', '.conversation-wrapper', function(){
     var conversation_path = $(this).data('conversation-path');
     $.getScript(conversation_path, function() {

app/assets/stylesheets/conversations.scss

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