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

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

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 42046c0a62f270c6e49086cd3abe6eb26761f4ea..edef1444b85b00a924d1ad554edef97cf832c059 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -1,4 +1,6 @@
+@use "sass:map";

 @import "parameters";
 @import "parameters";

+@import "browse";

 @import "bootstrap";
 @import "rails_bootstrap_forms";
 
 @import "bootstrap";
 @import "rails_bootstrap_forms";
 


@@ -10,26 +12,10 @@ 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;
 }
 
 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 {


@@ -62,10 +48,28 @@ time[title] {
 
 /* Utility for de-emphasizing content */
 
 
 /* Utility for de-emphasizing content */
 

-.text-muted a {
+.text-body-secondary a {

   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 {


@@ -73,7 +77,7 @@ time[title] {
   position: absolute;
   top: 0;
   right: 0;
   position: absolute;
   top: 0;
   right: 0;

-  background: image-url("menu-icon.png") no-repeat;
+  background: image-url("menu-icon.svg") no-repeat;

   background-size: 30px 30px;
   width: 30px;
   height: 30px;
   background-size: 30px 30px;
   width: 30px;
   height: 30px;


@@ -90,26 +94,15 @@ time[title] {
 header {
   height: $headerHeight;
   position: relative;
 header {
   height: $headerHeight;
   position: relative;

-  z-index: 1001;

   font-size: 14px;
 
   font-size: 14px;
 

-  h1, nav, nav > ul, nav > ul > li {
-    display: inline-block;
-  }
-

   > * {
   > * {

-    height: 100%;

     padding: $lineheight * 0.5;
   }
 
     padding: $lineheight * 0.5;
   }
 

-  img.logo {
-    margin-top: -2px;
-  }
-

   h1 {
   h1 {

+    height: $headerHeight;

     font-size: 18px;
     font-size: 18px;

-    line-height: 1.2;
-    padding-top: 15px;

   }
 
   .btn {
   }
 
   .btn {


@@ -119,6 +112,10 @@ header {
   nav.primary {
     margin-right: auto;
   }
   nav.primary {
     margin-right: auto;
   }

+
+  .username {
+    max-width: 12em;
+  }

 }
 
 nav.primary {
 }
 
 nav.primary {


@@ -155,11 +152,7 @@ nav.primary {
 
 nav.secondary {
   .nav-link {
 
 nav.secondary {
   .nav-link {

-    padding: 0.2rem;
-  }
-
-  #inboxanchor {
-    background-color: lighten($grey, 10%);
+    padding: 0.3rem;

   }
 }
 
   }
 }
 


@@ -196,7 +189,7 @@ body.small-nav {
     min-height: $headerHeight;
 
     &.closed nav {
     min-height: $headerHeight;
 
     &.closed nav {

-      display: none;
+      display: none !important;

     }
 
     .search_forms {
     }
 
     .search_forms {


@@ -221,6 +214,8 @@ body.small-nav {
   }
 
   nav.secondary {
   }
 
   nav.secondary {

+    flex-direction: column;
+

     .user-menu, .login-menu {
       width: 100%;
     }
     .user-menu, .login-menu {
       width: 100%;
     }


@@ -246,7 +241,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 +324,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 +390,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;


@@ -430,10 +423,6 @@ body.small-nav {
   }
 
   .overlay-layers {
   }
 
   .overlay-layers {

-    p {
-      font-size: 13px;
-      margin-bottom: 8px;
-    }

     li.disabled { color: $darkgrey; }
   }
 }
     li.disabled { color: $darkgrey; }
   }
 }


@@ -458,24 +447,48 @@ body.small-nav {
   border-top: 0px !important;
 }
 
   border-top: 0px !important;
 }
 

-.leaflet-popup-content-wrapper {
-  border-radius: 4px !important;
+.leaflet-popup-content-wrapper, .leaflet-popup-tip,
+.leaflet-contextmenu, .leaflet-contextmenu-item,
+.leaflet-control-attribution, .leaflet-control-scale-line {
+  @extend .bg-body, .text-body;

 }
 
 }
 

-/* Rules for attribution text under the main map shown on printouts */
+.leaflet-control-attribution, .leaflet-control-scale-line {
+  @extend .bg-opacity-75;
+  text-shadow: none !important;
+}

 
 

-.donate-attr { color: darken($green, 10%) !important; }
+.leaflet-contextmenu-item.over {
+  @extend .bg-body-secondary, .border-secondary, .border-opacity-10;
+}

 
 

-/* Rules for the sidebar */
+.leaflet-popup-content-wrapper {
+  @extend .rounded-1;

 
 

-#browse_status {
-  input {
-    display: block;
-    margin-left: auto;
-    margin-right: auto;
+  a {
+    color: var(--bs-link-color) !important;

   }
 }
 
   }
 }
 

+@include color-mode(dark) {
+  .leaflet-tile-container,
+  .mapkey-table-entry td:first-child > * {
+    filter: brightness(.8);
+  }
+
+  .leaflet-control-attribution a {
+    color: var(--bs-link-color);
+  }
+
+  .leaflet-control-scale-line {
+    @extend .border-light, .border-opacity-75;
+  }
+}
+
+/* Rules for attribution text under the main map shown on printouts */
+
+.donate-attr { color: darken($green, 10%) !important; }
+

 /* Temporary label size override until we remove site-wide font customisation */
 
 form {
 /* Temporary label size override until we remove site-wide font customisation */
 
 form {


@@ -516,13 +529,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;
   }


@@ -531,7 +546,7 @@ header .search_forms,
 /* Rules for routing */
 
 div.direction {
 /* Rules for routing */
 
 div.direction {

-  background-image: image-url('routing-sprite.png');
+  background-image: image-url('routing-sprite.svg');

   width: 20px;
   height: 20px;
   background-repeat: no-repeat;
   width: 20px;
   height: 20px;
   background-repeat: no-repeat;


@@ -552,22 +567,16 @@ 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; }
 

-.browse_status {
-  display: none;
-}
-

 /* Rules for the history sidebar */
 
 #sidebar .changesets {
   li {
 /* Rules for the history sidebar */
 
 #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,41 +610,16 @@ 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;
     }
   }
 

-  .note-description {
-    overflow: hidden;
-    margin: 0 0 10px 10px;
-  }
-

   .query-results {
     display: none;
   .query-results {
     display: none;

-
-    ul {
-      li {
-        &.query-result {
-          cursor: pointer;
-        }
-
-        &.selected {
-          background: $list-highlight;
-        }
-      }
-    }
-  }
-}
-
-/* Bootstrap buttons don't have any vertical margin, so
-   they touch when adjacent buttons wrap onto a new line
-   e.g. wide form buttons on a narrow sidebar */
-
-.btn-wrapper {
-  > .btn {
-    margin-bottom: $spacer * 0.25;

   }
 }
 
   }
 }
 


@@ -648,16 +632,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;

     }
   }
 
     }
   }
 


@@ -707,6 +684,7 @@ tr.turn:hover {
 
   &.new-user-main {
     background-image: image-url("sign-up-illustration.png");
 
   &.new-user-main {
     background-image: image-url("sign-up-illustration.png");

+    background-position-x: 50px;

   }
 
   &.confirm-main {
   }
 
   &.confirm-main {


@@ -716,17 +694,6 @@ tr.turn:hover {
   &.new-user-terms {
     background-image: image-url("terms-illustration.png");
   }
   &.new-user-terms {
     background-image: image-url("terms-illustration.png");
   }

-
-  &.new-user-arm {
-    height: 110px;
-    width: 130px;
-    left: 280px;
-    top: 180px;
-    background-image: image-url("sign-up-illustration-arm.png");
-    position: absolute;
-    z-index: 100;
-    pointer-events: none;
-  }

 }
 
 [dir=rtl] .header-illustration {
 }
 
 [dir=rtl] .header-illustration {


@@ -735,6 +702,10 @@ tr.turn:hover {
   h1 {
     transform: scaleX(-1);
   }
   h1 {
     transform: scaleX(-1);
   }

+
+  ul {
+    transform: scaleX(-1);
+  }

 }
 
 /* Rules for small maps in content areas */
 }
 
 /* Rules for small maps in content areas */


@@ -760,7 +731,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 +772,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 +820,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;


@@ -901,28 +852,20 @@ div.secondary-actions {
   }
 }
 
   }
 }
 

-/* Rules for the "Welcome" page */
+/* Rules for the "Welcome" and "Fix the map" pages */
+

 .site-welcome, .site-fixthemap {
   .sprite {
 .site-welcome, .site-fixthemap {
   .sprite {

-    background-image: image-url("welcome-sprite.png");
-    background-size: 500px 250px;
-    display: block;
-  }
-
-  .sprite.small {

     width: 50px;
     height: 50px;
     width: 50px;
     height: 50px;

+    background-image: image-url("welcome-sprite.svg");
+    background-size: 500px 250px;

   }
 
   .sprite.x {
     /*rtl:ignore*/ background-position: -50px 0;
   }
 
   }
 
   .sprite.x {
     /*rtl:ignore*/ background-position: -50px 0;
   }
 

-  .sprite.term {
-    margin-right: 10px;
-    vertical-align: middle;
-  }
-

   .sprite.node {
     /*rtl:ignore*/ background-position: -100px 0;
   }
   .sprite.node {
     /*rtl:ignore*/ background-position: -100px 0;
   }


@@ -946,13 +889,10 @@ 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;
-  }

 }
 
 }
 

+/* Rules for the "About" page */
+

 .site-about #content {
   .content-inner {
     max-width: 760px;
 .site-about #content {
   .content-inner {
     max-width: 760px;


@@ -1019,6 +959,10 @@ div.secondary-actions {
   }
 }
 
   }
 }
 

+.auth-container {
+  max-width: 600px;
+}
+

 /* Rules for tabs inside secondary background sections */
 
 .bg-body-secondary .nav-tabs {
 /* Rules for tabs inside secondary background sections */
 
 .bg-body-secondary .nav-tabs {


@@ -1040,4 +984,32 @@ img.trace_image {
   }
 }
 
   }
 }
 

-@import 'browse';
+/* Rules for map sidebar icons */
+
+.browse-section {
+  .node::before,
+  .way::before,
+  .relation::before {
+    display: inline-block;
+    width: 25px;
+    margin-left: -25px;
+  }
+
+  .node, .way, .relation {
+    margin-left: 25px;
+  }
+}
+
+@each $class, $item in $map-sidebar-icons {
+  .browse-section #{$class}::before {
+    content: image-url('browse/#{map.get($item, "filename")}');
+  }
+
+  @if map.get($item, "invert") {
+    @include color-mode(dark) {
+      .browse-section #{$class}::before {
+        filter: invert(.8) hue-rotate(180deg);
+      }
+    }
+  }
+}