Merge branch 'master' into summer_toboggan

css/20_map.css

@@ -265,6 +265,18 @@ text.point {
     opacity: 0.8;
 }
 
+/* Highlighting */
+
+g.point.highlighted .shadow,
+path.shadow.highlighted {
+    stroke-opacity: 0.95;
+    stroke: #7092ff;
+}
+g.vertex.highlighted .shadow {
+    stroke-width: 7;
+    stroke-opacity: 0.95;
+    stroke: #7092ff;
+}
 
 /* Turn Restrictions */
 

css/45_waterways.css

@@ -4,7 +4,6 @@
     fill: #77d3de;
 }
 .preset-icon .icon.iD-category-water,
-.preset-icon .icon.tag-route-ferry,
 .preset-icon .icon.tag-type-waterway,
 .preset-icon .icon.tag-waterway {
     color: #77d3de;
@@ -95,3 +94,26 @@ path.area.fill.tag-waterway-fuel {
     fill: rgba(255, 255, 255, 0.3);
 }
 
+/* ferry routes  */
+.preset-icon .icon.tag-route-ferry {
+    color: #58a9ed;
+    fill: #fff;
+}
+path.shadow.tag-route-ferry {
+    stroke-width: 16;
+}
+path.stroke.tag-route-ferry {
+    stroke-width: 3;
+    stroke-linecap: butt;
+    stroke-dasharray: 12,8;
+}
+.low-zoom path.shadow.tag-route-ferry {
+    stroke-width: 12;
+}
+.low-zoom path.stroke.tag-route-ferry {
+    stroke-width: 2;
+    stroke-dasharray: 6,4;
+}
+path.stroke.tag-route-ferry {
+    stroke: #58a9ed;
+}

css/50_misc.css

@@ -1,10 +1,12 @@
-/* power */
+/* power and pipeline */
 .preset-icon .icon.tag-man_made-pipeline,
 .preset-icon .icon.tag-power {
     color: #939393;
     fill: #939393;
 }
 
+/* power */
+
 path.stroke.tag-power {
     stroke: #939393;
     stroke-width: 2;
@@ -13,6 +15,21 @@ path.casing.tag-power {
     stroke: none;
 }
 
+/* pipeline */
+
+path.stroke.tag-man_made-pipeline {
+    stroke: #CBD0D8;
+    stroke-linecap: butt;
+    stroke-width: 3;
+    stroke-dasharray: 80, 1.25;
+}
+path.casing.tag-man_made-pipeline {
+    stroke: #666;
+    stroke-width: 4.5;
+}
+.low-zoom path.stroke.tag-man_made-pipeline {
+    stroke-dasharray: 40, 1;
+}
 
 /* boundaries */
 path.stroke.tag-boundary {
@@ -145,10 +162,14 @@ path.casing.tag-highway-bridleway.tag-bridge {
 
 
 /* tunnels */
-path.stroke.tag-tunnel {
+path.stroke.tag-tunnel,
+path.line.stroke.tag-location-underground,
+path.line.stroke.tag-location-underwater {
     stroke-opacity: 0.3;
 }
-path.casing.tag-tunnel {
+path.casing.tag-tunnel,
+path.line.casing.tag-location-underground,
+path.line.stroke.tag-location-underwater {
     stroke-opacity: 0.5;
     stroke-linecap: butt;
     stroke-dasharray: none;
@@ -218,6 +239,7 @@ path.fill.tag-building {
     stroke: rgba(224, 110, 95, 0.3);
     fill: rgba(224, 110, 95, 0.3);
 }
+.preset-icon-fill-area.tag-parking-multi-storey,
 .preset-icon-fill-area.tag-building {
     border-color: rgb(224, 110, 95);
     background-color: rgba(224, 110, 95, 0.3);

css/80_app.css

@@ -902,6 +902,18 @@ a.hide-toggle {
     border-radius: 0;
 }
 
+.geocode-item {
+    width: 50%;
+    background-color: #ccc;
+    left: 25%;
+    margin-top: 30px;
+    border-radius: 2px;
+}
+
+.geocode-item:hover {
+    background-color: #aaa;
+}
+
 .feature-list-item {
     background-color: #fff;
     font-weight: bold;
@@ -1117,7 +1129,8 @@ a.hide-toggle {
     border-radius: 3px 0 0 3px;
 }
 
-.preset-list-button:hover .label {
+.preset-list-button:hover .label,
+.preset-list-button:focus .label {
     background-color: #ececec;
 }
 
@@ -1240,12 +1253,11 @@ a.hide-toggle {
     top: 0;
     right: 0;
     height: 100%;
-    width: 100%;
     background: transparent;
-    text-align: right;
 }
 [dir='rtl'] .form-label-button-wrap {
-    text-align: left;
+    right: auto;
+    left: 0;
 }
 
 .form-label-button-wrap .tag-reference-button {