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

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

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 61c825fca81c818f9125c892ecf937f849540701..7c31b3cb1f20fdf19f4bbfb825ab972cbabad64e 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -10,26 +10,12 @@ body {
   font-size: $typeheight;
 }
 
   font-size: $typeheight;
 }
 

-p > img {
-  width: auto;
-  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 {


@@ -75,7 +61,10 @@ time[title] {
   .table-secondary {
     --bs-table-bg: rgb(var(--bs-secondary-rgb), .25);
   }
   .table-secondary {
     --bs-table-bg: rgb(var(--bs-secondary-rgb), .25);
   }

-  .table-primary, .table-secondary {
+  .table-success {
+    --bs-table-bg: rgb(var(--bs-success-rgb), .25);
+  }
+  .table-primary, .table-secondary, .table-success {

     --bs-table-color: initial;
     border-color: inherit;
   }
     --bs-table-color: initial;
     border-color: inherit;
   }


@@ -171,10 +160,6 @@ nav.secondary {
   .nav-link {
     padding: 0.2rem;
   }
   .nav-link {
     padding: 0.2rem;
   }

-
-  #inboxanchor {
-    background-color: lighten($grey, 10%);
-  }

 }
 
 nav.primary, nav.secondary {
 }
 
 nav.primary, nav.secondary {


@@ -470,8 +455,23 @@ body.small-nav {
   border-top: 0px !important;
 }
 
   border-top: 0px !important;
 }
 

+.leaflet-popup-content-wrapper,
+.leaflet-popup-tip,
+.leaflet-contextmenu,
+.leaflet-contextmenu-item {
+  @extend .bg-body, .text-body;
+}
+
+.leaflet-contextmenu-item.over {
+  @extend .bg-body-secondary, .border-secondary, .border-opacity-10;
+}
+

 .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 */


@@ -537,10 +537,6 @@ header .search_forms,
 /* 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;
   }


@@ -581,8 +577,9 @@ tr.turn {
 
 #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;


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

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

   }
 }
 
   }
 }
 


@@ -770,7 +755,6 @@ tr.turn {
 /* 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;


@@ -812,14 +796,6 @@ tr.turn {
   }
 }
 
   }
 }
 

-/* Rules for messages pages */
-
-.messages {
-  .inbox-row-unread td {
-    background: #CBEEA7;
-  }
-}
-

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


@@ -945,11 +921,6 @@ div.secondary-actions {
   .sprite.rules {
     /*rtl:ignore*/ background-position: -350px 0;
   }
   .sprite.rules {
     /*rtl:ignore*/ background-position: -350px 0;
   }

-
-  .icon.note {
-    background-color: #333;
-    border-radius: 4px;
-  }

 }
 
 .site-about #content {
 }
 
 .site-about #content {