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

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

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 42046c0a62f270c6e49086cd3abe6eb26761f4ea..71649fbce4f6386c7952cd9fa4997c07056b7efd 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -15,21 +15,12 @@ p > img {
   max-width: 100%;
 }
 
   max-width: 100%;
 }
 

-small, aside {
-  font-size: 12px;
-}
-

 time[title] {
   text-decoration: underline dotted;
 }
 
 #container { position: relative; }
 
 time[title] {
   text-decoration: underline dotted;
 }
 
 #container { position: relative; }
 

-.small_icon {
-  vertical-align: middle;
-  margin-right: $lineheight * 0.25;
-}
-

 /* Rules for icons */
 
 .icon {
 /* Rules for icons */
 
 .icon {


@@ -66,6 +57,24 @@ time[title] {
   color: $blue;
 }
 
   color: $blue;
 }
 

+/* Bootstrap contextual table classes overrides in dark mode */
+
+@include color-mode(dark) {
+  .table-primary {
+    --bs-table-bg: rgb(var(--bs-primary-rgb), .25);
+  }
+  .table-secondary {
+    --bs-table-bg: rgb(var(--bs-secondary-rgb), .25);
+  }
+  .table-success {
+    --bs-table-bg: rgb(var(--bs-success-rgb), .25);
+  }
+  .table-primary, .table-secondary, .table-success {
+    --bs-table-color: initial;
+    border-color: inherit;
+  }
+}
+

 /* Rules for the header */
 
 #menu-icon {
 /* Rules for the header */
 
 #menu-icon {


@@ -90,7 +99,6 @@ time[title] {
 header {
   height: $headerHeight;
   position: relative;
 header {
   height: $headerHeight;
   position: relative;

-  z-index: 1001;

   font-size: 14px;
 
   h1, nav, nav > ul, nav > ul > li {
   font-size: 14px;
 
   h1, nav, nav > ul, nav > ul > li {


@@ -246,7 +254,7 @@ body.small-nav {
 /* Utility for styling notification numbers */
 
 .count-number {
 /* Utility for styling notification numbers */
 
 .count-number {

-  background: lighten($green, 30%);
+  background: transparentize(lighten($green, 25%), .25);

   color: $gray-800;
   font-weight: $font-weight-normal;
 }
   color: $gray-800;
   font-weight: $font-weight-normal;
 }


@@ -329,7 +337,6 @@ body.small-nav {
 
   .overlay-sidebar #sidebar {
     position: absolute;
 
   .overlay-sidebar #sidebar {
     position: absolute;

-    z-index: 1000;

     height: auto;
     overflow: hidden;
 
     height: auto;
     overflow: hidden;
 


@@ -396,7 +403,6 @@ body.small-nav {
     }
 
     #map-ui {
     }
 
     #map-ui {

-      z-index: 9999;

       width: 100%;
       height: 50%;
       overflow-y: scroll;
       width: 100%;
       height: 50%;
       overflow-y: scroll;


@@ -458,8 +464,17 @@ body.small-nav {
   border-top: 0px !important;
 }
 
   border-top: 0px !important;
 }
 

+.leaflet-popup-content-wrapper,
+.leaflet-popup-tip {
+  @extend .bg-body, .text-body;
+}
+

 .leaflet-popup-content-wrapper {
 .leaflet-popup-content-wrapper {

-  border-radius: 4px !important;
+  @extend .rounded-1;
+
+  a {
+    color: var(--bs-link-color) !important;
+  }

 }
 
 /* Rules for attribution text under the main map shown on printouts */
 }
 
 /* Rules for attribution text under the main map shown on printouts */


@@ -516,13 +531,15 @@ header .search_forms,
   display: none;
 }
 
   display: none;
 }
 

+.search_form {
+  .describe_location {
+    font-size: 10px;
+  }
+}
+

 /* Rules for search sidebar */
 
 #sidebar .search_results_entry {
 /* Rules for search sidebar */
 
 #sidebar .search_results_entry {

-  ul li.selected {
-    background: $list-highlight;
-  }
-

   .search_more .loader {
     display: none;
   }
   .search_more .loader {
     display: none;
   }


@@ -552,9 +569,6 @@ td.distance {
 tr.turn {
     cursor: pointer;
 }
 tr.turn {
     cursor: pointer;
 }

-tr.turn:hover {
-    background: $list-highlight;
-}

 
 .routing_marker { width: 15px; cursor: move; }
 
 
 .routing_marker { width: 15px; cursor: move; }
 


@@ -566,8 +580,9 @@ tr.turn:hover {
 
 #sidebar .changesets {
   li {
 
 #sidebar .changesets {
   li {

-    &.selected { background: $list-highlight; }
-    /* color is derived from changeset bbox fillColor in history.js */
+    &.selected {
+      @extend :hover;
+    }

 
     a.stretched-link > span, a:not(.stretched-link), [title] {
       position: relative;
 
     a.stretched-link > span, a:not(.stretched-link), [title] {
       position: relative;


@@ -601,6 +616,8 @@ tr.turn:hover {
   .browse-tag-list {
     table-layout: fixed;
     white-space: pre-wrap;
   .browse-tag-list {
     table-layout: fixed;
     white-space: pre-wrap;

+    word-wrap: break-word;
+    word-break: break-word;

 
     tr:last-child th, tr:last-child td {
       border-bottom: 0;
 
     tr:last-child th, tr:last-child td {
       border-bottom: 0;


@@ -614,18 +631,6 @@ tr.turn:hover {
 
   .query-results {
     display: none;
 
   .query-results {
     display: none;

-
-    ul {
-      li {
-        &.query-result {
-          cursor: pointer;
-        }
-
-        &.selected {
-          background: $list-highlight;
-        }
-      }
-    }

   }
 }
 
   }
 }
 


@@ -648,16 +653,9 @@ tr.turn:hover {
 /* Rules for export sidebar */
 
 .export_form {
 /* Rules for export sidebar */
 
 .export_form {

-  .export_area_inputs,
-  .export_button {
-    text-align: center;
-  }
-

   .export_area_inputs {
   .export_area_inputs {

-    margin-bottom: $spacer;

     input[type="text"] {
       width: 100px;
     input[type="text"] {
       width: 100px;

-      text-align: center;

     }
   }
 
     }
   }
 


@@ -760,7 +758,6 @@ tr.turn:hover {
 /* Rules for user popups on maps */
 
 .user_popup {
 /* Rules for user popups on maps */
 
 .user_popup {

-  min-width: 200px;

   p {
     padding: 0 0 5px 0;
     margin: 0 0 0 60px;
   p {
     padding: 0 0 5px 0;
     margin: 0 0 0 60px;


@@ -802,24 +799,6 @@ tr.turn:hover {
   }
 }
 
   }
 }
 

-/* Rules for messages pages */
-
-.messages {
-  .inbox-row {
-    background: $offwhite;
-  }
-
-  .inbox-row-unread td {
-    background: #CBEEA7;
-  }
-}
-
-.search_form {
-  .describe_location {
-    font-size: 10px;
-  }
-}
-

 /* Rules for user images */
 
 img.user_image {
 /* Rules for user images */
 
 img.user_image {


@@ -868,8 +847,7 @@ div.secondary-actions {
 
 /* Rules for rich text */
 
 
 /* Rules for rich text */
 

-.richtext,
-.prose {
+.richtext {

   code {
     background: var(--bs-secondary-bg);
     padding: 2px 3px;
   code {
     background: var(--bs-secondary-bg);
     padding: 2px 3px;