Merge remote-tracking branch 'openstreetmap/pull/1078'

[rails.git] / vendor / assets / iD / iD.css.erb

diff --git a/vendor/assets/iD/iD.css.erb b/vendor/assets/iD/iD.css.erb
index b45cf221afb43263e4f4c1e0204dfcc6e4112b1f..69374d7db9ece90656f0738f6d5aaee114939812 100644 (file)
--- a/vendor/assets/iD/iD.css.erb
+++ b/vendor/assets/iD/iD.css.erb
@@ -259,6 +259,7 @@ g.midpoint .fill {
     opacity: .7;
 }
 
     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-pedestrian .fill,
 g.midpoint.tag-highway-steps .fill,
 g.midpoint.tag-highway-path .fill,


@@ -343,6 +344,8 @@ path.area.stroke {
     stroke-width: 1;
 }
 path.area.fill {
     stroke-width: 1;
 }
 path.area.fill {

+    stroke-width: 0;
+    stroke: rgba(255, 255, 255, 0.3);

     fill: rgba(255, 255, 255, 0.3);
     fill-rule: evenodd;
 }
     fill: rgba(255, 255, 255, 0.3);
     fill-rule: evenodd;
 }


@@ -355,6 +358,7 @@ path.stroke.tag-natural {
     stroke: rgb(182, 225, 153);
 }
 path.fill.tag-natural {
     stroke: rgb(182, 225, 153);
 }
 path.fill.tag-natural {

+    stroke: rgba(182, 225, 153, 0.3);

     fill: rgba(182, 225, 153, 0.3);
 }
 .preset-icon-fill-area.tag-natural {
     fill: rgba(182, 225, 153, 0.3);
 }
 .preset-icon-fill-area.tag-natural {


@@ -362,12 +366,52 @@ path.fill.tag-natural {
     background-color: rgba(182, 225, 153, 0.3);
 }
 
     background-color: rgba(182, 225, 153, 0.3);
 }
 

-path.stroke.tag-natural-water {
+path.stroke.tag-landuse,
+path.stroke.tag-natural-wood,
+path.stroke.tag-natural-tree,
+path.stroke.tag-natural-grassland,
+path.stroke.tag-natural-grass,
+path.stroke.tag-leisure-nature_reserve,
+path.stroke.tag-leisure-pitch,
+path.stroke.tag-leisure-park {
+    stroke: rgb(140, 208, 95);
+}
+path.fill.tag-landuse,
+path.fill.tag-natural-wood,
+path.fill.tag-natural-tree,
+path.fill.tag-natural-grassland,
+path.fill.tag-natural-grass,
+path.fill.tag-leisure-nature_reserve,
+path.fill.tag-leisure-pitch,
+path.fill.tag-leisure-park {
+    stroke: rgba(140, 208, 95, 0.3);
+    fill: rgba(140, 208, 95, 0.3);
+}
+.preset-icon-fill-area.tag-landuse,
+.preset-icon-fill-area.tag-natural-wood,
+.preset-icon-fill-area.tag-natural-tree,
+.preset-icon-fill-area.tag-natural-grassland,
+.preset-icon-fill-area.tag-natural-grass,
+.preset-icon-fill-area.tag-leisure-nature_reserve,
+.preset-icon-fill-area.tag-leisure-pitch,
+.preset-icon-fill-area.tag-leisure-park {
+    border-color: rgb(140, 208, 95);
+    background-color: rgba(140, 208, 95, 0.3);
+}
+
+path.stroke.tag-natural-water,
+path.stroke.tag-landuse-basin,
+path.stroke.tag-landuse-reservoir {

     stroke: rgb(119, 211, 222);
 }
     stroke: rgb(119, 211, 222);
 }

+path.fill.tag-landuse-basin,
+path.fill.tag-landuse-reservoir,

 path.fill.tag-natural-water {
 path.fill.tag-natural-water {

+    stroke: rgba(119, 211, 222, 0.3);

     fill: rgba(119, 211, 222, 0.3);
 }
     fill: rgba(119, 211, 222, 0.3);
 }

+.preset-icon-fill-area.tag-landuse-basin,
+.preset-icon-fill-area.tag-landuse-reservoir,

 .preset-icon-fill-area.tag-natural-water {
     border-color: rgb(119, 211, 222);
     background-color: rgba(119, 211, 222, 0.3);
 .preset-icon-fill-area.tag-natural-water {
     border-color: rgb(119, 211, 222);
     background-color: rgba(119, 211, 222, 0.3);


@@ -385,6 +429,7 @@ path.fill.tag-amenity-kindergarten,
 path.fill.tag-amenity-school,
 path.fill.tag-amenity-college,
 path.fill.tag-amenity-university {
 path.fill.tag-amenity-school,
 path.fill.tag-amenity-college,
 path.fill.tag-amenity-university {

+    stroke: rgba(255, 255, 148, 0.15);

     fill: rgba(255, 255, 148, 0.15);
 }
 .preset-icon-fill-area.tag-amenity-childcare,
     fill: rgba(255, 255, 148, 0.15);
 }
 .preset-icon-fill-area.tag-amenity-childcare,


@@ -396,48 +441,12 @@ path.fill.tag-amenity-university {
     background-color: rgba(255, 255, 148, 0.15);
 }
 
     background-color: rgba(255, 255, 148, 0.15);
 }
 

-path.stroke.tag-landuse,
-path.stroke.tag-natural-wood,
-path.stroke.tag-natural-tree,
-path.stroke.tag-natural-grassland,
-path.stroke.tag-natural-grass,
-path.stroke.tag-leisure-pitch,
-path.stroke.tag-leisure-park {
-    stroke: rgb(140, 208, 95);
-}
-path.fill.tag-landuse,
-path.fill.tag-natural-wood,
-path.fill.tag-natural-tree,
-path.fill.tag-natural-grassland,
-path.fill.tag-natural-grass,
-path.fill.tag-leisure-pitch,
-path.fill.tag-leisure-park {
-    fill: rgba(140, 208, 95, 0.2);
-}
-.preset-icon-fill-area.tag-landuse,
-.preset-icon-fill-area.tag-natural-wood,
-.preset-icon-fill-area.tag-natural-tree,
-.preset-icon-fill-area.tag-natural-grassland,
-.preset-icon-fill-area.tag-natural-grass,
-.preset-icon-fill-area.tag-leisure-pitch,
-.preset-icon-fill-area.tag-leisure-park {
-    border-color: rgb(140, 208, 95);
-    background-color: rgba(140, 208, 95, 0.2);
-}
-
-path.fill.tag-landuse-residential,
-path.fill.tag-landuse-retail,
-path.fill.tag-landuse-commercial,
-path.fill.tag-landuse-industrial {
-    fill: none;
-    stroke-width: 60px;
-}
-

 path.stroke.tag-landuse-residential {
     stroke: rgb(196, 189, 25);
 }
 path.fill.tag-landuse-residential {
     stroke: rgba(196, 189, 25, 0.3);
 path.stroke.tag-landuse-residential {
     stroke: rgb(196, 189, 25);
 }
 path.fill.tag-landuse-residential {
     stroke: rgba(196, 189, 25, 0.3);

+    fill: rgba(196, 189, 25, 0.3);

 }
 .preset-icon-fill-area.tag-landuse-residential {
     border-color: rgb(196, 189, 25);
 }
 .preset-icon-fill-area.tag-landuse-residential {
     border-color: rgb(196, 189, 25);


@@ -452,6 +461,7 @@ path.stroke.tag-landuse-commercial {
 path.fill.tag-landuse-retail,
 path.fill.tag-landuse-commercial {
     stroke: rgba(214, 136, 26, 0.3);
 path.fill.tag-landuse-retail,
 path.fill.tag-landuse-commercial {
     stroke: rgba(214, 136, 26, 0.3);

+    fill: rgba(214, 136, 26, 0.3);

 }
 .preset-icon-fill-area.tag-landuse-retail,
 .preset-icon-fill-area.tag-landuse-commercial {
 }
 .preset-icon-fill-area.tag-landuse-retail,
 .preset-icon-fill-area.tag-landuse-commercial {


@@ -465,6 +475,7 @@ path.stroke.tag-landuse-industrial {
 }
 path.fill.tag-landuse-industrial {
     stroke: rgba(228, 164, 245, 0.3);
 }
 path.fill.tag-landuse-industrial {
     stroke: rgba(228, 164, 245, 0.3);

+    fill: rgba(228, 164, 245, 0.3);

 }
 .preset-icon-fill-area.tag-landuse-industrial {
     border-color: rgb(228, 164, 245);
 }
 .preset-icon-fill-area.tag-landuse-industrial {
     border-color: rgb(228, 164, 245);


@@ -472,24 +483,11 @@ path.fill.tag-landuse-industrial {
     box-shadow: inset 0 0 0 5px rgba(228, 164, 245, 0.3);
 }
 
     box-shadow: inset 0 0 0 5px rgba(228, 164, 245, 0.3);
 }
 

-path.stroke.tag-landuse-basin,
-path.stroke.tag-landuse-reservoir {
-    stroke: rgb(119, 211, 222);
-}
-path.fill.tag-landuse-basin,
-path.fill.tag-landuse-reservoir {
-    fill: rgba(119, 211, 222, 0.3);
-}
-.preset-icon-fill-area.tag-landuse-basin,
-.preset-icon-fill-area.tag-landuse-reservoir {
-    border-color: rgb(119, 211, 222);
-    background-color: rgba(119, 211, 222, 0.3);
-}
-

 path.stroke.tag-landuse-quarry {
     stroke: rgb(166, 149, 123);
 }
 path.fill.tag-landuse-quarry {
 path.stroke.tag-landuse-quarry {
     stroke: rgb(166, 149, 123);
 }
 path.fill.tag-landuse-quarry {

+    stroke: rgba(166, 149, 123, 0.2);

     fill: rgba(166, 149, 123, 0.2);
 }
 .preset-icon-fill-area.tag-landuse-quarry {
     fill: rgba(166, 149, 123, 0.2);
 }
 .preset-icon-fill-area.tag-landuse-quarry {


@@ -501,6 +499,7 @@ path.stroke.tag-landuse-landfill {
     stroke: rgb(255, 153, 51);
 }
 path.fill.tag-landuse-landfill {
     stroke: rgb(255, 153, 51);
 }
 path.fill.tag-landuse-landfill {

+    stroke: rgba(255, 153, 51, 0.2);

     fill: rgba(255, 153, 51, 0.2);
 }
 .preset-icon-fill-area.tag-landuse-landfill {
     fill: rgba(255, 153, 51, 0.2);
 }
 .preset-icon-fill-area.tag-landuse-landfill {


@@ -508,13 +507,13 @@ path.fill.tag-landuse-landfill {
     background-color: rgba(255, 153, 51, 0.2);
 }
 
     background-color: rgba(255, 153, 51, 0.2);
 }
 

-path.stroke.tag-landuse-construction {
-    stroke: rgb(196, 189, 25);
-}

 .pattern-color-construction {
     fill: rgba(196, 189, 25, 0.2);
 }
 .pattern-color-construction {
     fill: rgba(196, 189, 25, 0.2);
 }

-.preset-icon-fill-area.tag-landuse-construction {
+path.stroke.tag-landuse.tag-ephemeral {
+    stroke: rgb(196, 189, 25);
+}
+.preset-icon-fill-area.tag-landuse.tag-ephemeral {

     border-color: rgb(196, 189, 25);
     background-color: rgba(196, 189, 25, 0.2);
 }
     border-color: rgb(196, 189, 25);
     background-color: rgba(196, 189, 25, 0.2);
 }


@@ -522,50 +521,54 @@ path.stroke.tag-landuse-construction {
 path.stroke.tag-landuse-military {
     stroke: rgb(214, 136, 26);
 }
 path.stroke.tag-landuse-military {
     stroke: rgb(214, 136, 26);
 }

+path.fill.tag-landuse-military {
+    stroke: rgba(214, 136, 26, 0.2);
+    fill: rgba(214, 136, 26, 0.2);
+}

 .preset-icon-fill-area.tag-landuse-military {
     border-color: rgb(214, 136, 26);
     background-color: rgba(214, 136, 26, 0.2);
 }
 
 .preset-icon-fill-area.tag-landuse-military {
     border-color: rgb(214, 136, 26);
     background-color: rgba(214, 136, 26, 0.2);
 }
 

-path.stroke.tag-natural-wetland {
-    stroke: rgb(182, 225, 153);
-}

 .pattern-color-wetland {
     fill: rgba(182, 225, 153, 0.2);
 }
 .pattern-color-wetland {
     fill: rgba(182, 225, 153, 0.2);
 }

+path.stroke.tag-natural-wetland {
+    stroke: rgb(182, 225, 153);
+}

 .preset-icon-fill-area.tag-natural-wetland {
     border-color: rgb(182, 225, 153);
     background-color: rgba(182, 225, 153, 0.2);
 }
 
 .preset-icon-fill-area.tag-natural-wetland {
     border-color: rgb(182, 225, 153);
     background-color: rgba(182, 225, 153, 0.2);
 }
 

-path.stroke.tag-landuse-meadow {
-    stroke: rgb(182, 225, 153);
-}

 .pattern-color-meadow {
     fill: rgba(182, 225, 153, 0.2);
 }
 .pattern-color-meadow {
     fill: rgba(182, 225, 153, 0.2);
 }

+path.stroke.tag-landuse-meadow {
+    stroke: rgb(182, 225, 153);
+}

 .preset-icon-fill-area.tag-landuse-meadow {
     border-color: rgb(182, 225, 153);
     background-color: rgba(182, 225, 153, 0.2);
 }
 
 .preset-icon-fill-area.tag-landuse-meadow {
     border-color: rgb(182, 225, 153);
     background-color: rgba(182, 225, 153, 0.2);
 }
 

-path.stroke.tag-natural-beach {
-    stroke: rgb(255, 255, 126);
-}

 .pattern-color-beach {
     fill: rgba(255, 255, 126, 0.2);
 }
 .pattern-color-beach {
     fill: rgba(255, 255, 126, 0.2);
 }

+path.stroke.tag-natural-beach {
+    stroke: rgb(255, 255, 126);
+}

 .preset-icon-fill-area.tag-natural-beach {
     border-color: rgb(255, 255, 126);
     background-color: rgba(255, 255, 126, 0.2);
 }
 
 .preset-icon-fill-area.tag-natural-beach {
     border-color: rgb(255, 255, 126);
     background-color: rgba(255, 255, 126, 0.2);
 }
 

-path.stroke.tag-natural-scrub {
-    stroke: rgb(219, 240, 139);
-}

 .pattern-color-scrub {
     fill: rgba(219, 240, 139, 0.2);
 }
 .pattern-color-scrub {
     fill: rgba(219, 240, 139, 0.2);
 }

+path.stroke.tag-natural-scrub {
+    stroke: rgb(219, 240, 139);
+}

 .preset-icon-fill-area.tag-natural-scrub {
     border-color: rgb(219, 240, 139);
     background-color: rgba(219, 240, 139, 0.2);
 .preset-icon-fill-area.tag-natural-scrub {
     border-color: rgb(219, 240, 139);
     background-color: rgba(219, 240, 139, 0.2);


@@ -575,29 +578,33 @@ path.stroke.tag-natural-scrub {
 .pattern-color-farmland {
     fill: rgba(140, 208, 95, 0.2);
 }
 .pattern-color-farmland {
     fill: rgba(140, 208, 95, 0.2);
 }

+path.stroke.tag-landuse-farm,
+path.stroke.tag-landuse-farmland {
+    stroke: rgb(140, 208, 95);
+}

 .preset-icon-fill-area.tag-landuse-farm,
 .preset-icon-fill-area.tag-landuse-farmland {
     background-color: rgba(140, 208, 95, 0.2);
 }
 
 .preset-icon-fill-area.tag-landuse-farm,
 .preset-icon-fill-area.tag-landuse-farmland {
     background-color: rgba(140, 208, 95, 0.2);
 }
 

-.pattern-color-cemetery {
-    fill: rgba(140, 208, 95, 0.2)
-}
-.preset-icon-fill-area.tag-landuse-cemetery {
-    background-color: rgba(140, 208, 95, 0.2);
-}
-
+.pattern-color-cemetery,

 .pattern-color-orchard {
 .pattern-color-orchard {

-    fill: rgba(140, 208, 95, 0.2)
+    fill: rgba(140, 208, 95, 0.2);
+}
+path.stroke.tag-landuse-cemetery,
+path.stroke.tag-landuse-orchard {
+    stroke: rgb(140, 208, 95);

 }
 }

+.preset-icon-fill-area.tag-landuse-cemetery,

 .preset-icon-fill-area.tag-landuse-orchard {
 .preset-icon-fill-area.tag-landuse-orchard {

-    background-color: rgba(140, 208, 95, 0.8);
+    background-color: rgba(140, 208, 95, 0.2);

 }
 
 path.stroke.tag-amenity-parking {
     stroke: rgb(170, 170, 170);
 }
 path.fill.tag-amenity-parking {
 }
 
 path.stroke.tag-amenity-parking {
     stroke: rgb(170, 170, 170);
 }
 path.fill.tag-amenity-parking {

+    stroke: rgba(170, 170, 170, 0.3);

     fill: rgba(170, 170, 170, 0.3);
 }
 .preset-icon-fill-area.tag-amenity-parking {
     fill: rgba(170, 170, 170, 0.3);
 }
 .preset-icon-fill-area.tag-amenity-parking {


@@ -610,7 +617,15 @@ path.fill.tag-boundary {
     fill: none;
 }
 
     fill: none;
 }
 

-/* highways */
+/* highway areas */
+
+path.stroke.area.tag-highway {
+    stroke:#fff;
+    stroke-dasharray: none;
+    stroke-width: 2;
+}
+
+/* wide highways */

 
 path.shadow.tag-highway {
     stroke-width:16;
 
 path.shadow.tag-highway {
     stroke-width:16;


@@ -636,170 +651,251 @@ path.stroke.tag-highway {
 
 path.stroke.tag-highway-motorway,
 path.stroke.tag-highway-motorway_link,
 
 path.stroke.tag-highway-motorway,
 path.stroke.tag-highway-motorway_link,

-path.stroke.tag-construction-motorway {
+path.stroke.tag-motorway {

     stroke:#58a9ed;
 }
 
 path.casing.tag-highway-motorway,
 path.casing.tag-highway-motorway_link,
     stroke:#58a9ed;
 }
 
 path.casing.tag-highway-motorway,
 path.casing.tag-highway-motorway_link,

-path.casing.tag-construction-motorway {
+path.casing.tag-motorway {

     stroke:#2c5476;
 }
 
 path.stroke.tag-highway-trunk,
 path.stroke.tag-highway-trunk_link,
     stroke:#2c5476;
 }
 
 path.stroke.tag-highway-trunk,
 path.stroke.tag-highway-trunk_link,

-path.stroke.tag-construction-trunk {
+path.stroke.tag-trunk {

     stroke:#8cd05f;
 }
 path.casing.tag-highway-trunk,
 path.casing.tag-highway-trunk_link,
     stroke:#8cd05f;
 }
 path.casing.tag-highway-trunk,
 path.casing.tag-highway-trunk_link,

-path.casing.tag-construction-trunk {
+path.casing.tag-trunk {

     stroke:#46682f;
 }
 
 path.stroke.tag-highway-primary,
 path.stroke.tag-highway-primary_link,
     stroke:#46682f;
 }
 
 path.stroke.tag-highway-primary,
 path.stroke.tag-highway-primary_link,

-path.stroke.tag-construction-primary {
+path.stroke.tag-primary {

     stroke:#e06d5f;
 }
 path.casing.tag-highway-primary,
 path.casing.tag-highway-primary_link,
     stroke:#e06d5f;
 }
 path.casing.tag-highway-primary,
 path.casing.tag-highway-primary_link,

-path.casing.tag-construction-primary {
+path.casing.tag-primary {

     stroke:#70372f;
 }
 
 path.stroke.tag-highway-secondary,
 path.stroke.tag-highway-secondary_link,
     stroke:#70372f;
 }
 
 path.stroke.tag-highway-secondary,
 path.stroke.tag-highway-secondary_link,

-path.stroke.tag-construction-secondary {
+path.stroke.tag-secondary {

     stroke:#eab056;
 }
 path.casing.tag-highway-secondary,
 path.casing.tag-highway-secondary_link,
     stroke:#eab056;
 }
 path.casing.tag-highway-secondary,
 path.casing.tag-highway-secondary_link,

-path.casing.tag-construction-secondary {
+path.casing.tag-secondary {

     stroke:#75582b;
 }
 
 path.stroke.tag-highway-tertiary,
 path.stroke.tag-highway-tertiary_link,
     stroke:#75582b;
 }
 
 path.stroke.tag-highway-tertiary,
 path.stroke.tag-highway-tertiary_link,

-path.stroke.tag-construction-tertiary {
+path.stroke.tag-tertiary {

     stroke:#ffff7e;
 }
 path.casing.tag-highway-tertiary,
 path.casing.tag-highway-tertiary_link,
     stroke:#ffff7e;
 }
 path.casing.tag-highway-tertiary,
 path.casing.tag-highway-tertiary_link,

-path.casing.tag-construction-tertiary {
+path.casing.tag-tertiary {

     stroke:#7f7f3f;
 }
 
 path.stroke.tag-highway-unclassified,
     stroke:#7f7f3f;
 }
 
 path.stroke.tag-highway-unclassified,

-path.stroke.tag-construction-unclassified {
+path.stroke.tag-unclassified {

     stroke:#eaeaea;
 }
 path.casing.tag-highway-unclassified,
     stroke:#eaeaea;
 }
 path.casing.tag-highway-unclassified,

-path.casing.tag-construction-unclassified {
+path.casing.tag-unclassified {

     stroke:#444;
 }
 
 path.stroke.tag-highway-residential,
     stroke:#444;
 }
 
 path.stroke.tag-highway-residential,

-path.stroke.tag-construction-residential {
+path.stroke.tag-residential {

     stroke:#fff;
 }
 path.casing.tag-highway-residential,
     stroke:#fff;
 }
 path.casing.tag-highway-residential,

-path.casing.tag-construction-residential {
+path.casing.tag-residential {

     stroke:#444;
 }
 
     stroke:#444;
 }
 

-path.stroke.tag-highway-living_street {
-    stroke:#ccc;
+/* narrow highways */
+path.stroke.tag-highway-living_street,
+path.stroke.tag-highway-service,
+path.stroke.tag-highway-track,
+path.stroke.tag-highway-path,
+path.stroke.tag-highway-footway,
+path.stroke.tag-highway-cycleway,
+path.stroke.tag-highway-bridleway,
+path.stroke.tag-highway-corridor,
+path.stroke.tag-highway-pedestrian,
+path.stroke.tag-highway-steps,
+path.stroke.tag-highway-road,
+path.stroke.tag-living_street,
+path.stroke.tag-service,
+path.stroke.tag-track,
+path.stroke.tag-path,
+path.stroke.tag-footway,
+path.stroke.tag-cycleway,
+path.stroke.tag-bridleway,
+path.stroke.tag-corridor,
+path.stroke.tag-pedestrian,
+path.stroke.tag-steps,
+path.stroke.tag-road {

     stroke-width:4;
 }
     stroke-width:4;
 }

-path.casing.tag-highway-living_street {
-    stroke:#fff;
+path.casing.tag-highway-living_street,
+path.casing.tag-highway-service,
+path.casing.tag-highway-track,
+path.casing.tag-highway-path,
+path.casing.tag-highway-footway,
+path.casing.tag-highway-cycleway,
+path.casing.tag-highway-bridleway,
+path.casing.tag-highway-corridor,
+path.casing.tag-highway-pedestrian,
+path.casing.tag-highway-steps,
+path.casing.tag-highway-road,
+path.casing.tag-living_street,
+path.casing.tag-service,
+path.casing.tag-track,
+path.casing.tag-path,
+path.casing.tag-footway,
+path.casing.tag-cycleway,
+path.casing.tag-bridleway,
+path.casing.tag-corridor,
+path.casing.tag-pedestrian,
+path.casing.tag-steps,
+path.casing.tag-road {

     stroke-width:6;
 }
 
     stroke-width:6;
 }
 

-path.stroke.line.tag-highway-pedestrian {
+.low-zoom path.stroke.tag-highway-living_street,
+.low-zoom path.stroke.tag-highway-service,
+.low-zoom path.stroke.tag-highway-track,
+.low-zoom path.stroke.tag-highway-path,
+.low-zoom path.stroke.tag-highway-footway,
+.low-zoom path.stroke.tag-highway-cycleway,
+.low-zoom path.stroke.tag-highway-bridleway,
+.low-zoom path.stroke.tag-highway-corridor,
+.low-zoom path.stroke.tag-highway-pedestrian,
+.low-zoom path.stroke.tag-highway-steps,
+.low-zoom path.stroke.tag-highway-road,
+.low-zoom path.stroke.tag-living_street,
+.low-zoom path.stroke.tag-service,
+.low-zoom path.stroke.tag-track,
+.low-zoom path.stroke.tag-path,
+.low-zoom path.stroke.tag-footway,
+.low-zoom path.stroke.tag-cycleway,
+.low-zoom path.stroke.tag-bridleway,
+.low-zoom path.stroke.tag-corridor,
+.low-zoom path.stroke.tag-pedestrian,
+.low-zoom path.stroke.tag-steps,
+.low-zoom path.stroke.tag-road {
+    stroke-width:2;
+}
+.low-zoom path.casing.tag-highway-living_street,
+.low-zoom path.casing.tag-highway-service,
+.low-zoom path.casing.tag-highway-track,
+.low-zoom path.casing.tag-highway-path,
+.low-zoom path.casing.tag-highway-footway,
+.low-zoom path.casing.tag-highway-cycleway,
+.low-zoom path.casing.tag-highway-bridleway,
+.low-zoom path.casing.tag-highway-corridor,
+.low-zoom path.casing.tag-highway-pedestrian,
+.low-zoom path.casing.tag-highway-steps,
+.low-zoom path.casing.tag-highway-road,
+.low-zoom path.casing.tag-living_street,
+.low-zoom path.casing.tag-service,
+.low-zoom path.casing.tag-track,
+.low-zoom path.casing.tag-path,
+.low-zoom path.casing.tag-footway,
+.low-zoom path.casing.tag-cycleway,
+.low-zoom path.casing.tag-bridleway,
+.low-zoom path.casing.tag-corridor,
+.low-zoom path.casing.tag-pedestrian,
+.low-zoom path.casing.tag-steps,
+.low-zoom path.casing.tag-road {
+    stroke-width:4;
+}
+
+
+path.stroke.tag-highway-living_street,
+path.stroke.tag-living_street {
+    stroke:#ccc;
+}
+path.casing.tag-highway-living_street,
+path.casing.tag-living_street {
+    stroke:#fff;
+}
+
+path.stroke.tag-highway-corridor,
+path.stroke.tag-highway-pedestrian,
+path.stroke.tag-corridor,
+path.stroke.tag-pedestrian {

     stroke:#fff;
     stroke-dasharray: 2, 8;
     stroke:#fff;
     stroke-dasharray: 2, 8;

-    stroke-width:4 !important;
-    shapeRendering: auto;

 }
 }

-path.casing.line.tag-highway-pedestrian {
+path.casing.tag-highway-corridor,
+path.casing.tag-highway-pedestrian,
+path.casing.tag-corridor,
+path.casing.tag-pedestrian {

     stroke:#8cd05f;
     stroke:#8cd05f;

-    stroke-width:6 !important;

 }
 }

-path.stroke.area.tag-highway-pedestrian {
-    stroke:#fff;
-    stroke-width: 2;
+
+path.stroke.tag-highway-road,
+path.stroke.tag-road {
+    stroke:#9e9e9e;
+}
+path.casing.tag-highway-road,
+path.casing.tag-road {
+    stroke:#444;

 }
 
 }
 

-path.stroke.tag-highway-service {
+path.stroke.tag-highway-service,
+path.stroke.tag-service {

     stroke:#fff;
     stroke:#fff;

-    stroke-width:4;

 }
 }

-path.casing.tag-highway-service {
+path.casing.tag-highway-service,
+path.casing.tag-service {

     stroke:#666;
     stroke:#666;

-    stroke-width:6;
-}
-.low-zoom path.stroke.tag-highway-service {
-    stroke-width:2;
-}
-.low-zoom path.casing.tag-highway-service {
-    stroke-width:4;

 }
 
 }
 

-path.stroke.tag-highway-track {
-    stroke: #fff;
-    stroke-width: 4;
+path.stroke.tag-highway-track,
+path.stroke.tag-track {
+    stroke: #ccc;

 }
 }

-path.casing.tag-highway-track {
+path.casing.tag-highway-track,
+path.casing.tag-track {

     stroke: #996600;
     stroke: #996600;

-    stroke-width: 6;

     stroke-linecap: butt;
     stroke-dasharray: 6, 6;
     stroke-linecap: butt;
     stroke-dasharray: 6, 6;

-}
-.low-zoom path.stroke.tag-highway-track {
-    stroke-width:2;
-}
-.low-zoom path.casing.tag-highway-track {
-    stroke-width:4;
-}
-
-path.stroke.tag-highway-path {
-    stroke: #000;
-    stroke-width: 1 !important;
-    stroke-linecap: butt;
-    stroke-dasharray: 8, 4;
-}
-path.casing.tag-highway-path {
-    stroke-width: 1 !important;
-    stroke: #fff;
+    stroke-width:7;

 }
 
 }
 

+path.stroke.tag-highway-path,

 path.stroke.tag-highway-footway,
 path.stroke.tag-highway-cycleway,
 path.stroke.tag-highway-bridleway {
 path.stroke.tag-highway-footway,
 path.stroke.tag-highway-cycleway,
 path.stroke.tag-highway-bridleway {

-    stroke-width: 4;

     stroke-linecap: butt;
     stroke-dasharray: 6, 6;
 }
     stroke-linecap: butt;
     stroke-dasharray: 6, 6;
 }

+
+path.casing.tag-highway-path{
+    stroke: #c5b59f;
+}

 path.casing.tag-highway-footway,
 path.casing.tag-highway-cycleway,
 path.casing.tag-highway-bridleway {
 path.casing.tag-highway-footway,
 path.casing.tag-highway-cycleway,
 path.casing.tag-highway-bridleway {

-    stroke-width: 6;

     stroke: #fff;
 }
 
     stroke: #fff;
 }
 

-.low-zoom path.stroke.tag-highway-footway,
-.low-zoom path.stroke.tag-highway-cycleway,
-.low-zoom path.stroke.tag-highway-bridleway {
-    stroke-width: 2;
-}
-.low-zoom path.casing.tag-highway-footway,
-.low-zoom path.casing.tag-highway-cycleway,
-.low-zoom path.casing.tag-highway-bridleway {
-    stroke-width: 4;
+path.stroke.tag-highway-path {
+    stroke: #746f6f;

 }
 }

-

 path.stroke.tag-highway-footway {
     stroke: #ae8681;
 }
 path.stroke.tag-highway-footway {
     stroke: #ae8681;
 }


@@ -812,12 +908,10 @@ path.stroke.tag-highway-bridleway {
 
 path.stroke.tag-highway-steps {
     stroke: #81d25c;
 
 path.stroke.tag-highway-steps {
     stroke: #81d25c;

-    stroke-width: 4;

     stroke-linecap: butt;
     stroke-dasharray: 3, 3;
 }
 path.casing.tag-highway-steps {
     stroke-linecap: butt;
     stroke-dasharray: 3, 3;
 }
 path.casing.tag-highway-steps {

-    stroke-width: 6;

     stroke: #fff;
 }
 
     stroke: #fff;
 }
 


@@ -842,12 +936,14 @@ path.casing.tag-aeroway-runway {
     stroke-linecap: square;
 }
 path.fill.tag-aeroway-runway {
     stroke-linecap: square;
 }
 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 {
     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);
 }
 
     fill: rgba(128, 92, 128, 0.2);
 }
 


@@ -901,6 +997,7 @@ path.casing.tag-railway-platform {
 /* waterways */
 
 path.fill.tag-waterway {
 /* waterways */
 
 path.fill.tag-waterway {

+    stroke: rgba(119, 211, 222, 0.3);

     fill: rgba(119, 211, 222, 0.3);
 }
 
     fill: rgba(119, 211, 222, 0.3);
 }
 


@@ -957,6 +1054,19 @@ path.casing.tag-boundary-national_park {
     stroke: #b0e298;
 }
 
     stroke: #b0e298;
 }
 

+/* barriers */
+
+path.stroke.tag-barrier {
+    stroke: #ddd;
+    stroke-width: 3px;
+    stroke-linecap: round;
+    stroke-dasharray: 15, 5, 1, 5;
+}
+.low-zoom path.stroke.tag-barrier {
+    stroke-width: 2px;
+    stroke-linecap: butt;
+    stroke-dasharray: 8, 2, 2, 2;
+}

 
 /* bridges */
 
 
 /* bridges */
 


@@ -974,6 +1084,7 @@ path.shadow.tag-bridge {
 path.casing.line.tag-railway.tag-bridge,
 path.casing.tag-highway-living_street.tag-bridge,
 path.casing.tag-highway-path.tag-bridge,
 path.casing.line.tag-railway.tag-bridge,
 path.casing.tag-highway-living_street.tag-bridge,
 path.casing.tag-highway-path.tag-bridge,

+path.casing.tag-highway-corridor.tag-bridge,

 path.casing.line.tag-highway-pedestrian.tag-bridge,
 path.casing.tag-highway-service.tag-bridge,
 path.casing.tag-highway-track.tag-bridge,
 path.casing.line.tag-highway-pedestrian.tag-bridge,
 path.casing.tag-highway-service.tag-bridge,
 path.casing.tag-highway-track.tag-bridge,


@@ -987,6 +1098,7 @@ path.casing.tag-highway-bridleway.tag-bridge {
 path.shadow.line.tag-railway.tag-bridge,
 path.shadow.tag-highway-living_street.tag-bridge,
 path.shadow.tag-highway-path.tag-bridge,
 path.shadow.line.tag-railway.tag-bridge,
 path.shadow.tag-highway-living_street.tag-bridge,
 path.shadow.tag-highway-path.tag-bridge,

+path.shadow.tag-highway-corridor.tag-bridge,

 path.shadow.line.tag-highway-pedestrian.tag-bridge,
 path.shadow.tag-highway-service.tag-bridge,
 path.shadow.tag-highway-track.tag-bridge,
 path.shadow.line.tag-highway-pedestrian.tag-bridge,
 path.shadow.tag-highway-service.tag-bridge,
 path.shadow.tag-highway-track.tag-bridge,


@@ -1012,6 +1124,7 @@ path.shadow.tag-highway-bridleway.tag-bridge {
 .low-zoom path.casing.line.tag-railway.tag-bridge,
 .low-zoom path.casing.tag-highway-living_street.tag-bridge,
 .low-zoom path.casing.tag-highway-path.tag-bridge,
 .low-zoom path.casing.line.tag-railway.tag-bridge,
 .low-zoom path.casing.tag-highway-living_street.tag-bridge,
 .low-zoom path.casing.tag-highway-path.tag-bridge,

+.low-zoom path.casing.tag-highway-corridor.tag-bridge,

 .low-zoom path.casing.line.tag-highway-pedestrian.tag-bridge,
 .low-zoom path.casing.tag-highway-service.tag-bridge,
 .low-zoom path.casing.tag-highway-track.tag-bridge,
 .low-zoom path.casing.line.tag-highway-pedestrian.tag-bridge,
 .low-zoom path.casing.tag-highway-service.tag-bridge,
 .low-zoom path.casing.tag-highway-track.tag-bridge,


@@ -1025,6 +1138,7 @@ path.shadow.tag-highway-bridleway.tag-bridge {
 .low-zoom path.shadow.line.tag-railway.tag-bridge,
 .low-zoom path.shadow.tag-highway-living_street.tag-bridge,
 .low-zoom path.shadow.tag-highway-path.tag-bridge,
 .low-zoom path.shadow.line.tag-railway.tag-bridge,
 .low-zoom path.shadow.tag-highway-living_street.tag-bridge,
 .low-zoom path.shadow.tag-highway-path.tag-bridge,

+.low-zoom path.shadow.tag-highway-corridor.tag-bridge,

 .low-zoom path.shadow.line.tag-highway-pedestrian.tag-bridge,
 .low-zoom path.shadow.tag-highway-service.tag-bridge,
 .low-zoom path.shadow.tag-highway-track.tag-bridge,
 .low-zoom path.shadow.line.tag-highway-pedestrian.tag-bridge,
 .low-zoom path.shadow.tag-highway-service.tag-bridge,
 .low-zoom path.shadow.tag-highway-track.tag-bridge,


@@ -1035,8 +1149,6 @@ path.shadow.tag-highway-bridleway.tag-bridge {
     stroke-width: 13;
 }
 
     stroke-width: 13;
 }
 

-
-

 /* tunnels */
 
 path.stroke.tag-tunnel {
 /* tunnels */
 
 path.stroke.tag-tunnel {


@@ -1074,18 +1186,18 @@ path.shadow.tag-cutting {
 }
 
 
 }
 
 

-/* construction */
+/* Ephemeral */

 
 

-path.stroke.tag-highway-construction,
-path.casing.tag-highway-construction {
+path.stroke.tag-ephemeral,
+path.casing.tag-ephemeral {

     stroke-linecap: butt;
     stroke-linecap: butt;

-    stroke-dasharray: 7, 7;
+    stroke-dasharray: 7, 3;

 }
 
 }
 

-.low-zoom path.stroke.tag-highway-construction,
-.low-zoom path.casing.tag-highway-construction {
+.low-zoom path.stroke.tag-ephemeral,
+.low-zoom path.casing.tag-ephemeral {

     stroke-linecap: butt;
     stroke-linecap: butt;

-    stroke-dasharray: 5, 5;
+    stroke-dasharray: 5, 2;

 }
 
 text {
 }
 
 text {


@@ -1116,6 +1228,7 @@ path.stroke.tag-amenity-shelter {
 }
 path.fill.tag-building,
 path.fill.tag-amenity-shelter {
 }
 path.fill.tag-building,
 path.fill.tag-amenity-shelter {

+    stroke: rgba(224, 110, 95, 0.3);

     fill: rgba(224, 110, 95, 0.3);
 }
 .preset-icon-fill-area.tag-building,
     fill: rgba(224, 110, 95, 0.3);
 }
 .preset-icon-fill-area.tag-building,


@@ -1187,6 +1300,7 @@ g.turn circle {
 
 /* Cursors */
 
 
 /* Cursors */
 

+.map-in-map,

 #map {
     cursor: auto; /* Opera */
     cursor: url(<%= asset_path("iD/img/cursor-grab.png") %>) 9 9, auto; /* FF */
 #map {
     cursor: auto; /* Opera */
     cursor: url(<%= asset_path("iD/img/cursor-grab.png") %>) 9 9, auto; /* FF */


@@ -1273,9 +1387,14 @@ g.turn circle {
 }
 
 .mode-add-point #map,
 }
 
 .mode-add-point #map,

-.lasso #map,
-.lasso .way,
-.lasso .vertex {
+.mode-browse.lasso #map,
+.mode-browse.lasso .way,
+.mode-browse.lasso .vertex,
+.mode-browse.lasso .midpoint,
+.mode-select.lasso #map,
+.mode-select.lasso .way,
+.mode-select.lasso .vertex,
+.mode-select.lasso .midpoint {

     cursor: crosshair; /* Opera */
     cursor: url(<%= asset_path("iD/img/cursor-draw.png") %>) 9 9, crosshair; /* FF */
 }
     cursor: crosshair; /* Opera */
     cursor: url(<%= asset_path("iD/img/cursor-draw.png") %>) 9 9, crosshair; /* FF */
 }


@@ -1291,16 +1410,18 @@ g.turn circle {
 }
 
 /* GPX Paths */
 }
 
 /* GPX Paths */

+div.layer-gpx {
+    pointer-events: none;
+}
+

 path.gpx {
     stroke: #FF26D4;
     stroke-width: 2;
     fill: none;
 path.gpx {
     stroke: #FF26D4;
     stroke-width: 2;
     fill: none;

-    pointer-events: none;

 }
 
 }
 

-/* GPS Labels */

 text.gpx {
 text.gpx {

-    fill:#FF26D4;
+    fill: #FF26D4;

 }
 
 /* Mapillary Layer */
 }
 
 /* Mapillary Layer */


@@ -1316,23 +1437,30 @@ text.gpx {
 }
 
 .layer-mapillary g * {
 }
 
 .layer-mapillary g * {

-    stroke-width: 2;
-    stroke: #ffc600;
+    stroke-width: 1;
+    stroke: #444;

     fill: #ffc600;
 }
 
 .layer-mapillary g:hover * {
     fill: #ffc600;
 }
 
 .layer-mapillary g:hover * {

-    stroke-width: 2;
-    stroke: #ff9900;
+    stroke-width: 1;
+    stroke: #333;

     fill: #ff9900;
 }
 
     fill: #ff9900;
 }
 

-.layer-mapillary g.selected * {
-    stroke-width: 4;
-    stroke: #ff5800;
+.layer-mapillary g.selected  * {
+    stroke-width: 2;
+    stroke: #222;

     fill: #ff5800;
 }
 
     fill: #ff5800;
 }
 

+.layer-mapillary g:hover path.viewfield,
+.layer-mapillary g.selected path.viewfield,
+.layer-mapillary g path.viewfield {
+    stroke-width: 0;
+    fill-opacity: 0.6;
+}
+

 /* Modes */
 
 .mode-draw-line .vertex.active,
 /* Modes */
 
 .mode-draw-line .vertex.active,


@@ -1356,6 +1484,42 @@ text.gpx {
 .mode-drag-node .area.fill {
     pointer-events: none;
 }
 .mode-drag-node .area.fill {
     pointer-events: none;
 }

+
+
+/* Fill Styles */
+.low-zoom.fill-wireframe path.stroke,
+.fill-wireframe path.stroke {
+    stroke-width: 1;
+    stroke-opacity: 0.5;
+    stroke-dasharray: none;
+    fill: none;
+}
+
+.low-zoom.fill-wireframe path.shadow,
+.fill-wireframe path.shadow {
+    stroke-width: 8;
+}
+
+.fill-wireframe path.shadow.hover:not(.selected) {
+    stroke-opacity: 0.2;
+}
+.fill-wireframe path.shadow.selected {
+    stroke-opacity: 0.4;
+}
+
+.fill-wireframe .point,
+.fill-wireframe .icon,
+.fill-wireframe path.casing,
+.fill-wireframe path.fill,
+.fill-wireframe path.oneway {
+    display: none;
+}
+
+.fill-partial path.fill {
+    fill-opacity: 0;
+    stroke-width: 60px;
+    pointer-events: visibleStroke;
+}

 /* Basics
 ------------------------------------------------------- */
 
 /* Basics
 ------------------------------------------------------- */
 


@@ -1387,7 +1551,6 @@ body {
 .id-container {
     height: 100%;
     width: 100%;
 .id-container {
     height: 100%;
     width: 100%;

-    position: fixed;

     min-width: 768px;
 }
 
     min-width: 768px;
 }
 


@@ -1416,14 +1579,12 @@ body {
 
 .spinner {
     opacity: .5;
 
 .spinner {
     opacity: .5;

+    float: right;

 }
 
 .spinner img {
 }
 
 .spinner img {

-    position: absolute;

     height: 40px;
     width: 40px;
     height: 40px;
     width: 40px;

-    right: 10px;
-    top: 10px;

     border-radius: 4px;
     margin-right: 10px;
     background: black;
     border-radius: 4px;
     margin-right: 10px;
     background: black;


@@ -1498,10 +1659,6 @@ strong {
 
 a:visited, a {
     color: #7092ff;
 
 a:visited, a {
     color: #7092ff;

-    -webkit-transition: all 100ms;
-       -moz-transition: all 100ms;
-         -o-transition: all 100ms;
-            transition: all 100ms;

 }
 
 a:hover {
 }
 
 a:hover {


@@ -1530,10 +1687,6 @@ input[type=email] {
     width: 100%;
     border-radius:4px;
     text-overflow: ellipsis;
     width: 100%;
     border-radius:4px;
     text-overflow: ellipsis;

-    -webkit-transition: all 200ms;
-       -moz-transition: all 200ms;
-         -o-transition: all 200ms;
-            transition: all 200ms;

 }
 
 textarea:focus,
 }
 
 textarea:focus,


@@ -1605,9 +1758,6 @@ ul li { list-style: none;}
     background-color: white;
     color: #7092FF;
     cursor: pointer;
     background-color: white;
     color: #7092FF;
     cursor: pointer;

-       -moz-transition: all 100ms;
-         -o-transition: all 100ms;
-            transition: all 100ms;

 }
 
 .toggle-list > label:hover {
 }
 
 .toggle-list > label:hover {


@@ -1633,18 +1783,6 @@ ul li { list-style: none;}
     background: #E8EBFF;
 }
 
     background: #E8EBFF;
 }
 

-.link-list li {
-    float: right;
-    border-left: 1px solid rgba(255,255,255,.5);
-    padding: 5px 0 5px 5px;
-    margin-left: 5px;
-}
-
-ul.link-list li:last-child {
-    border-left: 0;
-    margin-left: 0;
-    padding-left: 0;
-}

 
 /* Utility Classes
 ------------------------------------------------------- */
 
 /* Utility Classes
 ------------------------------------------------------- */


@@ -1668,13 +1806,19 @@ ul.link-list li:last-child {
     color: white;
 }
 
     color: white;
 }
 

+.fillD2 {
+    background:rgba(0,0,0,.75);
+    color: white;
+}
+

 .fl { float: left;}
 .fr { float: right;}
 
 div.hide,
 form.hide,
 button.hide,
 .fl { float: left;}
 .fr { float: right;}
 
 div.hide,
 form.hide,
 button.hide,

-a.hide {
+a.hide,
+li.hide {

     display: none;
 }
 
     display: none;
 }
 


@@ -1727,11 +1871,6 @@ button {
     display: inline-block;
     height:40px;
     border-radius:4px;
     display: inline-block;
     height:40px;
     border-radius:4px;

-    /* Crashes Safari: https://github.com/openstreetmap/iD/issues/1188 */
-    /*-webkit-transition: all 100ms;*/
-       -moz-transition: all 100ms;
-         -o-transition: all 100ms;
-            transition: all 100ms;

 }
 
 button:focus,
 }
 
 button:focus,


@@ -1787,6 +1926,10 @@ button.minor:hover {
     border-right: 1px solid rgba(0,0,0,.5);
 }
 
     border-right: 1px solid rgba(0,0,0,.5);
 }
 

+.fillL .joined button {
+    border-right: 1px solid white;
+}
+

 .joined button:first-child {
     border-radius:4px 0 0 4px;
 }
 .joined button:first-child {
     border-radius:4px 0 0 4px;
 }


@@ -1798,6 +1941,13 @@ button.minor:hover {
 
 button.action {
     background: #7092ff;
 
 button.action {
     background: #7092ff;

+    color: white;
+}
+
+button[disabled].action,
+button[disabled].action:hover {
+    background: #cccccc;
+    color: #888;

 }
 
 button.action:focus,
 }
 
 button.action:focus,


@@ -1805,8 +1955,17 @@ button.action:hover {
     background: #597BE7;
 }
 
     background: #597BE7;
 }
 

-button.save.has-count {
-    padding: 9px;
+button.secondary-action {
+    background: #ececec;
+}
+
+button.secondary-action:focus,
+button.secondary-action:hover {
+    background: #cccccc;
+}
+
+button.save.has-count {
+    padding: 9px;

 }
 
 button.save .count {
 }
 
 button.save .count {


@@ -1897,6 +2056,7 @@ button.save.has-count .count::before {
 .icon.relation.route         { background-position: -540px 0;}
 .icon.relation.multipolygon  { background-position: -560px 0;}
 .icon.vertex     { background-position: -580px 0;}
 .icon.relation.route         { background-position: -540px 0;}
 .icon.relation.multipolygon  { background-position: -560px 0;}
 .icon.vertex     { background-position: -580px 0;}

+.icon.data       { background-position: -600px 0;}

 
 .icon.inspect.light    { background-position: -220px -20px;}
 .icon.plus.light       { background-position: -240px -20px;}
 
 .icon.inspect.light    { background-position: -220px -20px;}
 .icon.plus.light       { background-position: -240px -20px;}


@@ -1909,10 +2069,14 @@ button.save.has-count .count::before {
 .icon.geolocate.light  { background-position: -360px -20px;}
 .icon.bug.light        { background-position: -400px -20px;}
 .icon.help.light       { background-position: -460px -20px;}
 .icon.geolocate.light  { background-position: -360px -20px;}
 .icon.bug.light        { background-position: -400px -20px;}
 .icon.help.light       { background-position: -460px -20px;}

+.icon.data.light       { background-position: -600px -20px;}

 
 .icon.back.blue        { background-position: -420px -20px;}
 .icon.forward.blue     { background-position: -440px -20px;}
 
 
 .icon.back.blue        { background-position: -420px -20px;}
 .icon.forward.blue     { background-position: -440px -20px;}
 

+.icon.full-screen              { background-position: -620px -20px;}
+.active .icon.full-screen      { background-position: -640px -20px;}
+

 button[disabled] .icon.alert      { background-position:   0 -40px;}
 button[disabled] .icon.add-point  { background-position: -20px -40px;}
 button[disabled] .icon.add-line   { background-position: -40px -40px;}
 button[disabled] .icon.alert      { background-position:   0 -40px;}
 button[disabled] .icon.add-point  { background-position: -20px -40px;}
 button[disabled] .icon.add-line   { background-position: -40px -40px;}


@@ -1930,14 +2094,15 @@ button[disabled] .icon.geocode    { background-position: -280px -40px;}
 button[disabled] .icon.layers     { background-position: -300px -40px;}
 button[disabled] .icon.avatar     { background-position: -320px -40px;}
 button[disabled] .icon.nearby     { background-position: -340px -40px;}
 button[disabled] .icon.layers     { background-position: -300px -40px;}
 button[disabled] .icon.avatar     { background-position: -320px -40px;}
 button[disabled] .icon.nearby     { background-position: -340px -40px;}

+button[disabled] .icon.data       { background-position: -600px -40px;}

 
 

-.icon.point.deleted  { background-position: -302px -80px;}
-.icon.line.deleted   { background-position: -320px -80px;}
-.icon.area.deleted   { background-position: -340px -80px;}
+.icon.point.deleted  { background-position: -480px -80px;}
+.icon.line.deleted   { background-position: -500px -80px;}
+.icon.area.deleted   { background-position: -520px -80px;}

 
 

-.icon.point.created  { background-position: -302px -100px;}
-.icon.line.created   { background-position: -320px -100px;}
-.icon.area.created   { background-position: -340px -100px;}
+.icon.point.created  { background-position: -480px -100px;}
+.icon.line.created   { background-position: -500px -100px;}
+.icon.area.created   { background-position: -520px -100px;}

 
 .icon.point.modified  { background-position: -22px 0; }
 
 
 .icon.point.modified  { background-position: -22px 0; }
 


@@ -1971,7 +2136,7 @@ a:hover .icon.out-link   { background-position: -500px -14px;}
     top:0;
     right:0;
     height:60px;
     top:0;
     right:0;
     height:60px;

-    z-index: 1;
+    z-index: 9;

     min-width: 768px;
 }
 
     min-width: 768px;
 }
 


@@ -1985,7 +2150,7 @@ a:hover .icon.out-link   { background-position: -500px -14px;}
 }
 
 .header h3 {
 }
 
 .header h3 {

-    text-align: center;
+    text-align: left;

     margin-bottom: 0;
     white-space: nowrap;
     text-overflow: ellipsis;
     margin-bottom: 0;
     white-space: nowrap;
     text-overflow: ellipsis;


@@ -2017,13 +2182,13 @@ a:hover .icon.out-link   { background-position: -500px -14px;}
     right: 0;
     top: 0;
     height: 59px;
     right: 0;
     top: 0;
     height: 59px;

-    z-index: 3;
+    z-index: 50;

 }
 
 .footer {
     position: absolute;
     bottom: 0;
 }
 
 .footer {
     position: absolute;
     bottom: 0;

-    padding: 5px 30px 5px 30px;
+    padding: 5px 20px 5px 20px;

     border-top: 1px solid #ccc;
     background-color: #fafafa;
     width: 100%;
     border-top: 1px solid #ccc;
     background-color: #fafafa;
     width: 100%;


@@ -2045,7 +2210,7 @@ a:hover .icon.out-link   { background-position: -500px -14px;}
     float: left;
     height: 100%;
     overflow: hidden;
     float: left;
     height: 100%;
     overflow: hidden;

-    z-index: 2;
+    z-index: 10;

     background: #f6f6f6;
 }
 
     background: #f6f6f6;
 }
 


@@ -2182,9 +2347,6 @@ a:hover .icon.out-link   { background-position: -500px -14px;}
     text-overflow: ellipsis;
     overflow: hidden;
     border-left: 1px solid rgba(0, 0, 0, .1);
     text-overflow: ellipsis;
     overflow: hidden;
     border-left: 1px solid rgba(0, 0, 0, .1);

-    -moz-transition: all 100ms;
-    -o-transition: all 100ms;
-    transition: all 100ms;

 }
 
 .feature-list-item .label .icon {
 }
 
 .feature-list-item .label .icon {


@@ -2264,9 +2426,6 @@ a:hover .icon.out-link   { background-position: -500px -14px;}
     text-overflow: ellipsis;
     overflow: hidden;
     border-left: 1px solid rgba(0, 0, 0, .1);
     text-overflow: ellipsis;
     overflow: hidden;
     border-left: 1px solid rgba(0, 0, 0, .1);

-    -moz-transition: all 100ms;
-    -o-transition: all 100ms;
-    transition: all 100ms;

     border-radius: 0 3px 3px 0;
     }
 
     border-radius: 0 3px 3px 0;
     }
 


@@ -2360,7 +2519,7 @@ a:hover .icon.out-link   { background-position: -500px -14px;}
 
 .inspector-preset .preset-form {
     padding: 10px;
 
 .inspector-preset .preset-form {
     padding: 10px;

-    margin: 0 10px 20px 10px;
+    margin: 0 10px 10px 10px;

     border-radius: 8px;
 }
 
     border-radius: 8px;
 }
 


@@ -2417,6 +2576,10 @@ a:hover .icon.out-link   { background-position: -500px -14px;}
     text-align: right;
 }
 
     text-align: right;
 }
 

+.form-label-button-wrap .tag-reference-button {
+    border-radius: 0 3px 0 0;
+}
+

 .form-label-button-wrap .icon {
     opacity: .5;
 }
 .form-label-button-wrap .icon {
     opacity: .5;
 }


@@ -2494,7 +2657,7 @@ a:hover .icon.out-link   { background-position: -500px -14px;}
 .inspector-hover .entity-editor-pane .header button,
 .inspector-hover .spin-control,
 .inspector-hover .hide-toggle:before,
 .inspector-hover .entity-editor-pane .header button,
 .inspector-hover .spin-control,
 .inspector-hover .hide-toggle:before,

-.inspector-hover .more-buttons,
+.inspector-hover .more-fields,

 .inspector-hover .form-label-button-wrap,
 .inspector-hover .tag-reference-button,
 .inspector-hover .view-on-osm {
 .inspector-hover .form-label-button-wrap,
 .inspector-hover .tag-reference-button,
 .inspector-hover .view-on-osm {


@@ -2503,7 +2666,7 @@ a:hover .icon.out-link   { background-position: -500px -14px;}
 
 /* Styles for raw tag inspector on hover */
 .inspector-hover .tag-row .key-wrap,
 
 /* Styles for raw tag inspector on hover */
 .inspector-hover .tag-row .key-wrap,

-.inspector-hover .tag-row .input-wrap-position {
+.inspector-hover .tag-row .form-field.input-wrap-position {

     width: 50%;
 }
 
     width: 50%;
 }
 


@@ -2519,9 +2682,9 @@ a:hover .icon.out-link   { background-position: -500px -14px;}
     border-bottom-left-radius: 4px;
 }
 
     border-bottom-left-radius: 4px;
 }
 

-.inspector-hover .inspector-body .more-buttons {
+.inspector-hover .more-fields {

     max-height: 0;
     max-height: 0;

-    padding-bottom: 0;
+    margin-bottom: -10px;

 }
 
 /* Unstyle button fields */
 }
 
 /* Unstyle button fields */


@@ -2556,142 +2719,17 @@ a:hover .icon.out-link   { background-position: -500px -14px;}
     line-height: 0;
     display: block;
     overflow: hidden;
     line-height: 0;
     display: block;
     overflow: hidden;

-    -webkit-transition: opacity 200ms, width 0 200ms, padding 0 200ms, line-height 0 200ms;
-       -moz-transition: opacity 200ms, width 0 200ms, padding 0 200ms, line-height 0 200ms;
-         -o-transition: opacity 200ms, width 0 200ms, padding 0 200ms, line-height 0 200ms;
-            transition: opacity 200ms, width 0 200ms, padding 0 200ms, line-height 0 200ms;
-}
-
-/* first phase hover-to-active animations */
-
-textarea,
-.form-label,
-.preset-input-wrap,
-.preset-input-wrap .label {
-    -webkit-transition: all 200ms;
-       -moz-transition: all 200ms;
-         -o-transition: all 200ms;
-            transition: all 200ms;
-}
-
-/* second phase hover-to-active animations */
-
-input,
-.checkselect label:last-of-type {
-    -webkit-transition: opacity 200ms 200ms, width 200ms 200ms, margin-right 200ms 200ms;
-       -moz-transition: opacity 200ms 200ms, width 200ms 200ms, margin-right 200ms 200ms;
-         -o-transition: opacity 200ms 200ms, width 200ms 200ms, margin-right 200ms 200ms;
-            transition: opacity 200ms 200ms, width 200ms 200ms, margin-right 200ms 200ms;
-}
-
-.entity-editor-pane button.minor,
-.combobox-caret,
-.entity-editor-pane .header button,
-.toggle-list label span,
-.spin-control,
-.more-buttons,
-.view-on-osm,
-.hide-toggle:before,
-.entity-editor-pane .toggle-list label::before,
-.entity-editor-pane .toggle-list label.remove .icon {
-    -webkit-transition: opacity 200ms 200ms;
-       -moz-transition: opacity 200ms 200ms;
-         -o-transition: opacity 200ms 200ms;
-            transition: opacity 200ms 200ms;
-}
-
-.entity-editor-pane a.hide-toggle {
-    -webkit-transition: padding-left 200ms 200ms, color 200ms 200ms;
-       -moz-transition: padding-left 200ms 200ms, color 200ms 200ms;
-         -o-transition: padding-left 200ms 200ms, color 200ms 200ms;
-            transition: padding-left 200ms 200ms, color 200ms 200ms;
-}
-
-.entity-editor-pane .toggle-list label:not(.active) {
-    -webkit-transition: height 200ms 200ms, padding 200ms 200ms, border-width 100ms 300ms;
-       -moz-transition: height 200ms 200ms, padding 200ms 200ms, border-width 100ms 300ms;
-         -o-transition: height 200ms 200ms, padding 200ms 200ms, border-width 100ms 300ms;
-            transition: height 200ms 200ms, padding 200ms 200ms, border-width 100ms 300ms;
-}
-
-.entity-editor-pane .toggle-list label {
-    -webkit-transition: border-width 100ms 300ms, padding 200ms 200ms, background-color 200ms 200ms, color 200ms 200ms;
-       -moz-transition: border-width 100ms 300ms, padding 200ms 200ms, background-color 200ms 200ms, color 200ms 200ms;
-         -o-transition: border-width 100ms 300ms, padding 200ms 200ms, background-color 200ms 200ms, color 200ms 200ms;
-            transition: border-width 100ms 300ms, padding 200ms 200ms, background-color 200ms 200ms, color 200ms 200ms;

 }
 
 /* adding additional preset fields */
 
 }
 
 /* adding additional preset fields */
 

-.inspector-body .more-buttons {
-    max-height: 100px;
-    padding-top: 0;
-    -webkit-transition: padding 200ms 200ms, max-height 200ms 200ms;
-       -moz-transition: padding 200ms 200ms, max-height 200ms 200ms;
-         -o-transition: padding 200ms 200ms, max-height 200ms 200ms;
-            transition: padding 200ms 200ms, max-height 200ms 200ms;
-}
-
-button.preset-add-field {
-    background: #f6f6f6;
-    width: 25%;
-    height: 40px;
-    -webkit-transition: width 200ms;
-       -moz-transition: width 200ms;
-         -o-transition: width 200ms;
-            transition: width 200ms;
-}
-
-button.preset-add-field:hover {
-    background: #ececec;
-}
-
-/* set width based on # of buttons */
-
-button.preset-add-field:only-child {
-    width: 100%;
-}
-
-button.preset-add-field:nth-last-child(2),
-button.preset-add-field:nth-last-child(2) ~ button.preset-add-field {
-    width: 50%;
-}
-
-button.preset-add-field:nth-last-child(3),
-button.preset-add-field:nth-last-child(3) ~ button.preset-add-field {
-    width: 33.3333%;
-}
-
-button.preset-add-field:nth-last-child(4),
-button.preset-add-field:nth-last-child(4) ~ button.preset-add-field {
-    width: 25%;
-}
-
-button.preset-add-field:nth-last-child(5),
-button.preset-add-field:nth-last-child(5) ~ button.preset-add-field {
-    width: 20%;
-}
-
-button.preset-add-field:nth-last-child(6),
-button.preset-add-field:nth-last-child(6) ~ button.preset-add-field {
-    width: 16.6666%;
-}
-
-button.preset-add-field:nth-last-child(7),
-button.preset-add-field:nth-last-child(7) ~ button.preset-add-field {
-    width: 14.2857%;
-}
-
-button.preset-add-field:nth-last-child(8),
-button.preset-add-field:nth-last-child(8) ~ button.preset-add-field {
-    width: 12.5%;
+.more-fields {
+    padding: 0 20px 20px 20px;
+    font-weight: bold;

 }
 
 }
 

-.preset-fav button.fav {
-    height: 30px;
-    margin: 5px;
-    padding: 0 10px;
-}
+.more-fields label { padding: 5px 10px 5px 0; }
+.more-fields input { width: 50%;}

 
 /* preset form access */
 
 
 /* preset form access */
 


@@ -2718,6 +2756,21 @@ button.preset-add-field:nth-last-child(8) ~ button.preset-add-field {
     border-bottom-right-radius: 4px;
 }
 
     border-bottom-right-radius: 4px;
 }
 

+/* preset form cycleway */
+
+.form-field-cycleway .preset-input-wrap li {
+    border-bottom: 1px solid #CCC;
+}
+.form-field-cycleway .preset-input-wrap li:last-child {
+    border-bottom: 0;
+}
+
+.preset-input-cycleway-wrap input {
+    border-radius: 0;
+    border-width: 0;
+    border-left-width: 1px;
+}
+

 /* preset form numbers */
 
 input[type=number] {
 /* preset form numbers */
 
 input[type=number] {


@@ -3025,10 +3078,6 @@ div.combobox {
     width: 40%;
     float: left;
     height: 30px;
     width: 40%;
     float: left;
     height: 30px;

-    -webkit-transition: width 200ms;
-       -moz-transition: width 200ms;
-         -o-transition: width 200ms;
-            transition: width 200ms;

 }
 
 .tag-row input.key {
 }
 
 .tag-row input.key {


@@ -3213,6 +3262,27 @@ img.wiki-image {
     background: rgba(0,0,0,.8);
 }
 
     background: rgba(0,0,0,.8);
 }
 

+/* Fullscreen button */
+div.full-screen {
+    float: right;
+    width: 40px;
+    margin-right: 10px;
+}
+
+div.full-screen .tooltip {
+    min-width: 160px;
+}
+
+div.full-screen > button, div.full-screen > button.active {
+    width: 40px;
+    height: 40px;
+    background: transparent;
+}
+
+div.full-screen > button:hover {
+    background-color: rgba(0, 0, 0, .8);
+}
+

 /* Map Controls */
 
 .map-controls {
 /* Map Controls */
 
 .map-controls {


@@ -3244,12 +3314,18 @@ img.wiki-image {
     border-radius: 4px 0 0 0;
 }
 
     border-radius: 4px 0 0 0;
 }
 

-/* Background Settings */
+/* Background / Map Data Settings */
+
+
+.map-data-control button {
+    border-radius: 0;
+}

 
 .background-control button {
     border-radius: 4px 0 0 0;
 }
 
 
 .background-control button {
     border-radius: 4px 0 0 0;
 }
 

+.map-data-control,

 .background-control {
     position: relative;
 }
 .background-control {
     position: relative;
 }


@@ -3262,11 +3338,12 @@ img.wiki-image {
     border: 0;
 }
 
     border: 0;
 }
 

-.background-control .hide-toggle  {
+.map-data-control .hide-toggle,
+.background-control .hide-toggle {

     padding-bottom: 10px;
 }
 
     padding-bottom: 10px;
 }
 

-.layer-list {
+.layer-list, .controls-list {

     margin-bottom: 10px;
     border: 1px solid #CCC;
     border-radius: 4px;
     margin-bottom: 10px;
     border: 1px solid #CCC;
     border-radius: 4px;


@@ -3316,6 +3393,22 @@ img.wiki-image {
     text-overflow: ellipsis;
 }
 
     text-overflow: ellipsis;
 }
 

+.minimap-toggle {
+    display: block;
+    padding: 5px 10px;
+    cursor: pointer;
+    color: #7092FF;
+    border-radius: 3px;
+}
+
+.minimap-toggle.active {
+    background: #E8EBFF;
+}
+
+.minimap-toggle:hover {
+    background-color: #ececec;
+}
+

 .hide-toggle {
     display: block;
     padding-left:12px;
 .hide-toggle {
     display: block;
     padding-left:12px;


@@ -3407,6 +3500,8 @@ img.wiki-image {
     z-index: 9999;
 }
 
     z-index: 9999;
 }
 

+.map-data-control li:hover .select-box,
+.map-data-control li.selected .select-box,

 .background-control li:hover .select-box,
 .background-control li.selected .select-box {
     border: 2px solid #7092ff;
 .background-control li:hover .select-box,
 .background-control li.selected .select-box {
     border: 2px solid #7092ff;


@@ -3414,6 +3509,8 @@ img.wiki-image {
     opacity: .5;
 }
 
     opacity: .5;
 }
 

+.map-data-control li.selected:hover .select-box,
+.map-data-control li.selected .select-box,

 .background-control li.selected:hover .select-box,
 .background-control li.selected .select-box {
     opacity: 1;
 .background-control li.selected:hover .select-box,
 .background-control li.selected .select-box {
     opacity: 1;


@@ -3426,6 +3523,7 @@ img.wiki-image {
     height:18px;
 }
 
     height:18px;
 }
 

+.map-data-control .layer-list button,

 .background-control .layer-list button {
     float: right;
     height: 100%;
 .background-control .layer-list button {
     float: right;
     height: 100%;


@@ -3434,14 +3532,23 @@ img.wiki-image {
     border-radius: 0;
 }
 
     border-radius: 0;
 }
 

+.map-data-control .layer-list button .icon,

 .background-control .layer-list button .icon {
     opacity: 0.5;
 }
 
 .background-control .layer-list button .icon {
     opacity: 0.5;
 }
 

+.map-data-control .layer-list button:first-of-type,

 .background-control .layer-list button:first-of-type {
     border-radius: 0 3px 3px 0;
 }
 
 .background-control .layer-list button:first-of-type {
     border-radius: 0 3px 3px 0;
 }
 

+.map-data-control .map-overlay,
+.background-control .map-overlay,
+.help-control .map-overlay {
+    z-index: -1;
+}
+
+

 /* Geolocator */
 
 .geolocate-control {
 /* Geolocator */
 
 .geolocate-control {


@@ -3461,9 +3568,6 @@ img.wiki-image {
     overflow: auto;
 }
 
     overflow: auto;
 }
 

-.background-control .map-overlay {
-    z-index: -1;
-}

 /* Help */
 
 .help-control button {
 /* Help */
 
 .help-control button {


@@ -3579,23 +3683,145 @@ img.wiki-image {
     bottom: 0;
 }
 
     bottom: 0;
 }
 

+/* Map-In-Map
+------------------------------------------------------- */
+
+.map-in-map {
+    position: absolute;
+    overflow: hidden;
+    top: 60px;
+    width: 200px;
+    height: 150px;
+    z-index: 5;
+    background: #000;
+    border: #aaa 1px solid;
+    box-shadow: 0 0 2em black;
+}
+
+.map-in-map-tiles {
+    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;
+}
+
+.map-in-map-svg,
+.map-in-map-gpx {
+    top: 0;
+    left: 0;
+    overflow: hidden;
+    height: 100%;
+    width: 100%;
+}
+
+.map-in-map-svg {
+    position: absolute;
+}
+
+.map-in-map-gpx {
+    position: relative;
+    z-index: 10;
+}
+
+.map-in-map-bbox {
+    fill: none;
+    stroke: rgba(255, 255, 0, 0.75);
+    stroke-width: 1;
+    shape-rendering: crispEdges;
+}
+
+.map-in-map-bbox.thick {
+    stroke-width: 5;
+}
+
+/* Info Box
+------------------------------------------------------- */
+.infobox {
+    position: absolute;
+    z-index: 1;
+    right: 0;
+    bottom: 30px;
+    width: 240px;
+    border-radius: 4px 0 0 0;
+    border-bottom: 1px solid black;
+}
+
+.infobox .selection-heading {
+    display: block;
+    border-radius: 4px 0 0 0;
+    padding: 5px 10px;
+    height: 30px;
+}
+
+.infobox ul {
+    padding: 5px 10px;
+}
+
+.infobox .button {
+    position: absolute;
+    background: #7092ff;
+    border-radius: 2px;
+    padding: 0 4px;
+    color: white;
+    top: 40px;
+    right: 10px;
+}
+

 /* About Section
 ------------------------------------------------------- */
 
 /* About Section
 ------------------------------------------------------- */
 

-#footer {
+#about {

     width: 100%;
     position: absolute;
     right:0;
     bottom:0;
     border-radius: 0;
     width: 100%;
     position: absolute;
     right:0;
     bottom:0;
     border-radius: 0;

-    opacity: .625;
-    -webkit-transition: opacity 200ms;
-    -moz-transition: opacity 200ms;
-    transition: opacity 200ms;

 }
 
 }
 

-#footer:hover {
-    opacity: 1;
+#attrib {
+    width: 100%;
+    height: 20px;
+    margin-bottom: 5px;
+    float: left;
+    clear: both;
+    pointer-events: none;
+}
+
+#attrib * { pointer-events: all; }
+
+.base-layer-attribution,
+.overlay-layer-attribution {
+    position: absolute;
+    color: #888;
+    font-size: 10px;
+}
+
+.base-layer-attribution {
+    left: 10px;
+}
+
+.overlay-layer-attribution {
+    right: 10px;
+}
+
+.overlay-layer-attribution .attribution:not(:last-child):after {
+    content: '; ';
+}
+
+.source-image {
+    height:20px;
+    vertical-align:top;
+}
+
+#footer {
+    width: 100%;
+    float: left;
+    clear: both;

 }
 
 #scale-block {
 }
 
 #scale-block {


@@ -3637,6 +3863,19 @@ img.wiki-image {
     clear: right;
 }
 
     clear: right;
 }
 

+#about-list li {
+    float: right;
+    border-left: 1px solid rgba(255,255,255,.5);
+    padding: 5px 0 5px 5px;
+    margin-left: 5px;
+}
+
+#about-list li:last-child {
+    border-left: 0;
+    margin-left: 0;
+    padding-left: 0;
+}
+

 .source-switch a {
     padding: 2px 4px 4px 4px;
     border-radius: 2px;
 .source-switch a {
     padding: 2px 4px 4px 4px;
     border-radius: 2px;


@@ -3646,30 +3885,11 @@ img.wiki-image {
     color:#fff;
 }
 
     color:#fff;
 }
 

-/* Attribution overlay */
-.base-layer-attribution,
-.overlay-layer-attribution {
-    position: absolute;
-    bottom: 35px;
-    color: #888;
-    font-size: 10px;
-}
-
-.base-layer-attribution {
-    left: 10px;
-}
-
-.overlay-layer-attribution {
-    right: 10px;
-}
-
-.overlay-layer-attribution .attribution:not(:last-child):after {
-    content: '; ';
-}
-
-.source-image {
-    height:20px;
-    vertical-align:top;
+.feature-warning a {
+    background: #1e90ff;
+    padding: 2px 4px 4px 4px;
+    border-radius: 2px;
+    color: #eee;

 }
 
 .user-list a:not(:last-child):after {
 }
 
 .user-list a:not(:last-child):after {


@@ -3681,25 +3901,28 @@ img.wiki-image {
     clear: both;
     text-align: right;
     width: 100%;
     clear: both;
     text-align: right;
     width: 100%;

+    padding: 0px 10px;

 }
 
 .api-status.offline,
 .api-status.readonly,
 .api-status.error {
     background: red;
 }
 
 .api-status.offline,
 .api-status.readonly,
 .api-status.error {
     background: red;

-    padding: 0px 5px;

 }
 
 /* Modals
 ------------------------------------------------------- */
 
 .modal {
 }
 
 /* Modals
 ------------------------------------------------------- */
 
 .modal {

+    top: 40px;

     display: inline-block;
     position:absolute;
     display: inline-block;
     position:absolute;

+    border-radius: 3px;
+    overflow: hidden;

     left: 0;
     right: 0;
     margin: auto;
     left: 0;
     right: 0;
     margin: auto;

-    z-index: 3;
+    z-index: 50;

 }
 
 .modal .loader {
 }
 
 .modal .loader {


@@ -3711,7 +3934,7 @@ img.wiki-image {
 }
 
 .shaded {
 }
 
 .shaded {

-    z-index: 2;
+    z-index: 49;

     position: absolute;
     top: 0;
     bottom: 0;
     position: absolute;
     top: 0;
     bottom: 0;


@@ -3732,8 +3955,26 @@ img.wiki-image {
     border-bottom: 1px solid #CCC;
 }
 
     border-bottom: 1px solid #CCC;
 }
 

-.modal-section:last-child {
-    border-bottom: 0;
+.modal-section.header h3 {
+    padding: 0;
+}
+
+.modal-section.buttons {
+    text-align: center;
+}
+
+.modal-section.buttons .action {
+    display: inline-block;
+    margin: 0 10px;
+    text-align: center;
+    vertical-align: middle;
+}
+
+.save-section .buttons .action {
+    display: inline-block;
+    margin: 0 20px 0 0;
+    text-align: center;
+    vertical-align: middle;

 }
 
 .loading-modal {
 }
 
 .loading-modal {


@@ -3762,7 +4003,8 @@ img.wiki-image {
     display: block;
     content: '';
     height: 100px;
     display: block;
     content: '';
     height: 100px;

-    width: 100px;
+    width: 100%;
+    max-width: 100px;

     margin: auto;
     margin-bottom: 10px;
     background:transparent url(<%= asset_path("iD/img/sprite.svg") %>) no-repeat 0 -220px;
     margin: auto;
     margin-bottom: 10px;
     background:transparent url(<%= asset_path("iD/img/sprite.svg") %>) no-repeat 0 -220px;


@@ -3772,6 +4014,10 @@ img.wiki-image {
     border-right: 1px solid #CCC;
 }
 
     border-right: 1px solid #CCC;
 }
 

+.modal-section:last-child {
+    border-bottom: 0;
+}
+

 /* Restore Modal
 ------------------------------------------------------- */
 
 /* Restore Modal
 ------------------------------------------------------- */
 


@@ -3841,14 +4087,6 @@ img.wiki-image {
     margin-bottom: 0;
 }
 
     margin-bottom: 0;
 }
 

-.mode-save button.action {
-    float: none;
-    margin: auto;
-    display: block;
-    color: white;
-    font-size: 14px;
-}
-

 .mode-save .user-info img {
     float: left;
 }
 .mode-save .user-info img {
     float: left;
 }


@@ -3911,6 +4149,56 @@ img.wiki-image {
 
 .changeset-list li:first-child { border-top: 0;}
 
 
 .changeset-list li:first-child { border-top: 0;}
 

+/* Conflict resolution
+------------------------------------------------------- */
+
+.conflicts-help {
+    padding: 20px;
+    background-color: #ffffbb;
+    border-bottom: 1px solid #ccc;
+}
+
+.conflicts-buttons {
+    padding: 20px;
+}
+
+.mode-save button.conflicts-button {
+    float: left;
+}
+
+.conflict-container {
+    border-bottom: 1px solid #ccc;
+}
+
+.conflict-description {
+    padding: 5px 20px;
+    display: block;
+}
+
+.conflicts-done {
+    padding: 20px 20px 0 20px;
+}
+
+.conflict-detail-container {
+    padding: 10px 20px;
+}
+
+.conflict-count {
+    padding: 10px 20px;
+}
+
+.conflict-choices {
+    margin-top: 10px;
+}
+
+.conflict-nav-buttons {
+    padding: 10px 0 20px 0;
+}
+
+.conflict-nav-button {
+    height: 30px;
+}
+

 /* Notices
 ------------------------------------------------------- */
 
 /* Notices
 ------------------------------------------------------- */
 


@@ -3986,6 +4274,7 @@ img.wiki-image {
 
 .tooltip-inner {
     display: inline-block;
 
 .tooltip-inner {
     display: inline-block;

+    border-radius: 3px;

     max-width: 200px;
     min-width: 80px;
     padding: 10px;
     max-width: 200px;
     min-width: 80px;
     padding: 10px;


@@ -4018,6 +4307,7 @@ img.wiki-image {
 }
 
 .tail div {
 }
 
 .tail div {

+    border-radius: 3px;

     padding: 10px;
     background: white;
     position: absolute;
     padding: 10px;
     background: white;
     position: absolute;


@@ -4085,31 +4375,11 @@ img.wiki-image {
     background: #F6F6F6;
     padding: 10px;
     margin: 10px -10px -10px;
     background: #F6F6F6;
     padding: 10px;
     margin: 10px -10px -10px;

+    border-radius: 0 0 3px 3px;

 }
 
 .tooltip-inner .keyhint {
 }
 
 .tooltip-inner .keyhint {

-    font-size: 10px;
-    padding: 0 7px;

     font-weight: bold;
     font-weight: bold;

-    display: inline-block;
-    border-radius: 2px;
-    border: 1px solid #CCC;
-    position: relative;
-    z-index: 1;
-    text-align: left;
-}
-
-.tooltip-inner .keyhint::after {
-    content: "";
-    position: absolute;
-    border-radius: 2px;
-    height: 10px;
-    width: 100%;
-    z-index: 0;
-    bottom: -4px;
-    left: -1px;
-    border: 1px solid #CCC;
-    border-top: 0;

 }
 
 /* Exceptions for tooltip layouts */
 }
 
 /* Exceptions for tooltip layouts */


@@ -4140,6 +4410,7 @@ img.wiki-image {
 }
 
 .map-overlay .tooltip-inner,
 }
 
 .map-overlay .tooltip-inner,

+.map-overlay .keyhint-wrap,

 .entity-editor-pane .tooltip-inner,
 .warning-section .tooltip-inner {
     background: #000;
 .entity-editor-pane .tooltip-inner,
 .warning-section .tooltip-inner {
     background: #000;


@@ -4210,6 +4481,19 @@ img.wiki-image {
     #bar .save .label { display: block;}
 }
 
     #bar .save .label { display: block;}
 }
 

+@media screen and (max-width: 1200px) {
+    .user-list { display: none !important; }
+}
+
+@media screen and (max-width: 1000px) {
+    #userLink { display: none !important; }
+}
+
+@media screen and (max-width: 900px) {
+    #scale-block { display: none !important; }
+}
+
+

 /* Scrollbars
  ----------------------------------------------------- */
 
 /* Scrollbars
  ----------------------------------------------------- */
 


@@ -4499,7 +4783,7 @@ img.wiki-image {
 .preset-icon-line.feature-pipeline{background-position:-2300px -25px;}
 .preset-icon-relation.feature-relation{background-position:-20px -25px;}
 .preset-icon-relation.feature-restriction{background-position:-80px -25px;}
 .preset-icon-line.feature-pipeline{background-position:-2300px -25px;}
 .preset-icon-relation.feature-relation{background-position:-20px -25px;}
 .preset-icon-relation.feature-restriction{background-position:-80px -25px;}

-.preset-icon-relation.feature-multipolygon{background-position:-140px -25px;}
+.preset-icon-relation.feature-multipolygon{background-position:-141px -25px;}

 .preset-icon-relation.feature-boundary{background-position:-200px -25px;}
 .preset-icon-relation.feature-route{background-position:-260px -25px;}
 .preset-icon-relation.feature-route-road{background-position:-320px -25px;}
 .preset-icon-relation.feature-boundary{background-position:-200px -25px;}
 .preset-icon-relation.feature-route{background-position:-260px -25px;}
 .preset-icon-relation.feature-route-road{background-position:-320px -25px;}