From 7e5abf446783428f21748324b08c380a520606b0 Mon Sep 17 00:00:00 2001
From: Anton Khorev <tony29@yandex.ru>
Date: Sun, 7 Apr 2024 16:23:33 +0300
Subject: [PATCH 1/4] Use default table stripe color

---
 app/assets/stylesheets/parameters.scss | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/assets/stylesheets/parameters.scss b/app/assets/stylesheets/parameters.scss
index 2054649776..e6c15a9201 100644
--- a/app/assets/stylesheets/parameters.scss
+++ b/app/assets/stylesheets/parameters.scss
@@ -20,6 +20,4 @@ $link-hover-color: #24d;
 $link-decoration: none;
 $link-hover-decoration: underline;
 
-$table-striped-bg: $offwhite;
-
 $enable-negative-margins: true;

From 55d3b3369203a4f5b7cbf57f4b810e9ca2efc4b3 Mon Sep 17 00:00:00 2001
From: Anton Khorev <tony29@yandex.ru>
Date: Sun, 7 Apr 2024 16:27:07 +0300
Subject: [PATCH 2/4] Use secondary body background in heading sections

---
 app/assets/stylesheets/common.scss  | 4 ----
 app/views/layouts/_content.html.erb | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index db03b94abe..187d6a83c8 100644
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -719,10 +719,6 @@ tr.turn:hover {
 
 /* Rules for non-map content pages */
 
-.content-heading {
-  background: $lightgrey;
-}
-
 .content-inner {
   position: relative;
   max-width: 960px;
diff --git a/app/views/layouts/_content.html.erb b/app/views/layouts/_content.html.erb
index cfb8d712cc..bd5c43f02c 100644
--- a/app/views/layouts/_content.html.erb
+++ b/app/views/layouts/_content.html.erb
@@ -4,7 +4,7 @@
   <% else %>
     <%= render :partial => "layouts/flash", :locals => { :flash => flash } %>
     <% if content_for? :heading %>
-      <div class="content-heading">
+      <div class="content-heading bg-body-secondary">
         <div class="content-inner <%= yield :heading_class %>">
           <%= yield :heading %>
         </div>

From e7d82be15e6dea23625a1c503a56acde09188bad Mon Sep 17 00:00:00 2001
From: Anton Khorev <tony29@yandex.ru>
Date: Sun, 7 Apr 2024 16:27:31 +0300
Subject: [PATCH 3/4] Adapt tab borders to secondary body background

---
 app/assets/stylesheets/common.scss | 7 +++++++
 app/views/traces/index.html.erb    | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 187d6a83c8..95971c9f2f 100644
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -1063,4 +1063,11 @@ div.secondary-actions {
   }
 }
 
+/* Rules for tabs inside secondary background sections */
+
+.bg-body-secondary .nav-tabs {
+  --bs-border-color: var(--bs-secondary-border-subtle);
+  --bs-secondary-bg: var(--bs-secondary-border-subtle);
+}
+
 @import 'browse';
diff --git a/app/views/traces/index.html.erb b/app/views/traces/index.html.erb
index 5ec9127a86..3f1e0f0d53 100644
--- a/app/views/traces/index.html.erb
+++ b/app/views/traces/index.html.erb
@@ -48,7 +48,7 @@
     <% end %>
 
     <li class="nav-item ms-auto">
-      <div class="nav-link pe-0">
+      <div class="nav-link pe-0 border-0">
         <%= link_to({ :action => :georss, :display_name => @target_user&.display_name, :tag => params[:tag] }, { :class => "btn btn-secondary btn-sm my-n2 align-baseline border-0" }) do %>
           <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" class="align-text-bottom">
             <circle cx="2" cy="14" r="2" fill="white" />

From f3a9d2e9d61f3f596d559ac75d54c08bc60fc629 Mon Sep 17 00:00:00 2001
From: Anton Khorev <tony29@yandex.ru>
Date: Sun, 7 Apr 2024 17:28:55 +0300
Subject: [PATCH 4/4] Add a page-wide bottom border to heading sections

---
 app/assets/stylesheets/common.scss  | 1 +
 app/views/layouts/_content.html.erb | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 95971c9f2f..ba976ff2b8 100644
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -1068,6 +1068,7 @@ div.secondary-actions {
 .bg-body-secondary .nav-tabs {
   --bs-border-color: var(--bs-secondary-border-subtle);
   --bs-secondary-bg: var(--bs-secondary-border-subtle);
+  margin-bottom: -1px;
 }
 
 @import 'browse';
diff --git a/app/views/layouts/_content.html.erb b/app/views/layouts/_content.html.erb
index bd5c43f02c..9e28c0771b 100644
--- a/app/views/layouts/_content.html.erb
+++ b/app/views/layouts/_content.html.erb
@@ -4,7 +4,7 @@
   <% else %>
     <%= render :partial => "layouts/flash", :locals => { :flash => flash } %>
     <% if content_for? :heading %>
-      <div class="content-heading bg-body-secondary">
+      <div class="content-heading bg-body-secondary border-bottom border-secondary-subtle">
         <div class="content-inner <%= yield :heading_class %>">
           <%= yield :heading %>
         </div>