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

diff --combined app/assets/stylesheets/common.scss
index 260504ac3314ebfda02d7384a153d3ad063cf3c8,3055d87aff0d71e67b9538b5dc61835abb5262f9..e3b79c5913b5e24ccbe6d4f3ad12d1a3c8222706
--- 1/app/assets/stylesheets/common.scss
--- 2/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@@ -30,6 -30,11 +30,6 @@@ small, aside 
  
  #container { position: relative; }
  
 -.column-1 {
 -  width: 50%;
 -  margin: 0 0 $lineheight/2 0;
 -}
 -
  .small_icon {
    vertical-align: middle;
    margin-right: $lineheight/4;
@@@ -96,10 -101,6 +96,10 @@@ a 
    }
  }
  
 +.text-muted a {
 +  color: $blue;
 +}
 +
  /* Rules for the header */
  
  #menu-icon {
@@@ -1195,16 -1196,6 +1195,6 @@@ tr.turn:hover 
    background: $lightgrey;
  }
  
- .content-body {
-   h1, h2, h3, p, ul, ol {
-     margin-bottom: $lineheight;
-   }
- 
-   h1, h2, h3 {
-     margin-top: $lineheight/2;
-   }
- }
- 
  .content-inner {
    position: relative;
    max-width: 900px;
@@@ -1270,15 -1261,12 +1260,15 @@@
  /* Rules for small maps in content areas */
  
  .content_map {
 -  position: relative;
 -  width: 45%;
 -  height: 400px;
 +  height: 200px;
    border: 1px solid $grey;
    margin-bottom: $lineheight;
 -  float: right;
 +}
 +
 +@include media-breakpoint-up(md) {
 +  .content_map {
 +    height: 400px;
 +  }
  }
  
  /* Rules for the new trace form */
@@@ -1308,21 -1296,14 +1298,14 @@@
  /* Rules for the user profile page */
  
  #userinformation {
- 
    min-height: 100px;
    .userinformation-inner {
      float: left;
    }
-   h2 {
-     margin-top: 0;
-   }
    .user-description {
      width: 100%;
      clear: both;
    }
-   .deemphasize {
-     margin: 0;
-   }
  }
  
  .admin-user-info small {
@@@ -1331,6 -1312,16 +1314,6 @@@
    margin-right: $lineheight;
  }
  
 -.activity-block {
 -  clear: left;
 -  border-bottom: 1px solid $grey;
 -  padding-bottom: $lineheight;
 -  float: left;
 -  h3 {
 -    margin-bottom: $lineheight/2;
 -  }
 -}
 -
  .contact-activity {
    margin-top: $lineheight;
    width: 100%;
@@@ -1409,7 -1400,7 +1392,7 @@@
      margin-top: $lineheight/2;
    }
  
 -  &.deemphasize {
 +  &.deleted {
      background-color: #fee;
    }
  
@@@ -1464,7 -1455,7 +1447,7 @@@
        padding-top: $lineheight;
        border-top: 1px solid $grey;
      }
 -    &.deemphasize {
 +    &.deleted {
        background-color: #fee;
      }
      p {
@@@ -1559,6 -1550,11 +1542,6 @@@
    display: inline !important;
  }
  
 -.content_map.settings_map {
 -  width: 50%;
 -  float: none;
 -}
 -
  /* Rules for the oauth settings page */
  
  .oauth_clients .buttons .oauth-edit {

diff --combined app/assets/stylesheets/small.scss
index 4b741baaed981cb65afe892ce39b866145fe1146,63edfd459b0109b9b32c98d2e772127937baac10..701d1046580e5d03efae23344e504ba29a5e6bdd
--- 1/app/assets/stylesheets/small.scss
--- 2/app/assets/stylesheets/small.scss
+++ b/app/assets/stylesheets/small.scss
@@@ -9,6 -9,10 +9,6 @@@ body.small 
      -webkit-appearance: none;
    }
  
 -  .column-1 {
 -    width: 100%;
 -  }
 -
    #menu-icon {
      display: inline-block !important;
    }
@@@ -87,7 -91,6 +87,6 @@@
    .compact-hide {
      display: inline-block;
    }
-   
  
    .overlay-sidebar #sidebar .welcome.visible {
      display: none;
@@@ -101,6 -104,15 +100,6 @@@
      top: 10px !important;
    }
  
 -  .content_map {
 -    width: 100%;
 -    border: none;
 -    float: none;
 -    height: 200px;
 -    max-height: none;
 -    min-height: auto;
 -  }
 -
    /* Rules for the login form */
  
    #login_login input#user_email {
@@@ -129,6 -141,13 +128,6 @@@
      height: 300px !important;
    }
  
 -  #userinformation .deemphasize {
 -    position: relative;
 -    right: auto; left: auto;
 -    margin-top: 10px;
 -    top: auto;
 -  }
 -
    &.site-about #content .attr h1 {
      font-size: 28px;
    }