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

[rails.git] / app / assets / stylesheets / common.scss

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 187d6a83c88d7eddcc9fad257279bd9806e90654..eac3f7417aa5a1c25fd281c1ab27bbed81878561 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -150,11 +150,6 @@ nav.primary {
 nav.secondary {
   .nav-link {
     padding: 0.2rem;
-    color: $darkgrey;
-  }
-
-  > ul li.current a {
-    color: darken($darkgrey, 25%);
   }
 
   #inboxanchor {
@@ -693,16 +688,15 @@ tr.turn:hover {
   .export_boxy {
     background: $lightgrey;
 
-    #maxlat { margin-top: -1px; }
+    > * {
+        margin: -1px;
+    }
     #minlon {
-      float: left;
-      /*rtl:ignore*/ margin-left: -1px;
+      /*rtl:ignore*/ float: left;
     }
     #maxlon {
-      float: right;
-      /*rtl:ignore*/ margin-right: -1px;
+      /*rtl:ignore*/ float: right;
     }
-    #minlat { margin-bottom: -1px; }
   }
 }
 
@@ -847,8 +841,6 @@ tr.turn:hover {
 }
 
 .search_form {
-  background-color: $lightgrey;
-
   #query {
     z-index: 0;
   }
@@ -858,10 +850,6 @@ tr.turn:hover {
   }
 }
 
-.directions_form {
-  background-color: $lightgrey;
-}
-
 /* Rules for user images */
 
 img.user_image {
@@ -1063,4 +1051,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';