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

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

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index ba976ff2b8996e352ae43ca2a8e1fa31a7433b4c..ed79a7cec0d06ffb968d83887294508bc90e6b5a 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 {
@@ -382,7 +377,6 @@ body.small-nav {
     float: right;
     width: 250px;
     height: 100%;
-    background: white;
     overflow: auto;
 
     .section {
@@ -434,7 +428,7 @@ body.small-nav {
     li  {
       overflow: hidden;
       border-radius: 3px;
-      border: 2px solid #fff;
+      border: 2px solid transparent;
       margin-bottom: 8px;
       position: relative;
       transition: border-color 0.08s ease-in;
@@ -448,8 +442,8 @@ body.small-nav {
         cursor: pointer;
         font-weight: 600;
         font-size: 16px;
-        text-stroke: 2px #fff;
-        background: rgba(255,255,255,.9);
+        background-color: var(--bs-body-bg);
+        opacity: 0.9;
         z-index: 1000;
         input[type="radio"] {
           display: none;
@@ -691,18 +685,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 +838,6 @@ tr.turn:hover {
 }
 
 .search_form {
-  background-color: $lightgrey;
-
   #query {
     z-index: 0;
   }
@@ -858,10 +847,6 @@ tr.turn:hover {
   }
 }
 
-.directions_form {
-  background-color: $lightgrey;
-}
-
 /* Rules for user images */
 
 img.user_image {
@@ -913,12 +898,12 @@ div.secondary-actions {
 .richtext,
 .prose {
   code {
-    background: $lightgrey;
+    background: var(--bs-secondary-bg);
     padding: 2px 3px;
   }
 
   pre {
-    background: $lightgrey;
+    background: var(--bs-secondary-bg);
     padding: 2px 3px;
     white-space: pre-wrap;
 
@@ -929,17 +914,17 @@ div.secondary-actions {
 
   img {
     padding: $lineheight;
-    background-color: $offwhite;
+    background-color: var(--bs-tertiary-bg);
     display: block;
     max-width: 100%;
     margin: auto;
   }
 
   blockquote {
-    border-left: $lineheight solid $offwhite;
+    border-left: $lineheight solid var(--bs-tertiary-bg);
     padding-left: $lineheight;
     margin: 0;
-    color: $darkgrey;
+    color: var(--bs-secondary-color);
   }
 }