Merge remote-tracking branch 'upstream/pull/4144'

diff --combined app/assets/stylesheets/common.scss
index f7192a68eaf5ac34cd9a4d31e77233de19e4a8fc,5b15fcc5d31cdbfd7cd604d8211b7d5542c5ca83..b694247a880bfb5d4ae362b7782c5dc5ae5d674e
--- 1/app/assets/stylesheets/common.scss
--- 2/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@@ -1047,49 -1047,24 +1047,24 @@@ tr.turn:hover 
    width: 100%;
  }
  
- /* Rules for the diary list page */
- 
- .diary_post {
-   position: relative;
-   padding-top: $lineheight;
-   padding-bottom: $lineheight/2;
-   border-top: 1px solid $grey;
- 
-   &.deleted {
-     background-color: #fee;
-   }
- }
- 
  /* Rules for the diary entry page */
  
  .diary_entries {
    #map {
      height: 400px;
      display: none;
-     margin-bottom: $lineheight;
    }
    .comments {
      max-width: 740px;
    }
    .diary-comment {
      border-top: 1px dashed $grey;
-     padding-top: $lineheight/2;
-     padding-bottom: $lineheight/2;
      &:first-child {
-       margin-top: $lineheight/2;
-       padding-top: $lineheight;
        border-top: 1px solid $grey;
      }
-     &.deleted {
-       background-color: #fee;
-     }
      p {
        margin-bottom: $lineheight/2;
      }
-     .comment-heading {
-       margin-bottom: 0;
-       margin-top: 0;
-     }
    }
  }
  
@@@ -1132,6 -1107,11 +1107,6 @@@
  /* Rules for messages pages */
  
  .messages {
 -  button[type="submit"] {
 -    margin: auto;
 -    white-space: nowrap;
 -  }
 -
    .inbox-row {
      background: $offwhite;
    }
@@@ -1141,6 -1121,24 +1116,6 @@@
    }
  }
  
 -.inbox-row .inbox-mark-read {
 -  display: none;
 -}
 -
 -.inbox-sent {
 -  white-space: nowrap;
 -}
 -
 -.inbox-mark-unread,
 -.inbox-mark-read,
 -.inbox-delete {
 -  width: 1%;
 -}
 -
 -.inbox-row-unread .inbox-mark-unread {
 -  display: none;
 -}
 -
  .search_form {
    background-color: $lightgrey;