Convert welcome sprite to SVG

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

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 61c825fca81c818f9125c892ecf937f849540701..6eafb89d18b3249e6c5b8c80e2f8253223a6ff28 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,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 +63,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 +162,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 +457,42 @@ body.small-nav {
   border-top: 0px !important;
 }
 
   border-top: 0px !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;
+}
+
+.leaflet-control-attribution, .leaflet-control-scale-line {
+  @extend .bg-opacity-75;
+  text-shadow: none !important;
+}
+
+.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;
+  }
+}
+
+@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 */
 }
 
 /* Rules for attribution text under the main map shown on printouts */


@@ -537,10 +558,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 +598,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 +649,6 @@ tr.turn {
 
   .query-results {
     display: none;
 
   .query-results {
     display: none;

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

   }
 }
 
   }
 }
 


@@ -717,6 +723,7 @@ tr.turn {
 
   &.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 {


@@ -726,17 +733,6 @@ tr.turn {
   &.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 {


@@ -745,6 +741,10 @@ tr.turn {
   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 */


@@ -770,7 +770,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 +811,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 {


@@ -903,7 +894,7 @@ div.secondary-actions {
 /* Rules for the "Welcome" page */
 .site-welcome, .site-fixthemap {
   .sprite {
 /* Rules for the "Welcome" page */
 .site-welcome, .site-fixthemap {
   .sprite {

-    background-image: image-url("welcome-sprite.png");
+    background-image: image-url("welcome-sprite.svg");

     background-size: 500px 250px;
     display: block;
   }
     background-size: 500px 250px;
     display: block;
   }


@@ -920,6 +911,7 @@ div.secondary-actions {
   .sprite.term {
     margin-right: 10px;
     vertical-align: middle;
   .sprite.term {
     margin-right: 10px;
     vertical-align: middle;

+    display: inline-block;

   }
 
   .sprite.node {
   }
 
   .sprite.node {


@@ -945,11 +937,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 {


@@ -1018,6 +1005,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 {


@@ -1039,4 +1030,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);
+      }
+    }
+  }
+}