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

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index db03b94abe5602ed50b1ee6afd8720129d21fef2..ba976ff2b8996e352ae43ca2a8e1fa31a7433b4c 100644 (file)
--- 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;
@@ -1067,4 +1063,12 @@ 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);
+  margin-bottom: -1px;
+}
+
 @import 'browse';

diff --git a/app/assets/stylesheets/parameters.scss b/app/assets/stylesheets/parameters.scss
index 2054649776c8b50d146e35da3b0987b275be6f4a..e6c15a92014f8afc10fd25b7e61a2b202ee39dd7 100644 (file)
--- 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;

diff --git a/app/views/layouts/_content.html.erb b/app/views/layouts/_content.html.erb
index cfb8d712cc7ebef8873640b03c6f1ebb151a467a..9e28c0771b867d49122a178f181aed49bbd962b3 100644 (file)
--- 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 border-bottom border-secondary-subtle">
         <div class="content-inner <%= yield :heading_class %>">
           <%= yield :heading %>
         </div>

diff --git a/app/views/traces/index.html.erb b/app/views/traces/index.html.erb
index 5ec9127a8663cb8365580cf34e4571792fb9cb8f..3f1e0f0d531d88f922a5a166d3903bea3b2170bc 100644 (file)
--- 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" />