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

diff --combined app/assets/stylesheets/common.scss
index fe36932675dbdd9fac796e97954ee241926396e7,87f262ff0336b02a4f3a7f2a99cd16c782da2911..d9fa276ba6f93eff9a5172774219d0da68c7a9d1
--- 1/app/assets/stylesheets/common.scss
--- 2/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@@ -79,16 -79,6 +79,16 @@@ a 
    color: $blue;
  }
  
 +/* Rules for borders */
 +/* These add additional colours to those provided by bootstrap */
 +.border-grey {
 +  border-color: $grey !important;
 +}
 +
 +.border-lightgrey {
 +  border-color: $lightgrey !important;
 +}
 +
  /* Rules for the header */
  
  #menu-icon {
@@@ -226,6 -216,11 +226,6 @@@ nav.secondary 
      }
    }
  
 -  img.user_thumbnail_tiny {
 -    border: 0;
 -    border-radius: 3px;
 -  }
 -
    #inboxanchor {
      display: inline-block;
      height: 25px;
@@@ -393,6 -388,23 +393,6 @@@ body.compact-nav 
          top: 20px;
        }
      }
 -
 -    .icon.close {
 -      float: right;
 -      cursor: pointer;
 -    }
 -
 -    .flash {
 -      padding: 15px;
 -
 -      picture {
 -        margin-right: -25px;
 -      }
 -
 -      div.message {
 -        margin-left: 30px;
 -      }
 -    }
    }
  
    .overlay-sidebar #sidebar {
@@@ -807,8 -819,38 +807,8 @@@ tr.turn:hover 
      border-bottom: none;
    }
  
 -  .paginate {
 -    float: right;
 -    padding: 1px 6px;
 -    border: 1px solid $lightgrey;
 -    border-radius: 3px;
 -  }
 -
 -  .browse-field {
 -    margin-bottom: 10px;
 -
 -    h4 {
 -      padding: 5px 0 5px 10px;
 -      font-size: 12px;
 -      border: 1px solid $grey;
 -      border-radius: 4px 4px 0 0;
 -      background-color: $offwhite;
 -    }
 -
 -    p {
 -      padding: 7px 10px;
 -      font-size: 12px;
 -      background-color: #FFF;
 -      border: 1px solid $grey;
 -      border-top: 0;
 -      border-radius: 0 0 4px 4px;
 -    }
 -  }
 -
    .browse-tag-list {
      background-color: $offwhite;
 -    border: 1px solid $grey;
 -    border-radius: 3px;
      table-layout: fixed;
      border-collapse: separate;
      border-spacing: 0;
@@@ -860,6 -902,16 +860,6 @@@
      }
    }
  
 -  .comments-header {
 -    float: left;
 -  }
 -
 -  .subscribe-buttons {
 -    float: left;
 -    margin: 0 10px;
 -    min-width: 80px;
 -  }
 -
    .subscribe-buttons input {
      font-size: 90%;
      line-height: 15px;
@@@ -921,6 -973,8 +921,6 @@@
  
    .export_boxy {
      background: $lightgrey;
 -    border: 1px solid $grey;
 -    border-radius: 3px;
  
      #maxlat { margin-top: -1px; }
      #minlon {
@@@ -1028,6 -1082,7 +1028,6 @@@
  
  .content_map {
    height: 200px;
 -  border: 1px solid $grey;
    margin-bottom: $lineheight;
  }
  
@@@ -1069,9 -1124,26 +1069,9 @@@
    padding-bottom: $lineheight/2;
    border-top: 1px solid $grey;
  
 -  &:first-of-type {
 -    margin-top: $lineheight/2;
 -  }
 -
    &.deleted {
      background-color: #fee;
    }
 -
 -  .post_heading {
 -    margin-bottom: $lineheight;
 -
 -    h2 {
 -      margin-top: 0;
 -      margin-bottom: $lineheight/2;
 -    }
 -  }
 -
 -  img.user_thumbnail {
 -    float: left;
 -  }
  }
  
  /* Rules for the diary entry page */
@@@ -1079,6 -1151,7 +1079,6 @@@
  .diary_entries {
    #map {
      height: 400px;
 -    border: 1px solid $grey;
      display: none;
      margin-bottom: $lineheight;
    }
@@@ -1107,6 -1180,10 +1107,6 @@@
    }
  }
  
 -.diary_entries-show img.user_thumbnail {
 -  float: left;
 -}
 -
  /* Rules for the log in page */
  
  #login_auth_buttons {
@@@ -1122,6 -1199,7 +1122,6 @@@
  
  .users-terms {
    .legale {
 -    border: 1px solid $grey;
      padding: $lineheight;
      margin-bottom: $lineheight;
      overflow: auto;
@@@ -1234,8 -1312,6 +1234,6 @@@
  /* Rules for "flash" notice boxes shown at the top of the content area */
  
  .flash {
-   padding: $lineheight;
- 
    &.error {
      background-color: #ff7070;
    }
@@@ -1319,11 -1395,13 +1317,11 @@@
  img.user_image {
    max-width: 100px;
    max-height: 100px;
 -  border: 1px solid $grey;
  }
  
  img.user_thumbnail {
    max-width: 50px;
    max-height: 50px;
 -  border: 1px solid $grey;
  }
  
  img.user_thumbnail_tiny {
@@@ -1331,6 -1409,7 +1329,6 @@@
    height: auto;
    max-width: 25px;
    max-height: 25px;
 -  border: 1px solid $grey;
  }
  
  /* Rules for geo microformats */