From: Tom Hughes <tom@compton.nu>
Date: Wed, 8 Jul 2020 18:10:01 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/2698'
X-Git-Tag: live~3046
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/cfb2f2988c0a396f2d2b167d3c75461b7e811e1c?hp=efa2c20bff4d68cfdaf5fc532ba5eb0711e7cd2d

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

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 260504ac3..e3b79c591 100644
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -1195,16 +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;
@@ -1308,21 +1298,14 @@ tr.turn:hover {
 /* 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 {
diff --git a/app/assets/stylesheets/small.scss b/app/assets/stylesheets/small.scss
index 4b741baae..701d10465 100644
--- a/app/assets/stylesheets/small.scss
+++ b/app/assets/stylesheets/small.scss
@@ -87,7 +87,6 @@ body.small {
   .compact-hide {
     display: inline-block;
   }
-  
 
   .overlay-sidebar #sidebar .welcome.visible {
     display: none;
diff --git a/app/views/traces/index.html.erb b/app/views/traces/index.html.erb
index 86ac37f00..609dbcede 100644
--- a/app/views/traces/index.html.erb
+++ b/app/views/traces/index.html.erb
@@ -26,12 +26,6 @@
   <%= render :partial => "trace_paging_nav" %>
 
   <table id="trace_list" class="table table-borderless table-striped">
-    <thead>
-      <tr>
-        <th></th>
-        <th></th>
-      </tr>
-    </thead>
     <tbody>
       <%= render @traces unless @traces.nil? %>
     </tbody>