X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/db78390ef34c5bca78a6edc3ca58143a845d32f3..b954416a70fb167b9cae0a3937de16bd9a93d239:/vendor/assets/iD/iD.css.erb

diff --git a/vendor/assets/iD/iD.css.erb b/vendor/assets/iD/iD.css.erb
index 25103657d..cce5fb89a 100644
--- a/vendor/assets/iD/iD.css.erb
+++ b/vendor/assets/iD/iD.css.erb
@@ -161,34 +161,18 @@ input::-moz-focus-inner {
 .cf:after {
     clear: both;
 }
-/* tiles */
-img.tile {
-    position:absolute;
-    transform-origin:0 0;
-    -ms-transform-origin:0 0;
-    -webkit-transform-origin:0 0;
-    -moz-transform-origin:0 0;
-    -o-transform-origin:0 0;
-
-    opacity: 0;
-
-    -webkit-transition: opacity 200ms linear;
-    transition: opacity 200ms linear;
-    -moz-transition: opacity 200ms linear;
-}
-
-img.tile-loaded {
-    opacity: 1;
-}
-img.tile-removing {
-    opacity: 0;
-}
 
 use { pointer-events: none; }
 
 /* base styles */
-.layer path { fill: none; }
-.layer use path { fill: #333; }  /* FF svg icons */
+.layer-osm path:not(.oneway) { fill: none; }     /* IE needs :not(.oneway) */
+
+/* the above fill: none rule affects paths in <use> shadow dom only in Firefox */
+.layer-osm use.icon path { fill: #333; }                       /* FF svg Maki icons */
+.layer-osm .turn use path { fill: #000; }                      /* FF turn restriction icons */
+#turn-only-shape2, #turn-only-u-shape2 { fill: #7092FF; }  /* FF turn-only, turn-only-u */
+#turn-no-shape2, #turn-no-u-shape2     { fill: #E06D5F; }  /* FF turn-no, turn-no-u */
+#turn-yes-shape2, #turn-yes-u-shape2   { fill: #8CD05F; }  /* FF turn-yes, turn-yes-u */
 
 g.point .shadow,
 g.vertex .shadow,
@@ -200,12 +184,6 @@ path.shadow {
     pointer-events: stroke;
 }
 
-.shadow {
-    -webkit-transition: 200ms;
-       -moz-transition: 200ms;
-            transition: 200ms;
-}
-
 /* points */
 
 g.point .stroke {
@@ -221,6 +199,7 @@ g.point .shadow {
     stroke-opacity: 0;
 }
 
+g.point.related:not(.selected) .shadow,
 g.point.hover:not(.selected) .shadow {
     stroke-opacity: 0.5;
 }
@@ -256,19 +235,6 @@ g.midpoint .fill {
     opacity: .7;
 }
 
-g.midpoint.tag-highway-corridor .fill,
-g.midpoint.tag-highway-pedestrian .fill,
-g.midpoint.tag-highway-steps .fill,
-g.midpoint.tag-highway-path .fill,
-g.midpoint.tag-highway-footway .fill,
-g.midpoint.tag-highway-cycleway .fill,
-g.midpoint.tag-highway-bridleway .fill {
-    fill: #fff;
-    stroke: #333;
-    stroke-opacity: .8;
-    opacity: .8;
-}
-
 g.vertex .shadow,
 g.midpoint .shadow {
     fill: #f6634f;
@@ -288,13 +254,15 @@ g.vertex.vertex-hover {
     display: block;
 }
 
+g.vertex.related:not(.selected) .shadow,
 g.vertex.hover:not(.selected) .shadow,
+g.midpoint.related:not(.selected) .shadow,
 g.midpoint.hover:not(.selected) .shadow {
-    fill-opacity: 0.3;
+    fill-opacity: 0.5;
 }
 
 g.vertex.selected .shadow {
-    fill-opacity: 0.5;
+    fill-opacity: 0.7;
 }
 
 .mode-draw-area g.midpoint,
@@ -328,8 +296,9 @@ path.shadow {
     stroke-opacity: 0;
 }
 
+path.shadow.related:not(.selected),
 path.shadow.hover:not(.selected) {
-    stroke-opacity: 0.3;
+    stroke-opacity: 0.4;
 }
 
 path.shadow.selected {
@@ -341,6 +310,111 @@ path.line.stroke {
     stroke-width: 2;
 }
 
+
+/* Labels / Markers */
+
+text {
+    font-size:10px;
+    pointer-events: none;
+    color: #222;
+    opacity: 1;
+}
+
+.oneway .textpath.tag-waterway {
+    fill: #002F35;
+}
+
+path.oneway {
+    stroke-width: 6px;
+}
+
+
+text.arealabel-halo,
+text.linelabel-halo,
+text.pointlabel-halo,
+text.arealabel,
+text.linelabel,
+text.pointlabel {
+    dominant-baseline: middle;
+    text-anchor: middle;
+    font-size: 12px;
+    font-weight: bold;
+    fill: #333;
+    pointer-events: none;
+    -webkit-transition: opacity 100ms linear;
+    transition: opacity 100ms linear;
+    -moz-transition: opacity 100ms linear;
+}
+
+/* Opera doesn't support dominant-baseline. See #715 */
+/* Safari 10 seems to have regressed too */
+.linelabel-halo .textpath,
+.linelabel .textpath {
+  baseline-shift: -33%;
+  dominant-baseline: auto;
+}
+
+.layer-halo text {
+    opacity: 0.7;
+    stroke: #fff;
+    stroke-width: 5px;
+    stroke-miterlimit: 1;
+}
+
+text.proximate {
+    opacity: 0;
+}
+
+text.point {
+    font-size: 10px;
+}
+
+.icon.areaicon-halo {
+    opacity: 0.6;
+    stroke: #999;
+    stroke-width: 2px;
+    stroke-miterlimit: 1;
+}
+
+.icon.areaicon {
+    fill: #222;
+    opacity: 0.8;
+}
+
+
+/* Turns */
+
+g.turn rect,
+g.turn circle {
+    fill: none;
+    pointer-events: all;
+}
+
+.form-field-restrictions .vertex {
+    pointer-events: none;
+    cursor: auto !important;
+}
+
+.lasso #map {
+    pointer-events: visibleStroke;
+}
+
+/* GPX Paths */
+
+.layer-gpx {
+    pointer-events: none;
+}
+
+path.gpx {
+    stroke: #FF26D4;
+    stroke-width: 2;
+    fill: none;
+}
+
+text.gpx {
+    fill: #FF26D4;
+}
+
 path.area.stroke {
     stroke: #fff;
     stroke-width: 1;
@@ -401,17 +475,26 @@ path.fill.tag-leisure-park {
     background-color: rgba(140, 208, 95, 0.3);
 }
 
+path.stroke.tag-amenity-swimming_pool,
+path.stroke.tag-leisure-swimming_pool,
 path.stroke.tag-natural-water,
+path.stroke.tag-landuse-aquaculture,
 path.stroke.tag-landuse-basin,
 path.stroke.tag-landuse-reservoir {
     stroke: rgb(119, 211, 222);
 }
+path.fill.tag-amenity-swimming_pool,
+path.fill.tag-leisure-swimming_pool,
+path.fill.tag-landuse-aquaculture,
 path.fill.tag-landuse-basin,
 path.fill.tag-landuse-reservoir,
 path.fill.tag-natural-water {
     stroke: rgba(119, 211, 222, 0.3);
     fill: rgba(119, 211, 222, 0.3);
 }
+.preset-icon-fill-area.tag-amenity-swimming_pool,
+.preset-icon-fill-area.tag-leisure-swimming_pool,
+.preset-icon-fill-area.tag-landuse-aquaculture,
 .preset-icon-fill-area.tag-landuse-basin,
 .preset-icon-fill-area.tag-landuse-reservoir,
 .preset-icon-fill-area.tag-natural-water {
@@ -439,7 +522,7 @@ path.fill.tag-amenity-university {
 .preset-icon-fill-area.tag-amenity-school,
 .preset-icon-fill-area.tag-amenity-college,
 .preset-icon-fill-area.tag-amenity-university {
-    border-color: rgb(255, 255, 148);
+    border-color: rgb(232, 232, 0);
     background-color: rgba(255, 255, 148, 0.15);
 }
 
@@ -470,25 +553,34 @@ path.fill.tag-landuse-commercial {
     background-color: rgba(214, 136, 26, 0.3);
 }
 
-path.stroke.tag-landuse-industrial {
+path.stroke.tag-landuse-industrial,
+path.stroke.tag-power-plant {
     stroke: rgb(228, 164, 245);
 }
-path.fill.tag-landuse-industrial {
+path.fill.tag-landuse-industrial,
+path.fill.tag-power-plant {
     stroke: rgba(228, 164, 245, 0.3);
     fill: rgba(228, 164, 245, 0.3);
 }
-.preset-icon-fill-area.tag-landuse-industrial {
+.preset-icon-fill-area.tag-landuse-industrial,
+.preset-icon-fill-area.tag-power-plant {
     border-color: rgb(228, 164, 245);
     background-color: rgba(228, 164, 245, 0.3);
 }
 
+path.stroke.tag-natural-bare_rock,
+path.stroke.tag-natural-scree,
 path.stroke.tag-landuse-quarry {
     stroke: rgb(166, 149, 123);
 }
+path.fill.tag-natural-bare_rock,
+path.fill.tag-natural-scree,
 path.fill.tag-landuse-quarry {
     stroke: rgba(166, 149, 123, 0.2);
     fill: rgba(166, 149, 123, 0.2);
 }
+.preset-icon-fill-area.tag-natural-bare_rock,
+.preset-icon-fill-area.tag-natural-scree,
 .preset-icon-fill-area.tag-landuse-quarry {
     border-color: rgb(166, 149, 123);
     background-color: rgba(166, 149, 123, 0.2);
@@ -509,21 +601,26 @@ path.fill.tag-landuse-landfill {
 .pattern-color-construction {
     fill: rgba(196, 189, 25, 0.2);
 }
-path.stroke.tag-landuse.tag-ephemeral {
+path.stroke.tag-landuse.tag-status,
+path.stroke.tag-landuse-construction {
     stroke: rgb(196, 189, 25);
 }
-.preset-icon-fill-area.tag-landuse.tag-ephemeral {
+.preset-icon-fill-area.tag-landuse.tag-status,
+.preset-icon-fill-area.tag-landuse-construction {
     border-color: rgb(196, 189, 25);
     background-color: rgba(196, 189, 25, 0.2);
 }
 
+path.stroke.tag-military,
 path.stroke.tag-landuse-military {
     stroke: rgb(214, 136, 26);
 }
+path.fill.tag-military,
 path.fill.tag-landuse-military {
     stroke: rgba(214, 136, 26, 0.2);
     fill: rgba(214, 136, 26, 0.2);
 }
+.preset-icon-fill-area.tag-military,
 .preset-icon-fill-area.tag-landuse-military {
     border-color: rgb(214, 136, 26);
     background-color: rgba(214, 136, 26, 0.2);
@@ -551,13 +648,16 @@ path.stroke.tag-landuse-meadow {
     background-color: rgba(182, 225, 153, 0.2);
 }
 
-.pattern-color-beach {
+.pattern-color-beach,
+.pattern-color-sand {
     fill: rgba(255, 255, 126, 0.2);
 }
-path.stroke.tag-natural-beach {
+path.stroke.tag-natural-beach,
+path.stroke.tag-natural-sand {
     stroke: rgb(255, 255, 126);
 }
-.preset-icon-fill-area.tag-natural-beach {
+.preset-icon-fill-area.tag-natural-beach,
+.preset-icon-fill-area.tag-natural-sand {
     border-color: rgb(255, 255, 126);
     background-color: rgba(255, 255, 126, 0.2);
 }
@@ -586,6 +686,18 @@ path.stroke.tag-landuse-farmland {
     background-color: rgba(140, 208, 95, 0.2);
 }
 
+path.stroke.tag-landuse-farmyard {
+    stroke: rgb(245, 220, 186);
+}
+path.fill.tag-landuse-farmyard {
+    stroke: rgba(245, 220, 186, 0.3);
+    fill: rgba(245, 220, 186, 0.3);
+}
+.preset-icon-fill-area.tag-landuse-farmyard {
+    border-color: rgb(245, 220, 186);
+    background: rgba(245, 220, 186, 0.3);
+}
+
 .pattern-color-cemetery,
 .pattern-color-orchard {
     fill: rgba(140, 208, 95, 0.2);
@@ -611,13 +723,9 @@ path.fill.tag-amenity-parking {
     background-color: rgba(170, 170, 170, 0.3);
 }
 
-path.fill.tag-place,
-path.fill.tag-boundary {
-    fill: none;
-}
+/* highways */
 
 /* highway areas */
-
 path.stroke.area.tag-highway {
     stroke:#fff;
     stroke-dasharray: none;
@@ -813,19 +921,6 @@ path.casing.tag-tertiary {
     stroke:#7f7f3f;
 }
 
-.preset-icon .icon.highway-unclassified {
-    color: #eaeaea;
-    fill: #444;
-}
-path.stroke.tag-highway-unclassified,
-path.stroke.tag-unclassified {
-    stroke:#eaeaea;
-}
-path.casing.tag-highway-unclassified,
-path.casing.tag-unclassified {
-    stroke:#444;
-}
-
 .preset-icon .icon.highway-residential {
     color: #fff;
     fill: #444;
@@ -839,6 +934,20 @@ path.casing.tag-residential {
     stroke:#444;
 }
 
+.preset-icon .icon.highway-unclassified {
+    color: #dcd9b9;
+    fill: #444;
+}
+path.stroke.tag-highway-unclassified,
+path.stroke.tag-unclassified {
+    stroke:#dcd9b9;
+}
+path.casing.tag-highway-unclassified,
+path.casing.tag-unclassified {
+    stroke:#444;
+}
+
+
 /* narrow highways */
 path.stroke.tag-highway-living_street,
 path.stroke.tag-highway-service,
@@ -939,19 +1048,20 @@ path.casing.tag-road {
 }
 
 .preset-icon .icon.highway-living-street {
-    color: #ccc;
-    fill: #fff;
+    color: #bbb;
+    fill: #ddd;
 }
 path.stroke.tag-highway-living_street,
 path.stroke.tag-living_street {
-    stroke:#ccc;
+    stroke: #ccc;
 }
 path.casing.tag-highway-living_street,
 path.casing.tag-living_street {
-    stroke:#fff;
+    stroke: #fff;
 }
 
-.preset-icon .icon.highway-pedestrian {
+.preset-icon .icon.highway-footway.tag-highway-corridor,
+.preset-icon .icon.highway-footway.tag-highway-pedestrian {
     color: #8cd05f;
     fill: #fff;
 }
@@ -965,8 +1075,14 @@ path.stroke.tag-pedestrian {
 path.casing.tag-highway-corridor,
 path.casing.tag-highway-pedestrian,
 path.casing.tag-corridor,
-path.casing.tag-pedestrian {
-    stroke:#8cd05f;
+path.casing.tag-pedestrian,
+path.casing.tag-highway-corridor.tag-unpaved,
+path.casing.tag-highway-pedestrian.tag-unpaved,
+path.casing.tag-corridor.tag-unpaved,
+path.casing.tag-pedestrian.tag-unpaved {
+    stroke: #8cd05f;
+    stroke-linecap: round;
+    stroke-dasharray: none;
 }
 
 .preset-icon .icon.highway-road {
@@ -996,19 +1112,16 @@ path.casing.tag-service {
 }
 
 .preset-icon .icon.highway-track {
-    color: #ccc;
-    fill: #996600;
+    color: #eaeaea;
+    fill: #c5b59f;
 }
 path.stroke.tag-highway-track,
 path.stroke.tag-track {
-    stroke: #ccc;
+    stroke: #c5b59f;
 }
 path.casing.tag-highway-track,
 path.casing.tag-track {
-    stroke: #996600;
-    stroke-linecap: butt;
-    stroke-dasharray: 6, 6;
-    stroke-width:7;
+    stroke: #746f6f;
 }
 
 path.stroke.tag-highway-path,
@@ -1019,13 +1132,21 @@ path.stroke.tag-highway-bridleway {
     stroke-dasharray: 6, 6;
 }
 
-path.casing.tag-highway-path{
+path.casing.tag-highway-path,
+path.casing.tag-highway-path.tag-unpaved {
     stroke: #c5b59f;
+    stroke-linecap: round;
+    stroke-dasharray: none;
 }
 path.casing.tag-highway-footway,
 path.casing.tag-highway-cycleway,
-path.casing.tag-highway-bridleway {
+path.casing.tag-highway-bridleway,
+path.casing.tag-highway-footway.tag-unpaved,
+path.casing.tag-highway-cycleway.tag-unpaved,
+path.casing.tag-highway-bridleway.tag-unpaved {
     stroke: #fff;
+    stroke-linecap: round;
+    stroke-dasharray: none;
 }
 
 .preset-icon .icon.category-path,
@@ -1047,6 +1168,14 @@ path.stroke.tag-highway-footway {
     stroke: #ae8681;
 }
 
+.preset-icon .icon.highway-footway.tag-crossing {
+    color: #444;
+}
+path.stroke.tag-highway-footway.tag-crossing {
+    stroke: #444;
+    stroke-dasharray: 6, 4;
+}
+
 .preset-icon .icon.tag-route-bicycle,
 .preset-icon .icon.highway-cycleway {
     color: #58a9ed;
@@ -1056,6 +1185,7 @@ path.stroke.tag-highway-cycleway {
     stroke: #58a9ed;
 }
 
+.preset-icon .icon.tag-route-horse,
 .preset-icon .icon.highway-bridleway {
     color: #e06d5f;
     fill: #fff;
@@ -1073,16 +1203,74 @@ path.stroke.tag-highway-steps {
     stroke-linecap: butt;
     stroke-dasharray: 3, 3;
 }
-path.casing.tag-highway-steps {
+path.casing.tag-highway-steps,
+path.casing.tag-highway-steps.tag-unpaved {
     stroke: #fff;
+    stroke-linecap: round;
+    stroke-dasharray: none;
 }
 
+/* highway midpoints */
+
+g.midpoint.tag-highway-corridor .fill,
+g.midpoint.tag-highway-pedestrian .fill,
+g.midpoint.tag-highway-steps .fill,
+g.midpoint.tag-highway-path .fill,
+g.midpoint.tag-highway-footway .fill,
+g.midpoint.tag-highway-cycleway .fill,
+g.midpoint.tag-highway-bridleway .fill {
+    fill: #fff;
+    stroke: #333;
+    stroke-opacity: .8;
+    opacity: .8;
+}
 /* aeroways */
 
-path.stroke.tag-aeroway-taxiway {
-    stroke: #805C80;
+/* areas */
+path.stroke.area.tag-aeroway {
+    stroke:#fff;
+    stroke-dasharray: none;
+    stroke-width: 2;
+}
+
+/* lines */
+path.stroke.tag-aeroway-taxiway,
+path.stroke.tag-taxiway {
     stroke-width: 4;
 }
+path.casing.tag-aeroway-taxiway,
+path.casing.tag-taxiway {
+    stroke-width: 6;
+}
+
+.low-zoom path.stroke.tag-aeroway-taxiway,
+.low-zoom path.stroke.tag-taxiway {
+    stroke-width: 2;
+}
+.low-zoom path.casing.tag-aeroway-taxiway,
+.low-zoom path.casing.tag-taxiway {
+    stroke-width: 4;
+}
+
+.preset-icon .icon.tag-aeroway-taxiway,
+.preset-icon .icon.tag-taxiway {
+    color: #ff0;
+    fill: #666;
+}
+path.stroke.tag-aeroway-taxiway,
+path.stroke.tag-taxiway {
+    stroke: #ff0;
+}
+path.casing.tag-aeroway-taxiway,
+path.casing.tag-taxiway {
+    stroke: #666;
+}
+
+.preset-icon .icon.tag-aeroway-runway,
+.preset-icon .icon.tag-runway {
+    color: #444;
+    fill: #000;
+}
 path.shadow.tag-aeroway-runway {
     stroke-width: 20;
 }
@@ -1101,16 +1289,9 @@ path.fill.tag-aeroway-runway {
     stroke: rgba(0, 0, 0, 0.6);
     fill: rgba(0, 0, 0, 0.6);
 }
-path.stroke.tag-aeroway-apron {
-    stroke: #805C80;
-}
-path.fill.tag-aeroway-apron {
-    stroke: rgba(128, 92, 128, 0.2);
-    fill: rgba(128, 92, 128, 0.2);
-}
-
 
 /* railways */
+
 .preset-icon .icon.tag-railway.other-line {
     color: #fff;
     fill: #777;
@@ -1170,8 +1351,8 @@ path.casing.tag-railway-platform {
 .area.casing.tag-railway {
     stroke: none;
 }
-
 /* waterways */
+
 .preset-icon .icon.tag-waterway.other-line {
     color: #77d3de;
     fill: #77d3de;
@@ -1216,6 +1397,24 @@ path.casing.tag-waterway-ditch {
     stroke-width: 3;
 }
 
+path.area.stroke.tag-waterway-dock,
+path.area.stroke.tag-waterway-boatyard,
+path.area.stroke.tag-waterway-fuel {
+    stroke: white;
+    stroke-width: 1;
+}
+path.area.casing.tag-waterway-dock,
+path.area.casing.tag-waterway-boatyard,
+path.area.casing.tag-waterway-fuel {
+    stroke: none;
+}
+path.area.fill.tag-waterway-dock,
+path.area.fill.tag-waterway-boatyard,
+path.area.fill.tag-waterway-fuel {
+    stroke: rgba(255, 255, 255, 0.3);
+    fill: rgba(255, 255, 255, 0.3);
+}
+
 /* power */
 .preset-icon .icon.tag-man_made-pipeline,
 .preset-icon .icon.tag-power {
@@ -1231,8 +1430,8 @@ path.casing.tag-power {
     stroke: none;
 }
 
-/* boundary */
 
+/* boundaries */
 path.stroke.tag-boundary {
     stroke: #fff;
     stroke-width: 2;
@@ -1249,8 +1448,8 @@ path.casing.tag-boundary-national_park {
     stroke: #b0e298;
 }
 
-/* barriers */
 
+/* barriers */
 path.stroke.tag-barrier {
     stroke: #ddd;
     stroke-width: 3px;
@@ -1263,19 +1462,19 @@ path.stroke.tag-barrier {
     stroke-dasharray: 8, 2, 2, 2;
 }
 
-/* bridges */
 
+/* bridges */
 path.casing.tag-bridge {
     stroke-width: 16;
     stroke-opacity: 0.6;
     stroke: #000;
     stroke-linecap: butt;
+    stroke-dasharray: none;
 }
 
 path.shadow.tag-bridge {
     stroke-width: 22;
 }
-
 path.casing.line.tag-railway.tag-bridge,
 path.casing.tag-highway-living_street.tag-bridge,
 path.casing.tag-highway-path.tag-bridge,
@@ -1289,7 +1488,6 @@ path.casing.tag-highway-cycleway.tag-bridge,
 path.casing.tag-highway-bridleway.tag-bridge {
     stroke-width: 10;
 }
-
 path.shadow.line.tag-railway.tag-bridge,
 path.shadow.tag-highway-living_street.tag-bridge,
 path.shadow.tag-highway-path.tag-bridge,
@@ -1303,15 +1501,9 @@ path.shadow.tag-highway-cycleway.tag-bridge,
 path.shadow.tag-highway-bridleway.tag-bridge {
     stroke-width: 17;
 }
-
-
 .low-zoom path.casing.tag-bridge {
     stroke-width: 10;
-    stroke-opacity: 0.6;
-    stroke: #000;
-    stroke-linecap: butt;
 }
-
 .low-zoom path.shadow.tag-bridge {
     stroke-width: 14;
 }
@@ -1344,18 +1536,19 @@ path.shadow.tag-highway-bridleway.tag-bridge {
     stroke-width: 13;
 }
 
-/* tunnels */
 
+/* tunnels */
 path.stroke.tag-tunnel {
     stroke-opacity: 0.3;
 }
-
 path.casing.tag-tunnel {
     stroke-opacity: 0.5;
+    stroke-linecap: butt;
+    stroke-dasharray: none;
 }
 
-/* embankments / cuttings */
 
+/* embankments / cuttings */
 path.casing.tag-embankment,
 path.casing.tag-cutting {
     stroke-opacity: 0.5;
@@ -1381,42 +1574,38 @@ path.shadow.tag-cutting {
 }
 
 
-/* Ephemeral */
-
-path.stroke.tag-ephemeral,
-path.casing.tag-ephemeral {
+/* Surface - unpaved */
+path.casing.tag-unpaved {
+    stroke: #ccc;
     stroke-linecap: butt;
-    stroke-dasharray: 7, 3;
+    stroke-dasharray: 4, 3;
 }
-
-.low-zoom path.stroke.tag-ephemeral,
-.low-zoom path.casing.tag-ephemeral {
-    stroke-linecap: butt;
-    stroke-dasharray: 5, 2;
+.low-zoom path.casing.tag-unpaved {
+    stroke-dasharray: 3, 2;
 }
-
-text {
-    font-size:10px;
-    pointer-events: none;
-    color: #222;
-    opacity: 1;
+path.casing.tag-bridge.tag-unpaved {
+    stroke: #000;
+    stroke-dasharray: 4, 3;
 }
-
-.oneway .textpath.tag-waterway {
-    fill: #002F35;
+.low-zoom path.casing.tag-bridge.tag-unpaved {
+    stroke: #000;
+    stroke-dasharray: 3, 2;
 }
 
-marker#oneway-marker path {
-    fill:#000;
-    opacity: .5;
-}
 
-path.oneway {
-    stroke-width: 6px;
+/* Status (e.g. construction, proposed, abandoned) */
+path.stroke.tag-status,
+path.casing.tag-status {
+    stroke-linecap: butt;
+    stroke-dasharray: 7, 3;
+}
+.low-zoom path.stroke.tag-status,
+.low-zoom path.casing.tag-status {
+    stroke-dasharray: 5, 2;
 }
 
-/* Buildings */
 
+/* Buildings */
 path.stroke.tag-building,
 path.stroke.tag-amenity-shelter {
     stroke: rgb(224, 110, 95);
@@ -1431,68 +1620,6 @@ path.fill.tag-amenity-shelter {
     border-color: rgb(224, 110, 95);
     background-color: rgba(224, 110, 95, 0.3);
 }
-
-
-/*
- * Labels
- */
-
-text.arealabel-halo,
-text.linelabel-halo,
-text.pointlabel-halo,
-text.arealabel,
-text.linelabel,
-text.pointlabel {
-    font-size: 12px;
-    font-weight: bold;
-    fill: #333;
-    text-anchor: middle;
-    pointer-events: none;
-    -webkit-transition: opacity 100ms linear;
-    transition: opacity 100ms linear;
-    -moz-transition: opacity 100ms linear;
-}
-
-.linelabel-halo .textpath,
-.linelabel .textpath {
-  dominant-baseline: middle;
-}
-
-/* Opera doesn't support dominant-baseline. See #715 */
-.opera .linelabel-halo .textpath,
-.opera .linelabel .textpath {
-  baseline-shift: -33%;
-  dominant-baseline: auto;
-}
-
-.layer-halo text {
-    opacity: 0.7;
-    stroke: #fff;
-    stroke-width: 5px;
-    stroke-miterlimit: 1;
-}
-
-text.proximate {
-    opacity: 0;
-}
-
-text.point {
-  font-size: 10px;
-}
-
-/* Turns */
-
-g.turn rect,
-g.turn circle {
-    fill: none;
-    pointer-events: all;
-}
-
-.form-field-restrictions .vertex {
-    pointer-events: none;
-    cursor: auto !important;
-}
-
 /* Cursors */
 
 .map-in-map,
@@ -1596,125 +1723,147 @@ g.turn circle {
 
 .turn rect,
 .turn circle {
-    cursor: pointer; /* Opera */
-    cursor: url(<%= asset_path("iD/img/cursor-pointer.png") %>) 6 1, pointer; /* FF */
-}
-
-.lasso #map {
-    pointer-events: visibleStroke;
-}
-
-/* GPX Paths */
-div.layer-gpx {
-    pointer-events: none;
-}
-
-path.gpx {
-    stroke: #FF26D4;
-    stroke-width: 2;
-    fill: none;
-}
-
-text.gpx {
-    fill: #FF26D4;
+    cursor: pointer; /* Opera */
+    cursor: url(<%= asset_path("iD/img/cursor-pointer.png") %>) 6 1, pointer; /* FF */
 }
+/* Mapillary Image Layer */
 
-/* Mapillary Layer */
-
-.layer-mapillary {
+.layer-mapillary-images {
     pointer-events: none;
 }
 
-.layer-mapillary g {
+.layer-mapillary-images .viewfield-group {
     pointer-events: visible;
     cursor: pointer; /* Opera */
     cursor: url(<%= asset_path("iD/img/cursor-select-mapillary.png") %>) 6 1, pointer; /* FF */
 }
 
-.layer-mapillary g * {
+.layer-mapillary-images .viewfield-group * {
     stroke-width: 1;
     stroke: #444;
     fill: #ffc600;
+    z-index: 50;
 }
 
-.layer-mapillary g:hover * {
+.layer-mapillary-images .viewfield-group:hover * {
     stroke-width: 1;
     stroke: #333;
     fill: #ff9900;
+    z-index: 60;
 }
 
-.layer-mapillary g.selected  * {
+.layer-mapillary-images .viewfield-group.selected  * {
     stroke-width: 2;
     stroke: #222;
     fill: #ff5800;
+    z-index: 60;
 }
 
-.layer-mapillary g:hover path.viewfield,
-.layer-mapillary g.selected path.viewfield,
-.layer-mapillary g path.viewfield {
+.layer-mapillary-images .viewfield-group:hover path.viewfield,
+.layer-mapillary-images .viewfield-group.selected path.viewfield,
+.layer-mapillary-images .viewfield-group path.viewfield {
     stroke-width: 0;
     fill-opacity: 0.6;
 }
 
-/* Modes */
-
-.mode-draw-line .vertex.active,
-.mode-draw-area .vertex.active,
-.mode-drag-node .vertex.active {
-    display: none;
-}
+/* Mapillary Sign Layer */
 
-.mode-draw-line .way.active,
-.mode-draw-area .way.active,
-.mode-drag-node .active {
+.layer-mapillary-signs {
     pointer-events: none;
 }
 
-/* Ensure drawing doesn't interact with area fills. */
-.mode-add-point .area.fill,
-.mode-draw-line .area.fill,
-.mode-draw-area .area.fill,
-.mode-add-line .area.fill,
-.mode-add-area .area.fill,
-.mode-drag-node .area.fill {
-    pointer-events: none;
+.layer-mapillary-signs .icon-sign .icon-sign-body {
+    min-width: 20px;
+    height: 28px;
+    width: 28px;
+    border: 2px solid transparent;
+    pointer-events: visible;
+    cursor: pointer; /* Opera */
+    cursor: url(<%= asset_path("iD/img/cursor-select-mapillary.png") %>) 6 1, pointer; /* FF */
+    z-index: 70;
+    overflow: visible;
 }
 
+.layer-mapillary-signs .icon-sign:hover .icon-sign-body {
+    border: 2px solid rgba(255,198,0,0.8);
+    z-index: 80;
+ }
 
+.layer-mapillary-signs .icon-sign.selected .icon-sign-body {
+    border: 2px solid rgba(255,0,0,0.8);
+    z-index: 80;
+ }
+
+.layer-mapillary-signs .icon-sign .t {
+    font-size: 28px;
+    z-index: 70;
+}
+
+.layer-mapillary-signs .icon-sign:hover .t,
+.layer-mapillary-signs .icon-sign.selected .t {
+    z-index: 80;
+}
 /* Fill Styles */
+
 .low-zoom.fill-wireframe path.stroke,
 .fill-wireframe path.stroke {
-    stroke-width: 1;
-    stroke-opacity: 0.5;
-    stroke-dasharray: none;
-    fill: none;
+    stroke-width: 1 !important;
+    stroke-opacity: 0.5 !important;
+    stroke-dasharray: none !important;
+    fill: none !important;
 }
 
 .low-zoom.fill-wireframe path.shadow,
 .fill-wireframe path.shadow {
-    stroke-width: 8;
+    stroke-width: 8 !important;
 }
 
+.fill-wireframe path.shadow.related:not(.selected),
 .fill-wireframe path.shadow.hover:not(.selected) {
-    stroke-opacity: 0.2;
+    stroke-opacity: 0.4 !important;
 }
 .fill-wireframe path.shadow.selected {
-    stroke-opacity: 0.4;
+    stroke-opacity: 0.6 !important;
 }
 
 .fill-wireframe .point,
-.fill-wireframe .icon,
+.fill-wireframe .areaicon,
+.fill-wireframe .areaicon-halo,
 .fill-wireframe path.casing,
 .fill-wireframe path.fill,
 .fill-wireframe path.oneway {
-    display: none;
+    display: none !important;
 }
 
-.fill-partial path.fill {
+.fill-partial path.area.fill {
     fill-opacity: 0;
     stroke-width: 60px;
     pointer-events: visibleStroke;
 }
+
+/* Modes */
+
+.mode-draw-line .vertex.active,
+.mode-draw-area .vertex.active,
+.mode-drag-node .vertex.active {
+    display: none;
+}
+
+.mode-draw-line .way.active,
+.mode-draw-area .way.active,
+.mode-drag-node .active {
+    pointer-events: none;
+}
+
+/* Ensure drawing doesn't interact with area fills. */
+.mode-add-point path.area.fill,
+.mode-draw-line path.area.fill,
+.mode-draw-area path.area.fill,
+.mode-add-line path.area.fill,
+.mode-add-area path.area.fill,
+.mode-drag-node path.area.fill {
+    pointer-events: none;
+}
 /* Basics
 ------------------------------------------------------- */
 
@@ -1728,7 +1877,10 @@ html, body {
 }
 
 body {
-    font:normal 12px/1.6667 'Helvetica Neue', Arial, sans-serif;
+    font: normal 12px/1.6667 -apple-system, BlinkMacSystemFont,
+        "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell",
+        "Fira Sans", "Droid Sans", "Helvetica Neue", "Arial",
+        sans-serif;
     margin:0;
     padding:0;
     min-width: 768px;
@@ -1755,6 +1907,20 @@ body {
     height: 100%;
 }
 
+#content.active {
+    -webkit-filter: none !important;
+    filter: none !important;
+    -webkit-duration: 200ms;
+    transition-duration: 200ms;
+}
+
+#content.inactive {
+    -webkit-filter: grayscale(80%) brightness(80%);
+    filter: grayscale(80%) brightness(80%);
+    -webkit-duration: 200ms;
+    transition-duration: 200ms;
+}
+
 #defs {
     /* Can't be display: none or the clippaths are ignored. */
     position: absolute;
@@ -1865,7 +2031,10 @@ a:hover {
 
 textarea  {
     resize: vertical;
-    font:normal 12px/20px 'Helvetica Neue', Arial, sans-serif;
+    font:normal 12px/20px -apple-system, BlinkMacSystemFont,
+        "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell",
+        "Fira Sans", "Droid Sans", "Helvetica Neue", "Arial",
+        sans-serif;
 }
 
 textarea,
@@ -1876,6 +2045,7 @@ input[type=url],
 input[type=tel],
 input[type=email] {
     background-color: white;
+    color: #333;
     border:1px solid #ccc;
     padding:5px 10px;
     height:30px;
@@ -1923,6 +2093,10 @@ table.tags, table.tags td, table.tags th {
     padding: 4px;
 }
 
+::-ms-clear {
+   display: none;
+}
+
 /* Grid
 ------------------------------------------------------- */
 
@@ -2008,7 +2182,10 @@ ul li { list-style: none;}
 
 .fl { float: left;}
 .fr { float: right;}
+.al { left: 0; }
+.ar { right: 0; }
 
+input.hide,
 div.hide,
 form.hide,
 button.hide,
@@ -2076,7 +2253,7 @@ button:hover {
 button[disabled],
 button.disabled {
     background-color: rgba(255,255,255,.25);
-    color: rgba(0,0,0,.5);
+    color: rgba(0,0,0,.4);
     cursor: auto;
 }
 
@@ -2159,10 +2336,6 @@ button.secondary-action:hover {
     background: #cccccc;
 }
 
-button.save.has-count {
-    padding: 9px;
-}
-
 button.save .count {
     display: none;
 }
@@ -2171,14 +2344,16 @@ button.save.has-count .count {
     display: block;
     position: absolute;
     top: 5px;
-    background: rgba(255, 255, 255, .5);
+    background: #fff;
+    border-color: #fff;
+    opacity: 0.5;
     color: #333;
     padding: 10px;
     height: 30px;
     line-height: 12px;
     border-radius: 4px;
     margin: auto;
-    margin-left: 8.3333%;
+    margin-left: 9.3333%;
 }
 
 button.save.has-count .count::before {
@@ -2192,7 +2367,9 @@ button.save.has-count .count::before {
     bottom: 0;
     border-top:    6px solid transparent;
     border-bottom: 6px solid transparent;
-    border-right:  6px solid rgba(255,255,255,.5);
+    border-right-width: 6px;
+    border-right-style: solid;
+    border-right-color: inherit;
 }
 
 /* Icons */
@@ -2211,7 +2388,7 @@ button.save.has-count .count::before {
 }
 
 .icon.pre-text {
-    margin-right: 3px;
+    margin-right: 5px;
 }
 
 .icon.light {
@@ -2268,7 +2445,7 @@ button.save.has-count .count::before {
     white-space: nowrap;
     text-overflow: ellipsis;
     overflow: hidden;
-    padding: 20px;
+    padding: 20px 20px 20px 40px;
 }
 
 .header button,
@@ -2284,12 +2461,19 @@ button.save.has-count .count::before {
     height: 100%;
 }
 
-.preset-list-pane .header button {
+.entity-editor-pane .header button.preset-close,
+.preset-list-pane .header button.preset-choose {
     position: absolute;
     right: 0;
     top: 0;
 }
 
+.entity-editor-pane .header button.preset-choose {
+    position: absolute;
+    left: 0;
+    top: 0;
+}
+
 .preset-choose {
     font-size: 16px;
     line-height: 1.25;
@@ -2359,47 +2543,8 @@ button.save.has-count .count::before {
     bottom: 0;
 }
 
-.mapillary-image {
-    position: absolute;
-    right: 0;
-    bottom: 30px;
-    width: 330px;
-    height: 250px;
-    padding: 5px;
-    background-color: #fff;
-}
-
-.mapillary-image a {
-    display: block;
-    position: absolute;
-    height: auto;
-    background-color: rgba(0,0,0,.5);
-    bottom: 0;
-    right: 0;
-    padding: 5px 10px;
-}
-
-.mapillary-image img {
-    width: 100%;
-    height: auto;
-    display: block;
-}
-
-.mapillary-image.hidden {
-    visibility: hidden;
-}
 
-.mapillary-image.temp button {
-    display: none;
-}
 
-.mapillary-image button {
-    border-radius: 0;
-    padding: 5px;
-    position: absolute;
-    right: 0;
-    top: 0;
-}
 
 .feature-list-pane .inspector-body {
     top: 120px;
@@ -2459,9 +2604,24 @@ button.save.has-count .count::before {
     border-radius: 0;
 }
 
+.feature-list-item {
+    background-color: white;
+    font-weight: bold;
+    height: 40px;
+    line-height: 20px;
+}
+
+.feature-list-item:hover {
+    background-color: #ececec;
+}
+
+.feature-list-item button {
+    background: transparent;
+}
+
 .feature-list-item .label {
     text-align: left;
-    padding: 5px 10px;
+    padding: 10px 10px;
     white-space: nowrap;
     text-overflow: ellipsis;
     overflow: hidden;
@@ -2472,8 +2632,13 @@ button.save.has-count .count::before {
     opacity: .5;
 }
 
-.feature-list-item:hover .label {
-    background-color: #ececec;
+.feature-list-item .close {
+    float: right;
+    padding: 10px;
+}
+
+.feature-list-item .close .icon {
+    opacity: 1;
 }
 
 .feature-list-item .entity-type {
@@ -2554,16 +2719,40 @@ button.save.has-count .count::before {
     height: 60px;
 }
 
-.preset-icon-32 {
+.preset-icon-44 {
+    position: absolute;
+    top: 9px;
+    left: 8px;
+    margin: auto;
+}
+
+.preset-icon-44 .icon {
+    width: 44px;
+    height: 44px;
+}
+
+.preset-icon-28 {
+    position: absolute;
+    top: 16px;
+    left: 16px;
+    margin: auto;
+}
+
+.preset-icon-28 .icon {
+    width: 28px;
+    height: 28px;
+}
+
+.preset-icon-24 {
     position: absolute;
-    top: 14px;
-    left: 13px;   /* Maki icons off center? */
+    top: 18px;
+    left: 18px;
     margin: auto;
 }
 
-.preset-icon-32 .icon {
-    width: 32px;
-    height: 32px;
+.preset-icon-24 .icon {
+    width: 24px;
+    height: 24px;
 }
 
 .preset-list-button .label {
@@ -2652,6 +2841,11 @@ button.save.has-count .count::before {
 
 .inspector-preset {
     overflow: hidden;
+    padding-bottom: 10px;
+}
+
+.inspector-preset a.hide-toggle {
+    margin: 0 20px 10px 20px;
 }
 
 .inspector-preset .preset-form {
@@ -2660,25 +2854,10 @@ button.save.has-count .count::before {
     border-radius: 8px;
 }
 
-.entity-editor-pane .preset-list-item::after {
-    content: "";
-    position: absolute;
-    height: 0;
-    width: 0;
-    bottom: 0;
-    left: 0;
-    right: 0;
-    margin: auto;
-    border: solid rgba(0, 0, 0, 0);
-    border-width: 10px;
-    border-bottom-color: #ececec;
-}
-
 .entity-editor-pane .preset-list-item .preset-list-button-wrap {
     margin-bottom: 0;
 }
 
-
 .form-field {
     margin-bottom: 10px;
     width: 100%;
@@ -2722,7 +2901,7 @@ button.save.has-count .count::before {
 }
 
 .form-label button {
-    border-left: 1px solid #CCC;
+    border-left: 1px solid #ccc;
     width: 10%;
     height: 100%;
     border-radius: 0;
@@ -2745,10 +2924,11 @@ button.save.has-count .count::before {
 .form-field > input,
 .form-field > textarea,
 .form-field .preset-input-wrap {
-    border: 1px solid #CCC;
+    border: 1px solid #ccc;
     min-height: 30px;
     border-top: 0;
     border-radius: 0 0 4px 4px;
+    overflow: hidden;
 }
 
 .form-field textarea {
@@ -2756,23 +2936,30 @@ button.save.has-count .count::before {
 }
 
 .inspector-border {
-    border-bottom: 1px solid #CCC
+    border-bottom: 1px solid #ccc
 }
 
 /* Preset form (hover mode) */
 
 .inspector-hover .checkselect label:last-of-type,
 .inspector-hover .preset-input-wrap .label,
+.inspector-hover .form-field-multicombo,
 .inspector-hover input,
 .inspector-hover label {
     background: #ececec;
 }
 
 .inspector-hover a,
+.inspector-hover .form-field-multicombo .chips,
 .inspector-hover .checkselect label:last-of-type {
     color: #666;
 }
 
+.inspector-hover .form-field-multicombo .chips {
+    background: #eee;
+    border: 1px solid #ccc;
+}
+
 /* hide and remove from layout */
 .inspector-hidden,
 .inspector-hover label input[type="checkbox"],
@@ -2781,6 +2968,7 @@ button.save.has-count .count::before {
 .inspector-hover .toggle-list label span,
 .inspector-hover .inspector-inner .add-tag,
 .inspector-hover .inspector-inner .add-relation,
+.inspector-hover .form-field-multicombo .combobox-input,
 .inspector-hover .toggle-list label.remove .icon {
     height: 0;
     width: 0;
@@ -2796,6 +2984,7 @@ button.save.has-count .count::before {
 .inspector-hover .combobox-caret,
 .inspector-hover .entity-editor-pane .header button,
 .inspector-hover .spin-control,
+.inspector-hover .form-field-multicombo .chips .remove,
 .inspector-hover .hide-toggle:before,
 .inspector-hover .more-fields,
 .inspector-hover .form-label-button-wrap,
@@ -2868,8 +3057,10 @@ button.save.has-count .count::before {
     font-weight: bold;
 }
 
-.more-fields label { padding: 5px 10px 5px 0; }
-.more-fields input { width: 50%;}
+.more-fields input {
+    margin-left: 10px;
+    width: 50%;
+}
 
 /* preset form access */
 
@@ -2896,6 +3087,63 @@ button.save.has-count .count::before {
     border-bottom-right-radius: 4px;
 }
 
+/* preset form multicombo */
+
+.form-field-multicombo {
+    border: 1px solid #cfcfcf;
+    border-top: 0px;
+    padding: 5px 0 5px 10px;
+    background: #fff;
+    display: block;
+    border-radius: 0 0 4px 4px;
+    overflow: hidden;
+}
+
+.form-field-multicombo:focus {
+    border-bottom: 0px;
+}
+
+.form-field-multicombo.active {
+    border-bottom-left-radius: 0px;
+    border-bottom-right-radius: 0px;
+}
+
+.form-field-multicombo li {
+    background-color: #eff2f7;
+    border: 1px solid #ccd5e3;
+    border-radius: 4px;
+    line-height: 25px;
+    display: inline-block;
+    padding: 2px 5px;
+    margin: 3px;
+    height: 30px;
+}
+
+.form-field-multicombo a {
+    font-family: Arial, Helvetica, sans-serif !important;
+    font-size: 16px !important;
+    line-height: 24px;
+    float: right;
+    margin: 1px 0 0 5px;
+    padding: 0;
+    cursor: pointer;
+    color: #a6b4ce;
+}
+
+.form-field-multicombo input {
+    border: 1px solid #ddd;
+    width: 100px;
+    margin: 3px;
+}
+
+.form-field-multicombo .combobox-caret {
+    margin: 3px 3px 3px -30px;
+}
+
+.form-field-multicombo input:focus {
+    border-radius: 4px !important;
+}
+
 /* preset form cycleway */
 
 .form-field-cycleway .preset-input-wrap li {
@@ -3456,7 +3704,6 @@ div.full-screen > button:hover {
 
 /* Background / Map Data Settings */
 
-
 .map-data-control button {
     border-radius: 0;
 }
@@ -3470,12 +3717,8 @@ div.full-screen > button:hover {
     position: relative;
 }
 
-.nudge-container {
-    border: 1px solid #CCC;
-}
-
-.background-control .adjustments button:last-child {
-    border: 0;
+.imagery-faq {
+    margin-bottom: 10px;
 }
 
 .map-data-control .hide-toggle,
@@ -3496,6 +3739,10 @@ div.full-screen > button:hover {
     color: #7092FF;
 }
 
+.layer-list:empty {
+    display: none;
+}
+
 .layer-list > li:first-child {
     border-radius: 3px 3px 0 0;
 }
@@ -3516,10 +3763,23 @@ div.full-screen > button:hover {
     background-color: #ececec;
 }
 
-.layer-list li.active {
+.layer-list li.active,
+.layer-list li.switch {
     background: #E8EBFF;
 }
 
+.layer-list li.best > div.best {
+    display: inline-block;
+    padding: 5px;
+    float: right;
+}
+
+/* make sure tooltip fits in map-control panel */
+/* if too wide, placement will be wrong the first time it displays */
+.layer-list li.best .tooltip-inner {
+    max-width: 160px;
+}
+
 .layer-list label {
     display: block;
     padding: 5px 10px;
@@ -3575,31 +3835,116 @@ div.full-screen > button:hover {
     border-left:  4px solid transparent;
 }
 
-.background-control .nudge-container button {
-    float: left;
-    display: block;
-    width:20%;
-    border-right: 1px solid #CCC;
-    position: relative;
+/* Adjust Alignment controls */
+
+.background-control .nudge-container {
+    border: 1px solid #ccc;
+    border-radius: 4px;
+    padding: 10px;
+}
+
+.nudge-container .nudge-instructions {
+    padding-bottom: 15px;
+}
+
+.nudge-container .nudge-outer-rect {
+    background-color: #eee;
+    border: 1px solid #ccc;
+    border-radius: 2px;
+    padding: 20px 0;
+    width: 70%;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    margin: 0 auto;
+    margin-top: 20px;
+    cursor: move;
+}
+
+.nudge-container .nudge-inner-rect {
+    background-color: #fff;
+    border: 1px solid #ccc;
+    border-radius: 2px;
+    width: 65%;
+    min-height: 20px;
+}
+
+.nudge-container .nudge::after {
+    content: '';
+    display: block;
+    position: absolute;
+    margin: auto;
+    left: 0; right: 0; top: 0; bottom: 0;
+    height: 0;
+    width: 0;
+}
+
+.nudge-container input {
+    width: 100%;
+    height: 20px;
+    text-align: center;
+    border: 0;
+}
+
+.nudge-container input.error {
+    border: 1px solid #FF7878;
+    border-radius: 2px;
+    background: #ffb;
+}
+
+.nudge-container input:focus {
+    background-color: transparent;
+}
+
+.nudge-container button {
+    float: left;
+    display: block;
+    width: 20%;
+    position: relative;
+    background-color: transparent;
+}
+
+.nudge-container button.right {
+    top: -50px;
+    right: -85%;
+}
+
+.nudge-container button.left {
+    top: -50px;
+    right: 45%;
+}
+
+.nudge-container button.top {
+    left: 20%;
+    top: -104px;
+}
+
+.nudge-container button.bottom {
+    left: -20%;
+}
+
+.nudge-container button.nudge-reset {
+    right: -10px;
 }
 
-.background-control .nudge::after {
-    content: '';
-    display: block;
-    position: absolute;
-    margin: auto;
-    left: 0; right: 0; top: 0; bottom: 0;
-    height: 0;
-    width: 0;
+.nudge-surface {
+   position: absolute;
+   z-index: 5000;
+   left: 0;
+   top: 0;
+   width: 100%;
+   height: 100%;
+   background-color: transparent;
+   cursor: move;
 }
 
-.background-control .nudge.left::after {
+.background-control .nudge.right::after {
     border-top:  5px solid transparent;
     border-bottom:  5px solid transparent;
     border-left:  5px solid #222;
 }
 
-.background-control .nudge.right::after {
+.background-control .nudge.left::after {
     border-top:  5px solid transparent;
     border-bottom:  5px solid transparent;
     border-right:  5px solid #222;
@@ -3730,7 +4075,7 @@ div.full-screen > button:hover {
     float:right;
     margin-left: 20px;
     margin-bottom: 20px;
-    padding-left: 5px
+    padding-left: 5px;
 }
 
 .help-wrap .toc li a,
@@ -3793,6 +4138,64 @@ div.full-screen > button:hover {
     border-radius: 4px;
 }
 
+
+/* Tiles
+------------------------------------------------------- */
+
+img.tile {
+    position:absolute;
+    transform-origin:0 0;
+    -ms-transform-origin:0 0;
+    -webkit-transform-origin:0 0;
+    -moz-transform-origin:0 0;
+    -o-transform-origin:0 0;
+
+    -moz-user-select: none;
+    -webkit-user-select: none;
+    -ms-user-select: none;
+    user-select: none;
+
+    opacity: 0;
+
+    -webkit-transition: opacity 200ms linear;
+    transition: opacity 200ms linear;
+    -moz-transition: opacity 200ms linear;
+}
+
+.tile-label-debug {
+    background: rgba(0, 0, 0, 0.7);
+    color: #fff;
+    position: absolute;
+    text-align: center;
+    width: 128px;
+    border-radius: 3px;
+    z-index: 2;
+
+    transform-origin:0 0;
+    -ms-transform-origin:0 0;
+    -webkit-transform-origin:0 0;
+    -moz-transform-origin:0 0;
+    -o-transform-origin:0 0;
+
+    -moz-user-select: none;
+    -webkit-user-select: none;
+    -ms-user-select: none;
+    user-select: none;
+}
+
+img.tile-debug {
+    border: 1px solid red;
+}
+
+img.tile-loaded {
+    opacity: 1;
+}
+
+img.tile-removing {
+    opacity: 0;
+}
+
+
 /* Map
 ------------------------------------------------------- */
 
@@ -3809,13 +4212,14 @@ div.full-screen > button:hover {
     -webkit-transform-origin:0 0;
     -moz-transform-origin:0 0;
     -o-transform-origin:0 0;
+
     -moz-user-select: none;
     -webkit-user-select: none;
     -ms-user-select: none;
     user-select: none;
 }
 
-#supersurface, .layer-layer {
+#supersurface, .layer {
     position: absolute;
     top: 0;
     left: 0;
@@ -3825,7 +4229,6 @@ div.full-screen > button:hover {
 
 /* Map-In-Map
 ------------------------------------------------------- */
-
 .map-in-map {
     position: absolute;
     overflow: hidden;
@@ -3844,14 +4247,15 @@ div.full-screen > button:hover {
     -webkit-transform-origin:0 0;
     -moz-transform-origin:0 0;
     -o-transform-origin:0 0;
+
     -moz-user-select: none;
     -webkit-user-select: none;
     -ms-user-select: none;
     user-select: none;
 }
 
-.map-in-map-svg,
-.map-in-map-gpx {
+.map-in-map-viewport,
+.map-in-map-data {
     top: 0;
     left: 0;
     overflow: hidden;
@@ -3859,11 +4263,11 @@ div.full-screen > button:hover {
     width: 100%;
 }
 
-.map-in-map-svg {
+.map-in-map-viewport {
     position: absolute;
 }
 
-.map-in-map-gpx {
+.map-in-map-data {
     position: relative;
     z-index: 10;
 }
@@ -3879,6 +4283,45 @@ div.full-screen > button:hover {
     stroke-width: 5;
 }
 
+
+/* Debug
+------------------------------------------------------- */
+.debug {
+    stroke: currentColor;
+    fill: none;
+    stroke-width: 2;
+}
+.map-in-map-data .debug {
+    stroke-width: 1;
+}
+
+.red     { color: rgba(255, 0, 0, 0.75); }
+.green   { color: rgba(0, 255, 0, 0.75); }
+.blue    { color: rgba(0, 0, 255, 0.75); }
+.yellow  { color: rgba(255, 255, 0, 0.75); }
+.cyan    { color: rgba(0, 255, 255, 0.75); }
+.magenta { color: rgba(255, 0, 255, 0.75); }
+.orange  { color: rgba(255, 153, 0, 0.75); }
+.pink    { color: rgba(255, 0, 153, 0.75); }
+.purple  { color: rgba(153, 0, 255, 0.75); }
+
+.debug-legend {
+    position: absolute;
+    top: 70px;
+    right: 80px;
+    padding: 5px;
+    border-radius: 4px;
+    pointer-events: none;
+}
+
+.debug-legend-item {
+    padding-right: 5px;
+}
+.debug-legend-item:before {
+    content: "\25A0";
+    padding: 0 5px;
+}
+
 /* Info Box
 ------------------------------------------------------- */
 .infobox {
@@ -3891,7 +4334,7 @@ div.full-screen > button:hover {
     border-bottom: 1px solid black;
 }
 
-.infobox .selection-heading {
+.infobox .infobox-heading {
     display: block;
     border-radius: 4px 0 0 0;
     padding: 5px 10px;
@@ -3972,6 +4415,10 @@ div.full-screen > button:hover {
     max-height: 30px;
     float: left;
     clear: left;
+    -moz-user-select: none;
+    -webkit-user-select: none;
+    -ms-user-select: none;
+    user-select: none;
 }
 
 #info-block {
@@ -3984,6 +4431,10 @@ div.full-screen > button:hover {
     width: 100%;
 }
 
+#scale:hover {
+    cursor: pointer;
+}
+
 #scale text {
     font: 12px sans-serif;
     stroke: none;
@@ -4044,12 +4495,20 @@ div.full-screen > button:hover {
     text-align: right;
     width: 100%;
     padding: 0px 10px;
+    color: #eee;
 }
 
 .api-status.offline,
 .api-status.readonly,
 .api-status.error {
-    background: red;
+    background: #a22;
+}
+
+.api-status-login {
+    color: #aaf;
+}
+.api-status-login:hover {
+    color: #ccf;
 }
 
 /* Modals
@@ -4112,7 +4571,8 @@ div.full-screen > button:hover {
     vertical-align: middle;
 }
 
-.save-section .buttons .action {
+.save-section .buttons .action,
+.save-section .buttons .secondary-action {
     display: inline-block;
     margin: 0 20px 0 0;
     text-align: center;
@@ -4175,9 +4635,11 @@ div.full-screen > button:hover {
 ------------------------------------------------------- */
 
 .save-success p {
-    padding: 15px;
+    padding: 15px 15px 0 15px;
+}
+.save-success a.details {
+  padding-left: 15px;
 }
-
 .save-success .button {
     padding-top: 15px;
 }
@@ -4600,8 +5062,8 @@ div.full-screen > button:hover {
     color: rgba(40,40,40,.5);
 }
 
-.lasso-box {
-    fill-opacity:0.1;
+.lasso-path {
+    fill-opacity:0.3;
     stroke: #fff;
     stroke-width: 1;
     stroke-opacity: 1;
@@ -4685,11 +5147,12 @@ div.full-screen > button:hover {
     background: #8cd05f;
 }
 
-.intro-nav-wrap button.step .icon {
+.intro-nav-wrap button.step .status {
+    margin-left: 3px;
     display: none;
 }
 
-.intro-nav-wrap button.step.finished .icon {
+.intro-nav-wrap button.step.finished .status {
     display: inline-block;
 }
 
@@ -4756,3 +5219,377 @@ div.full-screen > button:hover {
     background: rgba(0, 0, 0, 0) url(<%= asset_path("iD/img/iD-sprite.svg") %>) no-repeat -300px -460px;
     margin: auto;
 }
+
+.mapillary-wrap {
+    position: absolute;
+    bottom: 30px;
+    width: 330px;
+    height: 250px;
+    padding: 5px;
+    background-color: #fff;
+}
+
+.mapillary-wrap.hidden {
+    visibility: hidden;
+}
+
+.mapillary-wrap button.thumb-hide {
+    border-radius: 0;
+    padding: 5px;
+    position: absolute;
+    right: 0;
+    top: 0;
+    z-index: 500;
+}
+
+.mly-wrapper {
+    visibility: hidden;
+    width: 100%;
+    height: 100%;
+}
+
+.mly-wrapper.active {
+    visibility: visible;
+}
+
+/* Right-to-left localization settings */
+
+[dir='rtl'] #sidebar {
+  float: right;
+}
+
+[dir='rtl'] #sidebar .search-header .icon {
+  left: auto;
+  right: 10px;
+}
+
+/* header */
+[dir='rtl'] .header h3 {
+  text-align: right;
+  padding: 20px 40px 20px 20px;
+}
+
+[dir='rtl'] .entity-editor-pane .header button.preset-choose {
+  left: auto;
+  right: 0;
+}
+
+[dir='rtl'] .entity-editor-pane .header button.preset-close, [dir='rtl'] .preset-list-pane .header button.preset-choose {
+  left: 0;
+  right: auto;
+}
+
+[dir='rtl'] .preset-icon-fill-area {
+  left: auto;
+  right: 10px;
+}
+
+[dir='rtl'] .map-data-control .layer-list button, [dir='rtl'] .background-control .layer-list button {
+  float: left;
+  border-left: none;
+  border-right: 1px solid #CCC;
+}
+
+[dir='rtl'] .map-data-control .layer-list button:first-of-type, [dir='rtl'] .background-control .layer-list button:first-of-type {
+  border-radius: 3px 0 0 3px;
+}
+
+/* search */
+[dir='rtl'] .feature-list-item .label {
+  text-align: right;
+}
+
+[dir='rtl'] .feature-list-item .entity-name {
+  padding-left: 0;
+  padding-right: 10px;
+}
+
+/* preset form */
+[dir='rtl'] .form-label {
+  padding: 5px 10px 5px 0;
+}
+
+[dir='rtl'] .form-label button {
+  border-left: none;
+  border-right: 1px solid #CCC;
+}
+
+[dir='rtl'] .more-fields label {
+  padding: 5px 0 5px 10px;
+}
+
+[dir='rtl'] .form-label-button-wrap {
+  text-align: left;
+}
+
+[dir='rtl'] button.minor {
+  left: 0;
+  right: auto;
+}
+
+[dir='rtl'] .form-field .localized-main {
+  padding-left: 10%;
+  padding-right: 10px;
+}
+
+[dir='rtl'] .combobox-caret {
+  margin-left: 0;
+  margin-right: -30px;
+}
+
+[dir='rtl'] .form-field .button-input-action {
+  margin-left: 0;
+  margin-right: -10%;
+}
+
+[dir='rtl'] .icon.pre-text {
+  margin-left: 5px;
+  margin-right: 0;
+}
+
+[dir='rtl'] .notice .zoom-to .icon {
+  margin-left: 10px;
+  margin-right: 0;
+}
+
+[dir='rtl'] .preset-list-button .label {
+  text-align: right;
+  left: 0;
+  right: 60px;
+  border-left: none;
+  border-right: 1px solid rgba(0, 0, 0, .1);
+  border-radius: 3px 0 0 3px;
+}
+
+[dir='rtl'] .preset-icon-frame {
+  left: auto;
+  right: 7px;
+}
+
+[dir='rtl'] .preset-list-item button.tag-reference-button {
+  left: 0;
+  right: auto;
+  border-radius: 3px 0 0 3px;
+}
+
+[dir='rtl'] .preset-list-button-wrap .preset-icon {
+  left: auto;
+  right: auto;
+}
+
+[dir='rtl'] .preset-list-button-wrap .preset-icon-28 {
+  right: 16px;
+}
+
+[dir='rtl'] .preset-list-button-wrap .preset-icon-24 {
+  right: 18px;
+}
+
+[dir='rtl'] .form-field .maxspeed-unit {
+  border-radius: 0 0 0 4px;
+}
+
+[dir='rtl'] input[type="checkbox"], [dir='rtl'] input[type="radio"] {
+  float: right;
+  margin-left: 5px;
+  margin-right: 0;
+}
+
+[dir='rtl'] .preset-input-wrap .col6 {
+  float: right;
+}
+
+/* tags form */
+[dir='rtl'] .tag-row .key-wrap,
+[dir='rtl'] .tag-row .input-wrap-position {
+  float: right;
+}
+
+[dir='rtl'] .tag-row input {
+  border-left: none;
+  border-right: 1px solid #CCC;
+}
+
+[dir='rtl'] .tag-row:first-child input.key {
+  border-top-left-radius: 0;
+  border-top-right-radius: 4px;
+}
+
+[dir='rtl'] .tag-row button {
+  left: 10%;
+  border-left-width: 1px;
+}
+
+[dir='rtl'] .tag-row .tag-reference-button {
+  left: auto;
+  right: auto;
+  margin-right: 35px;
+  border-left-width: 1px;
+  border-right-width: 0;
+}
+
+[dir='rtl'] .tag-row:first-child .tag-reference-button {
+  border-top-left-radius: 4px;
+  border-top-right-radius: 0;
+}
+
+[dir='rtl'] .tag-row:last-child .tag-reference-button {
+  border-bottom-left-radius: 4px;
+  border-bottom-right-radius: 0;
+}
+
+/* map control buttons */
+[dir='rtl'] .map-controls {
+  left: 0;
+  right: auto;
+}
+
+[dir='rtl'] .background-control button,
+[dir='rtl'] .zoombuttons button.zoom-in {
+  border-radius: 0 4px 0 0;
+}
+
+[dir='rtl'] .help-control button,
+[dir='rtl'] .geolocate-control button {
+  border-radius: 0 0 4px 0;
+}
+
+[dir='rtl'] .list-item-gpx-browse svg {
+  transform: rotateY(180deg);
+}
+
+/* map control button overlays */
+[dir='rtl'] .map-overlay {
+  padding: 20px 20px 20px 50px;
+  left: 0;
+  right: auto !important;
+}
+
+[dir='rtl'] .opacity-options {
+  left: 50px;
+  right: auto;
+}
+
+[dir='rtl'] .hide-toggle {
+  padding-left: 0;
+  padding-right: 12px;
+}
+
+[dir='rtl'] .hide-toggle:before {
+  left: auto;
+  right: 0;
+  border-left: none;
+  border-right: 8px solid #7092ff;
+}
+
+[dir='rtl'] .hide-toggle.expanded:before {
+  border-left: 4px solid transparent;
+  border-right: 4px solid transparent;
+}
+
+/* navbar */
+[dir='rtl'] #bar .spacer,
+[dir='rtl'] #bar .button-wrap,
+[dir='rtl'] #bar .button-wrap button {
+  float: right;
+}
+
+[dir='rtl'] .add-point .tooltip {
+  left: inherit !important;
+}
+
+[dir='rtl'] .button-wrap:last-of-type {
+  padding-left: 0;
+  padding-right: 10px;
+}
+
+[dir='rtl'] button.save.has-count .count {
+  margin-left: auto;
+  margin-right: 8%;
+}
+
+[dir='rtl'] button.save.has-count .count::before {
+  border-left: 6px solid rgba(255,255,255,.5);
+  border-right: none;
+  left: auto;
+  right: -6px;
+}
+
+[dir='rtl'] .joined button {
+  border-left: 1px solid rgba(0,0,0,.5);
+  border-right: none;
+}
+
+[dir='rtl'] .joined button:first-child {
+  border-radius: 0 4px 4px 0;
+}
+
+[dir='rtl'] .joined button:last-child {
+  border-radius: 4px 0 0 4px;
+}
+
+[dir='rtl'] .spinner {
+  float: left;
+}
+
+[dir='rtl'] .spinner img {
+  margin-left: 10px;
+  margin-right: auto;
+  -moz-transform: scaleX(-1);
+  -o-transform: scaleX(-1);
+  -webkit-transform: scaleX(-1);
+  transform: scaleX(-1);
+  filter: FlipH;
+  -ms-filter: "FlipH";
+}
+
+/* footer */
+[dir='rtl'] #scale-block {
+  float: right;
+  clear: right;
+}
+
+[dir='rtl'] #info-block {
+  clear: left;
+}
+
+[dir='rtl'] #about-list {
+  text-align: left;
+  clear: left;
+  margin-left: 10px;
+  margin-right: 0;
+}
+
+[dir='rtl'] #about-list li {
+  float: left;
+  border-left: none;
+  border-right: 1px solid rgba(255,255,255,.5);
+  margin-left: 0;
+  margin-right: 5px;
+  padding: 5px 5px 5px 0;
+}
+
+[dir='rtl'] #about-list li:last-child {
+  border-right: none;
+}
+
+[dir='rtl'] #scale text {
+  text-anchor: end;
+}
+
+/* increment / decrement control - code by Naoufel Razouane */
+
+[dir='rtl'] .spin-control{
+  margin-left: 0;
+  margin-right: -20%;
+}
+[dir='rtl'] .spin-control button{
+  border-left: 0;
+  border-right: 1px solid #CCC;
+}
+[dir='rtl'] .spin-control button.decrement{
+  border-bottom-right-radius: 0;
+}
+[dir='rtl'] .spin-control button.increment{
+  border-bottom-left-radius: 3px;
+}