X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/356fa7f2dec9284ad473ea0b062e7b3b00a60988..f2bf38606e281290fee8273e247afc54f08a0a47:/vendor/assets/iD/iD.css.erb

diff --git a/vendor/assets/iD/iD.css.erb b/vendor/assets/iD/iD.css.erb
index 168f28b42..1e63410fa 100644
--- a/vendor/assets/iD/iD.css.erb
+++ b/vendor/assets/iD/iD.css.erb
@@ -180,6 +180,9 @@ img.tile {
 img.tile-loaded {
     opacity: 1;
 }
+img.tile-removing {
+    opacity: 0;
+}
 
 /* base styles */
 path {
@@ -221,7 +224,7 @@ g.point .shadow {
     stroke-opacity: 0;
 }
 
-.behavior-hover g.point.hover:not(.selected) .shadow {
+g.point.hover:not(.selected) .shadow {
     stroke-opacity: 0.5;
 }
 
@@ -236,7 +239,7 @@ g.point.active, g.point.active * {
 /* vertices and midpoints */
 
 g.vertex .fill {
-    fill: none;
+    fill: #000;
 }
 
 g.vertex .stroke {
@@ -249,10 +252,6 @@ g.vertex.shared .stroke {
     fill: #aaa;
 }
 
-g.vertex.tagged .fill {
-    fill: #000;
-}
-
 g.midpoint .fill {
     fill: #ddd;
     stroke: black;
@@ -270,17 +269,17 @@ g.vertex.vertex-hover {
     display: none;
 }
 
-.mode-draw-area .behavior-hover g.vertex.vertex-hover,
-.mode-draw-line .behavior-hover g.vertex.vertex-hover,
-.mode-add-area  .behavior-hover g.vertex.vertex-hover,
-.mode-add-line  .behavior-hover g.vertex.vertex-hover,
-.mode-add-point .behavior-hover g.vertex.vertex-hover,
-.mode-drag-node .behavior-hover g.vertex.vertex-hover {
+.mode-draw-area g.vertex.vertex-hover,
+.mode-draw-line g.vertex.vertex-hover,
+.mode-add-area  g.vertex.vertex-hover,
+.mode-add-line  g.vertex.vertex-hover,
+.mode-add-point g.vertex.vertex-hover,
+.mode-drag-node g.vertex.vertex-hover {
     display: block;
 }
 
-.behavior-hover g.vertex.hover:not(.selected) .shadow,
-.behavior-hover g.midpoint.hover:not(.selected) .shadow {
+g.vertex.hover:not(.selected) .shadow,
+g.midpoint.hover:not(.selected) .shadow {
     fill-opacity: 0.3;
 }
 
@@ -292,8 +291,7 @@ g.vertex.selected .shadow {
 .mode-draw-line g.midpoint,
 .mode-add-area g.midpoint,
 .mode-add-line g.midpoint,
-.mode-add-point g.midpoint,
-.mode-drag-node g.midpoint {
+.mode-add-point g.midpoint {
   display: none;
 }
 
@@ -315,7 +313,7 @@ path.shadow {
     stroke-opacity: 0;
 }
 
-.behavior-hover path.shadow.hover:not(.selected) {
+path.shadow.hover:not(.selected) {
     stroke-opacity: 0.3;
 }
 
@@ -323,18 +321,11 @@ path.shadow.selected {
     stroke-opacity: 0.7;
 }
 
-path.area.stroke,
-path.line.member-type-multipolygon.stroke {
-    stroke-width:2;
-}
-path.area.stroke.selected,
-path.line.member-type-multipolygon.stroke.selected {
-    stroke-width:4 !important;
-}
-
 path.area.stroke {
-    stroke:#fff;
+    stroke: white;
+    stroke-width: 1;
 }
+
 path.area.fill {
     fill:#fff;
     fill-opacity:0.3;
@@ -348,7 +339,6 @@ path.line.stroke {
 
 path.stroke.tag-natural {
     stroke: #b6e199;
-    stroke-width:1;
 }
 path.fill.tag-natural {
     fill: #b6e199;
@@ -361,9 +351,24 @@ path.fill.tag-natural-water {
     fill: #77d3de;
 }
 
+path.stroke.tag-amenity-school {
+    stroke: #ffff94;
+}
+path.fill.tag-amenity-school {
+    fill: #ffff94;
+    fill-opacity: 0.2;
+}
+
+path.stroke.tag-amenity-university {
+    stroke: #ffff94;
+}
+path.fill.tag-amenity-university {
+    fill: #ffff94;
+    fill-opacity: 0.1;
+}
+
 path.stroke.tag-building {
     stroke: #e06e5f;
-    stroke-width: 1;
 }
 path.fill.tag-building {
     fill: #e06e5f;
@@ -376,13 +381,9 @@ path.stroke.tag-landuse,
 path.stroke.tag-natural-wood,
 path.stroke.tag-natural-tree,
 path.stroke.tag-natural-grassland,
+path.stroke.tag-leisure-pitch,
 path.stroke.tag-leisure-park {
     stroke: #8cd05f;
-    stroke-width: 1;
-}
-
-path.stroke.tag-landuse-residential {
-    stroke: #e06e5f;
 }
 
 path.stroke.tag-landuse-retail,
@@ -426,6 +427,7 @@ 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: #8cd05f;
     fill-opacity: 0.2;
@@ -546,7 +548,6 @@ path.fill.tag-landuse-industrial {
 
 path.stroke.tag-amenity-parking {
     stroke: #aaa;
-    stroke-width: 1;
 }
 path.fill.tag-amenity-parking {
     fill: #aaa;
@@ -571,13 +572,13 @@ path.stroke.tag-highway {
     stroke-width:8;
 }
 
-svg[data-zoom="16"] path.shadow.tag-highway {
+.low-zoom path.shadow.tag-highway {
     stroke-width:12;
 }
-svg[data-zoom="16"] path.casing.tag-highway {
+.low-zoom path.casing.tag-highway {
     stroke-width:6;
 }
-svg[data-zoom="16"] path.stroke.tag-highway {
+.low-zoom path.stroke.tag-highway {
     stroke-width:4;
 }
 
@@ -690,10 +691,10 @@ path.casing.tag-highway-service {
     stroke:#666;
     stroke-width:6;
 }
-svg[data-zoom="16"] path.stroke.tag-highway-service {
+.low-zoom path.stroke.tag-highway-service {
     stroke-width:2;
 }
-svg[data-zoom="16"] path.casing.tag-highway-service {
+.low-zoom path.casing.tag-highway-service {
     stroke-width:4;
 }
 
@@ -707,10 +708,10 @@ path.casing.tag-highway-track {
     stroke-linecap: butt;
     stroke-dasharray: 6, 6;
 }
-svg[data-zoom="16"] path.stroke.tag-highway-track {
+.low-zoom path.stroke.tag-highway-track {
     stroke-width:2;
 }
-svg[data-zoom="16"] path.casing.tag-highway-track {
+.low-zoom path.casing.tag-highway-track {
     stroke-width:4;
 }
 
@@ -739,14 +740,14 @@ path.casing.tag-highway-bridleway {
     stroke: #fff;
 }
 
-svg[data-zoom="16"] path.stroke.tag-highway-footway,
-svg[data-zoom="16"] path.stroke.tag-highway-cycleway,
-svg[data-zoom="16"] path.stroke.tag-highway-bridleway {
+.low-zoom path.stroke.tag-highway-footway,
+.low-zoom path.stroke.tag-highway-cycleway,
+.low-zoom path.stroke.tag-highway-bridleway {
     stroke-width: 2;
 }
-svg[data-zoom="16"] path.casing.tag-highway-footway,
-svg[data-zoom="16"] path.casing.tag-highway-cycleway,
-svg[data-zoom="16"] path.casing.tag-highway-bridleway {
+.low-zoom path.casing.tag-highway-footway,
+.low-zoom path.casing.tag-highway-cycleway,
+.low-zoom path.casing.tag-highway-bridleway {
     stroke-width: 4;
 }
 
@@ -806,24 +807,24 @@ path.fill.tag-aeroway-apron {
 
 /* bridges */
 
-path.casing.tag-bridge-yes {
+path.casing.tag-bridge {
     stroke-width: 14;
     stroke-opacity: 0.5;
     stroke: #000;
 }
 
-path.casing.tag-highway-living_street.tag-bridge-yes,
-path.casing.tag-highway-path.tag-bridge-yes {
+path.casing.tag-highway-living_street.tag-bridge,
+path.casing.tag-highway-path.tag-bridge {
     stroke-width: 6;
 }
 
 path.casing.line.tag-highway-pedestrian,
-path.casing.tag-highway-service.tag-bridge-yes,
-path.casing.tag-highway-track.tag-bridge-yes,
-path.casing.tag-highway-steps.tag-bridge-yes,
-path.casing.tag-highway-footway.tag-bridge-yes,
-path.casing.tag-highway-cycleway.tag-bridge-yes,
-path.casing.tag-highway-bridleway.tag-bridge-yes {
+path.casing.tag-highway-service.tag-bridge,
+path.casing.tag-highway-track.tag-bridge,
+path.casing.tag-highway-steps.tag-bridge,
+path.casing.tag-highway-footway.tag-bridge,
+path.casing.tag-highway-cycleway.tag-bridge,
+path.casing.tag-highway-bridleway.tag-bridge {
     stroke-width: 8;
 }
 
@@ -831,25 +832,25 @@ path.shadow.tag-highway-residential.tag-bridge {
     stroke-width:22;
 }
 
-path.shadow.tag-highway-living_street.tag-bridge-yes,
-path.shadow.tag-highway-path.tag-bridge-yes,
+path.shadow.tag-highway-living_street.tag-bridge,
+path.shadow.tag-highway-path.tag-bridge,
 path.shadow.line.tag-highway-pedestrian,
-path.shadow.tag-highway-service.tag-bridge-yes,
-path.shadow.tag-highway-track.tag-bridge-yes,
-path.shadow.tag-highway-steps.tag-bridge-yes,
-path.shadow.tag-highway-footway.tag-bridge-yes,
-path.shadow.tag-highway-cycleway.tag-bridge-yes,
-path.shadow.tag-highway-bridleway.tag-bridge-yes {
+path.shadow.tag-highway-service.tag-bridge,
+path.shadow.tag-highway-track.tag-bridge,
+path.shadow.tag-highway-steps.tag-bridge,
+path.shadow.tag-highway-footway.tag-bridge,
+path.shadow.tag-highway-cycleway.tag-bridge,
+path.shadow.tag-highway-bridleway.tag-bridge {
     stroke-width: 16;
 }
 
 /* tunnels */
 
-path.stroke.tag-highway.tag-tunnel-yes {
+path.stroke.tag-highway.tag-tunnel {
     stroke-opacity: 0.3;
 }
 
-path.casing.tag-highway.tag-tunnel-yes {
+path.casing.tag-highway.tag-tunnel {
     stroke-opacity: 0.5;
 }
 
@@ -861,8 +862,8 @@ path.casing.tag-highway-construction {
 
 /* construction */
 
-svg[data-zoom="16"] path.stroke.tag-highway-construction,
-svg[data-zoom="16"] path.casing.tag-highway-construction {
+.low-zoom path.stroke.tag-highway-construction,
+.low-zoom path.casing.tag-highway-construction {
     stroke-linecap: butt;
     stroke-dasharray: 5, 5;
 }
@@ -925,13 +926,6 @@ path.casing.tag-waterway-river {
     stroke-width: 6;
 }
 
-svg[data-zoom="16"] path.stroke.tag-waterway-river {
-    stroke-width: 4;
-}
-svg[data-zoom="16"] path.casing.tag-waterway-river {
-    stroke-width: 6;
-}
-
 path.stroke.tag-waterway-ditch {
     stroke: #6591ff;
     stroke-width: 1;
@@ -1029,13 +1023,17 @@ text.pointlabel {
     stroke-miterlimit: 1;
 }
 
+text.proximate {
+    opacity: 0;
+}
+
 text.point {
   font-size: 10px;
 }
 
 /* Cursors */
 
-#map:hover {
+#map {
     cursor: auto; /* Opera */
     cursor: url(<%= asset_path("iD/img/cursor-grab.png") %>) 9 9, auto; /* FF */
     cursor: -webkit-image-set(
@@ -1044,15 +1042,6 @@ text.point {
         ) 9 9, auto;
 }
 
-#map:active {
-    cursor: pointer; /* Opera */
-    cursor: url(<%= asset_path("iD/img/cursor-grabbing.png") %>) 9 9, auto; /* FF */
-    cursor: -webkit-image-set(
-        url(<%= asset_path("iD/img/cursor-grabbing.png") %>) 1x,
-        url(<%= asset_path("iD/img/cursor-grabbing2x.png") %>) 2x
-        ) 9 9, auto;
-}
-
 .mode-browse .point,
 .mode-select .point {
     cursor: pointer; /* Opera */
@@ -1138,11 +1127,11 @@ text.point {
         ), pointer;
 }
 
-.mode-draw-line #map:hover,
-.mode-draw-area #map:hover,
-.mode-add-line  #map:hover,
-.mode-add-area  #map:hover,
-.mode-drag-node #map:hover {
+.mode-draw-line #map,
+.mode-draw-area #map,
+.mode-add-line  #map,
+.mode-add-area  #map,
+.mode-drag-node #map {
     cursor: crosshair; /* Opera */
     cursor: url(<%= asset_path("iD/img/cursor-draw.png") %>) 9 9, crosshair; /* FF */
     cursor: -webkit-image-set(
@@ -1151,11 +1140,11 @@ text.point {
         ) 9 9, crosshair;
 }
 
-.mode-draw-line .behavior-hover .way,
-.mode-draw-area .behavior-hover .way,
-.mode-add-line  .behavior-hover .way,
-.mode-add-area  .behavior-hover .way,
-.mode-drag-node .behavior-hover .way {
+.mode-draw-line .way.hover,
+.mode-draw-area .way.hover,
+.mode-add-line  .way.hover,
+.mode-add-area  .way.hover,
+.mode-drag-node .way.hover {
     cursor: crosshair; /* Opera */
     cursor: url(<%= asset_path("iD/img/cursor-draw-connect-line.png") %>) 9 9, crosshair; /* FF */
     cursor: -webkit-image-set(
@@ -1164,11 +1153,11 @@ text.point {
         ) 9 9, crosshair;
 }
 
-.mode-draw-line .behavior-hover .vertex,
-.mode-draw-area .behavior-hover .vertex,
-.mode-add-line  .behavior-hover .vertex,
-.mode-add-area  .behavior-hover .vertex,
-.mode-drag-node .behavior-hover .vertex {
+.mode-draw-line .vertex.hover,
+.mode-draw-area .vertex.hover,
+.mode-add-line  .vertex.hover,
+.mode-add-area  .vertex.hover,
+.mode-drag-node .vertex.hover {
     cursor: crosshair; /* Opera */
     cursor: url(<%= asset_path("iD/img/cursor-draw-connect-vertex.png") %>) 9 9, crosshair; /* FF */
     cursor: -webkit-image-set(
@@ -1177,8 +1166,8 @@ text.point {
         ) 9 9, crosshair;
 }
 
-.mode-add-point #map:hover,
-.lasso #map:hover,
+.mode-add-point #map,
+.lasso #map,
 .lasso .way,
 .lasso .vertex {
     cursor: crosshair; /* Opera */
@@ -1195,12 +1184,17 @@ text.point {
 
 /* GPX Paths */
 path.gpx {
-    stroke:#6AFF25;
-    stroke-width:2;
-    fill:transparent;
+    stroke: #FF26D4;
+    stroke-width: 2;
+    fill: none;
     pointer-events: none;
 }
 
+/* GPS Labels */
+text.gpx {
+    fill:#FF26D4;
+}
+
 /* Modes */
 
 .mode-draw-line .vertex.active,
@@ -1227,14 +1221,22 @@ path.gpx {
 /* Basics
 ------------------------------------------------------- */
 
+/*
+  Opera misbehaves when the window is resized vertically unless 100% width + height are
+  applied to both html and body. https://gist.github.com/jfirebaugh/bd225bcfdd3a633850c4
+*/
+html, body {
+    width: 100%;
+    height: 100%;
+}
+
 body {
-    font:normal 12px/1.6666 'Helvetica Neue', Arial, sans-serif;
+    font:normal 12px/1.6667 'Helvetica Neue', Arial, sans-serif;
     margin:0;
     padding:0;
     min-width: 768px;
     color:#333;
     overflow: hidden;
-    -webkit-font-smoothing: subpixel-antialiased;
 }
 
 .unsupported {
@@ -1251,6 +1253,17 @@ body {
     min-width: 768px;
 }
 
+#content {
+    position: relative;
+    overflow: hidden;
+    height: 100%;
+}
+
+.spacer {
+    height: 40px;
+    margin-right: 10px;
+}
+
 .limiter {
     position: relative;
     max-width: 1200px;
@@ -1258,18 +1271,16 @@ body {
 
 .spinner {
     opacity: .5;
-    z-index: 2;
-    position: relative;
 }
 
 .spinner img {
-    position: fixed;
+    position: absolute;
     height: 40px;
     width: 40px;
     right: 10px;
     top: 10px;
-    margin: auto;
     border-radius: 4px;
+    margin-right: 10px;
     background: black;
 }
 
@@ -1377,10 +1388,11 @@ input[type=email] {
     height:30px;
     width: 100%;
     border-radius:4px;
-    -webkit-transition: all 100ms;
-       -moz-transition: all 100ms;
-       -o-transition: all 100ms;
-            transition: all 100ms;
+    text-overflow: ellipsis;
+    -webkit-transition: all 200ms;
+       -moz-transition: all 200ms;
+         -o-transition: all 200ms;
+            transition: all 200ms;
 }
 
 textarea:focus,
@@ -1388,19 +1400,20 @@ input:focus {
     background-color: #F1F1F1;
 }
 
-input.major {
-    width: 100%;
-    padding:5px 10px;
-    font-size: 18px;
-    font-weight: bold;
-    height:60px;
+input[type="checkbox"],
+input[type="radio"] {
+    float: left;
+    width: 14px;
+    height: 14px;
+    margin-right: 5px;
+    margin-top: 3px;
 }
 
-/* remove bottom border radius when combox is open */
-.combobox + div textarea:focus,
-.combobox + div input:focus {
-    border-bottom-left-radius: 0;
-    border-bottom-right-radius: 0;
+/* remove bottom border radius when combobox is open */
+.combobox + * textarea:focus,
+.combobox + * input:focus {
+    border-bottom-left-radius: 0 !important;
+    border-bottom-right-radius: 0 !important;
 }
 
 /* tables */
@@ -1443,37 +1456,43 @@ table.tags, table.tags td, table.tags th {
 
 ul li { list-style: none;}
 
-ul.toggle-list {
-    border-radius: 4px;
-    border: 1px solid #CCC;
-    margin-bottom: 10px;
+.toggle-list > label {
+    position: relative;
+    padding: 5px 10px;
+    display: block;
+    height: 30px;
+    background-color: white;
+    color: #7092FF;
+    cursor: pointer;
+       -moz-transition: all 100ms;
+         -o-transition: all 100ms;
+            transition: all 100ms;
 }
 
-ul.toggle-list li a {
-    position: relative;
-    padding: 5px 10px 5px 25px;
-    display:block;
-    border-top: 1px solid #ccc;
+.toggle-list > label:hover {
+    background-color: #ececec;
 }
 
-ul.toggle-list li:first-child a {
-    border-top: 0;
-    border-radius: 3px 3px 0 0;
+.toggle-list > label:not(:last-child) {
+    border-bottom: 1px solid #ccc;
 }
 
-ul.toggle-list li:last-child a {
+.toggle-list > label:last-child {
     border-radius: 0 0 3px 3px;
 }
 
-ul.toggle-list li:only-child a {
-    border-radius: 3px;
+.toggle-list label > span {
+    display: block;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
 }
 
-ul.toggle-list li a:hover { background-color: #ececec;}
-
-ul.toggle-list li a.selected { background-color: #e8ebff;}
+.toggle-list > label.active {
+    background: #E8EBFF;
+}
 
-ul.link-list li {
+.link-list li {
     float: right;
     border-left: 1px solid rgba(255,255,255,.5);
     padding: 5px 0 5px 5px;
@@ -1486,28 +1505,6 @@ ul.link-list li:last-child {
     padding-left: 0;
 }
 
-.toggle-list a::before {
-    content: "";
-    display: inline-block;
-    border-radius: 50%;
-    height: 12px;
-    width: 12px;
-    margin-right: 10px;
-    border: 1px solid #CCC;
-    position: absolute;
-    left: 5px;
-    top: 8px;
-}
-
-.toggle-list a:hover::before {
-    box-shadow: inset 0 0 0 2px white;
-}
-
-.toggle-list a.selected::before {
-    background: #7092ff;
-    box-shadow: inset 0 0 0 2px white;
-}
-
 /* Utility Classes
 ------------------------------------------------------- */
 .fillL {
@@ -1516,12 +1513,12 @@ ul.link-list li:last-child {
 }
 
 .fillL2 {
-    background: #f7f7f7 url(<%= asset_path("iD/img/background-pattern-1.png") %>) repeat;
+    background: #f6f6f6;
     color: #333;
 }
 
 .fillL3 {
-    background: #f1f1f1;
+    background: #ececec;
     color: #333;
 }
 
@@ -1563,7 +1560,8 @@ a.hide {
 .pane {
     position:absolute;
     width:50%;
-    height:100%;
+    top: 0;
+    bottom: 30px;
 }
 
 .pane:first-child {
@@ -1578,16 +1576,16 @@ a.hide {
 
 button {
     text-align: center;
-    font-weight:bold;
     line-height:20px;
     border:0;
     background: white;
+    font-weight: bold;
     color:#333;
     font-size:12px;
     display: inline-block;
     height:40px;
     border-radius:4px;
-    /* Crashes Safari: https://github.com/systemed/iD/issues/1188 */
+    /* Crashes Safari: https://github.com/openstreetmap/iD/issues/1188 */
     /*-webkit-transition: all 100ms;*/
        -moz-transition: all 100ms;
          -o-transition: all 100ms;
@@ -1606,7 +1604,7 @@ button.disabled {
     cursor: auto;
 }
 
-button.active:not([disabled]):not(.disabled) {
+button.active {
     background: #7092ff;
 }
 
@@ -1615,9 +1613,17 @@ button.minor {
     top: 0;
     right: 0;
     height: 100%;
-    width: 20px;
-    opacity: .5;
+    width: 10%;
     border-radius: 0;
+    background-color: #fafafa;
+}
+
+button.minor .icon {
+    opacity: .5;
+}
+
+button.minor:hover {
+    background-color: #f1f1f1;
 }
 
 .button-wrap {
@@ -1626,8 +1632,13 @@ button.minor {
     margin: 0;
 }
 
-.button-wrap button:only-child { width: 100%;}
-.button-wrap:last-of-type { padding-right: 0;}
+.button-wrap button:only-child {
+    width: 100%;
+}
+
+.button-wrap:last-of-type {
+    padding-right: 0;
+}
 
 .joined button {
     border-radius:0;
@@ -1713,9 +1724,12 @@ button.save.has-count .count::before {
 }
 
 /* Definitions for every icon */
-.icon.browse     { background-position:   0 0;}
+.icon.alert     { background-position:   0 0;}
+.icon.point,
 .icon.add-point  { background-position: -20px 0;}
+.icon.line,
 .icon.add-line   { background-position: -40px 0;}
+.icon.area,
 .icon.add-area   { background-position: -60px 0;}
 .icon.undo       { background-position: -80px 0;}
 .icon.redo       { background-position: -100px 0;}
@@ -1725,8 +1739,6 @@ button.save.has-count .count::before {
 .icon.delete     { background-position: -180px 0;}
 .icon.remove     { background-position: -200px 0;}
 .icon.inspect    { background-position: -220px 0;}
-.icon.zoom-in    { background-position: -240px 0;}
-.icon.zoom-out   { background-position: -260px 0;}
 .icon.plus       { background-position: -240px 0;}
 .icon.search     { background-position: -280px 0;}
 .icon.geocode    { background-position: -280px 0;}
@@ -1735,20 +1747,31 @@ button.save.has-count .count::before {
 .icon.nearby     { background-position: -340px 0;}
 .icon.geolocate  { background-position: -360px 0;}
 .icon.warning    { background-position: -380px 0;}
+.icon.bug        { background-position: -400px 0;}
 .icon.back       { background-position: -420px 0;}
 .icon.forward    { background-position: -440px 0;}
 .icon.help       { background-position: -460px 0;}
+.icon.relation    { background-position: -520px 0;}
+.icon.relation.route         { background-position: -540px 0;}
+.icon.relation.multipolygon  { background-position: -560px 0;}
+.icon.vertex     { background-position: -580px 0;}
 
 .icon.inspect.light    { background-position: -220px -20px;}
+.icon.plus.light       { background-position: -240px -20px;}
+.icon.zoom-in          { background-position: -240px -20px;}
+.icon.zoom-out         { background-position: -260px -20px;}
 .icon.geocode.light    { background-position: -280px -20px;}
-.icon.help.light       { background-position: -460px -20px;}
+.icon.layers.light     { background-position: -300px -20px;}
 .icon.avatar.light     { background-position: -320px -20px;}
 .icon.nearby.light     { background-position: -340px -20px;}
+.icon.geolocate.light  { background-position: -360px -20px;}
+.icon.bug.light        { background-position: -400px -20px;}
+.icon.help.light       { background-position: -460px -20px;}
 
 .icon.back.blue        { background-position: -420px -20px;}
 .icon.forward.blue     { background-position: -440px -20px;}
 
-button[disabled] .icon.browse     { background-position:   0 -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;}
 button[disabled] .icon.add-area   { background-position: -60px -40px;}
@@ -1766,6 +1789,18 @@ button[disabled] .icon.layers     { background-position: -300px -40px;}
 button[disabled] .icon.avatar     { background-position: -320px -40px;}
 button[disabled] .icon.nearby     { background-position: -340px -40px;}
 
+.icon.point.deleted  { background-position: -302px -80px;}
+.icon.line.deleted   { background-position: -320px -80px;}
+.icon.area.deleted   { background-position: -340px -80px;}
+
+.icon.point.created  { background-position: -302px -100px;}
+.icon.line.created   { background-position: -320px -100px;}
+.icon.area.created   { background-position: -340px -100px;}
+
+.icon.point.modified  { background-position: -22px 0; }
+
+.icon.modified { opacity: .5; }
+
 /* Out link is special */
 
 .icon.out-link   { height: 14px; width: 14px; background-position: -500px 0;}
@@ -1788,12 +1823,14 @@ a:hover .icon.out-link   { background-position: -500px -14px;}
 ------------------------------------------------------- */
 
 #bar {
-    position:absolute;
-    padding: 10px;
+    position: fixed;
+    padding: 10px 0;
     left:0;
     top:0;
     right:0;
     height:60px;
+    z-index: 1;
+    min-width: 768px;
 }
 
 /* Header for modals / panes
@@ -1801,279 +1838,323 @@ a:hover .icon.out-link   { background-position: -500px -14px;}
 
 .header {
     border-bottom: 1px solid #ccc;
-    z-index: 2;
     height: 60px;
     position: relative;
 }
 
 .header h3 {
-    margin-right: 40px;
+    text-align: center;
     margin-bottom: 0;
     white-space: nowrap;
     text-overflow: ellipsis;
     overflow: hidden;
+    padding: 20px;
 }
 
-.modal > button,
-.header button {
-    height: 100%;
+.header button,
+.modal > button {
     border-radius: 0;
-    border-left: 1px solid #CCC;
     width: 40px;
     text-align: center;
     overflow: hidden;
+}
+
+.header button {
+    position: relative;
+    height: 100%;
+}
+
+.preset-list-pane .header button {
     position: absolute;
     right: 0;
     top: 0;
 }
 
 .modal > button {
+    position: absolute;
+    right: 0;
+    top: 0;
     height: 59px;
     z-index: 3;
 }
 
+.footer {
+    position: absolute;
+    bottom: 0;
+    padding: 5px 30px 5px 30px;
+    border-top: 1px solid #ccc;
+    background-color: #fafafa;
+    width: 100%;
+}
+
+.sidebar-component .body {
+    width: 100%;
+    overflow: auto;
+    top: 60px;
+    bottom: 0;
+    position: absolute;
+}
+
 /* Inspector
 ------------------------------------------------------- */
 
-.inspector-wrap {
-    position: absolute;
+#sidebar {
+    position: relative;
+    float: left;
     height: 100%;
-    right: 0;
     overflow: hidden;
+    z-index: 2;
+    background: #f6f6f6;
 }
 
-.inspector-body {
-    overflow-y: scroll;
-    overflow-x: hidden;
+.sidebar-component {
     position: absolute;
-    right: 0;
+    top: 0;
     left: 0;
-    bottom: 30px;
-    top: 60px;
+    bottom: 0;
+    right: 0;
 }
 
-.pane:first-child .inspector-body {
-    top: 120px;
+.inspector-wrap {
+    width: 100%;
+    height: 100%;
 }
 
-.inspector-inner {
-    padding: 20px;
-    position: relative;
+.inspector-hidden {
+    display: none;
 }
 
-.inspector-wrap .header button.preset-reset {
-    border-right: 1px solid #CCC;
-    position: relative;
+.inspector-body {
+    overflow-y: scroll;
+    overflow-x: hidden;
+    position: absolute;
+    right: 0;
+    left: 0;
+    bottom: 0;
 }
 
-.inspector-wrap .header button.preset-reset > div {
-    height: 100%;
-    padding: 20px 0;
+.feature-list-pane .inspector-body {
+    top: 120px;
 }
 
-.inspector-wrap .header button.preset-reset .col12:last-child {
-    position: absolute;
-    width: 100%;
-    padding: 20px 0;
-    opacity: 0;
+.preset-list-pane .inspector-body {
+    top: 120px;
 }
 
-.inspector-wrap .header button:hover .col12:first-child {
-    opacity: 0;
+.entity-editor-pane .inspector-body {
+    top: 60px;
 }
 
-.inspector-wrap .header button:hover .col12:last-child {
-    opacity: 1;
+.selection-list-pane .inspector-body {
+    top: 60px;
 }
 
-.inspector-wrap .header button.line > div {
-    padding: 0;
+.inspector-inner {
+    padding: 20px;
+    position: relative;
 }
 
-.inspector-toggle {
-    color:#fff;
-    width: 100%;
+#sidebar .search-header .icon {
     display: block;
-    background:#7092ff;
-    border: 0;
+    position: absolute;
+    left: 10px;
+    top: 80px;
+    pointer-events: none;
 }
 
-/* Presets
-------------------------------------------------------- */
+#sidebar .search-header input {
+    position: absolute;
+    top: 60px;
+    height: 60px;
+    width: 100%;
+    padding: 5px 10px;
+    border-radius: 0;
+    border-width: 0;
+    border-bottom-width: 1px;
+    text-indent: 30px;
+    font-size: 18px;
+    font-weight: bold;
+}
 
-/* Preset grid  */
+/* Feature list */
 
-.preset-grid  {
+.feature-list  {
     width:100%;
-    padding: 20px 10px 10px 20px;
-    border-bottom: 1px solid #ccc;
-}
-
-.grid-button-wrap {
-    padding: 0 10px 10px 0;
-    height: 120px;
 }
 
-.grid-entry {
+.no-results-item,
+.geocode-item,
+.feature-list-item {
     width: 100%;
-    height: 100%;
     position: relative;
-    border: 1px solid #ccc;
+    border-bottom: 1px solid #ccc;
+    border-radius: 0;
+}
+
+.feature-list-item .label {
+    text-align: left;
+    padding: 5px 10px;
+    white-space: nowrap;
+    text-overflow: ellipsis;
     overflow: hidden;
-    float: left;
+    border-left: 1px solid rgba(0, 0, 0, .1);
+    -moz-transition: all 100ms;
+    -o-transition: all 100ms;
+    transition: all 100ms;
 }
 
-.grid-inner {
-    margin-bottom: 20px;
+.feature-list-item .label .icon {
+    opacity: .5;
+}
+
+.feature-list-item:hover .label {
+    background-color: #ececec;
+}
+
+.feature-list-item .entity-type {
+    color:#7092ff;
+}
+
+.feature-list-item:hover .entity-type {
+    color:#597be7;
+}
+
+.feature-list-item .entity-name {
+    font-weight: normal;
+    color: #666;
+    padding-left: 10px;
+}
+
+/* Presets
+------------------------------------------------------- */
+
+/* Preset grid  */
+
+.preset-list  {
+    width:100%;
+    padding: 20px 20px 10px 20px;
+    border-bottom: 1px solid #ccc;
+}
+
+.preset-list-button-wrap {
+    position: relative;
+    margin-bottom: 10px;
+    height: 60px;
 }
 
-.preset-grid.filtered .grid-button-wrap:first-child .grid-entry {
+.preset-list-button {
+    width: 100%;
+    height: 100%;
+    position: relative;
+    border: 1px solid #ccc;
+}
+
+.preset-list.filtered .preset-list-item:first-child .preset-list-button {
     background: #ececec;
 }
 
 .preset-icon {
     position: absolute;
-    top: 30px;
-    left: 0;
-    right: 0;
+    top: 17px;
+    left: 17px;
     margin: auto;
 }
 
-.preset-icon-line {
-    top: 15px;
-    left: -10px;
-    right: -10px;
+.preset-icon-line,
+.preset-icon-relation {
+    top: 0;
+    left: 0;
 }
 
-.grid-entry .label {
-    background: #f6f6f6;
+.preset-list-button .label {
+    background-color: #f6f6f6;
     text-align: left;
     position: absolute;
-    padding: 5px 10px;
-    height: 30px;
+    top: 0;
     bottom: 0;
-    left: 0; right: 0;
+    right: 0;
+    padding: 5px 10px;
+    left: 60px;
+    line-height: 50px;
     white-space: nowrap;
     text-overflow: ellipsis;
     overflow: hidden;
-    border-top: 1px solid rgba(0, 0, 0, .1);
+    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;
     }
 
-.grid-button-wrap button.tag-reference-button {
-    float: right;
-    position: static;
-    margin-top: -30px;
-    margin-right: 1px;
-    height: 29px;
-    border-left: 1px solid #CCC;
-    border-radius: 0 0 3px 0;
-}
-
-.current .grid-entry,
-.current .grid-entry .label {
-    background-color: #E8EBFF;
+.preset-list-button:hover .label {
+    background-color: #ececec;
 }
 
-.category .grid-entry:after,
-.category .grid-entry:before {
-    content: "";
+.preset-list-item button.tag-reference-button {
+    height: 100%;
+    border: 1px solid #CCC;
+    border-radius: 0 3px 3px 0;
     position: absolute;
-    top: 7px;
-    left: 0; right: 0;
-    border-top: 1px solid #ccc;
-    border-radius: 6px;
-    height: 6px;
+    top: 0;
+    right: 0;
+    width: 10%;
+    background: #fafafa;
 }
 
-.category .grid-entry:before {
-    top: 3px;
+.preset-list-item button.tag-reference-button .icon {
+    opacity: .5;
 }
 
-.preset-grid-search-wrap .icon {
-    display: block;
-    position: absolute;
-    left: 10px;
-    top: 80px;
-    pointer-events: none;
+.current .preset-list-button,
+.current .preset-list-button .label {
+    background-color: #E8EBFF;
 }
 
-.preset-grid-search-wrap input {
+.category .preset-list-button:after,
+.category .preset-list-button:before {
+    content: "";
     position: absolute;
-    top: 60px;
-    border-radius: 0;
-    border-width: 0;
-    border-bottom-width: 1px;
-    text-indent: 30px;
-}
-
-.preset-search-result {
-    padding: 0 10px;
-    height:30px;
-    margin: 5px;
+    top: -5px;
+    left: -1px; right: -1px;
+    border: 1px solid #ccc;
+    border-bottom: none;
+    border-radius: 6px 6px 0 0;
+    height: 6px;
 }
 
-.subgrid {
-    width: 100%;
-    width: -webkit-calc(100% + 10px);
-    width: calc(100% + 10px);
-    margin-left: -10px;
-    overflow: hidden;
+.category .preset-list-button:before {
+    top: -3px;
 }
 
-.subgrid .preset-grid {
-    padding: 10px 0 0 10px;
-    border: 1px solid #CCC;
+.subgrid .preset-list {
+    padding: 10px 10px 0 10px;
     margin-top: 0;
+    border: 0;
     border-radius: 8px;
+    width: -webkit-calc(100% + 20px);
+    margin-left: -10px;
 }
 
 .subgrid .arrow {
     border: solid rgba(0, 0, 0, 0);
     border-width: 10px;
-    border-bottom-color: #CCC;
+    border-bottom-color: #f1f1f1;
     width: 0;
     height: 0;
-    margin-left: 33.3333%;
-    margin-left: -webkit-calc(16.6666% - 10px);
-    margin-left: calc(16.6666% - 10px);
-    margin-top: -10px;
-}
-.subgrid.arrow-1 .arrow {
     margin-left: 50%;
     margin-left: -webkit-calc(50% - 10px);
-    margin-left: calc(50% - 10px);
-}
-
-.subgrid.arrow-2 .arrow {
-    margin-left: 280px;
-    margin-left: -webkit-calc(84.4444% - 10px);
-    margin-left: calc(84.4444% - 10px);
-}
-
-.show-more {
-    text-align: center;
-    width: 100%;
-    border-bottom: 1px solid #ccc;
-    border-radius: 0;
-}
-
-.show-more a {
-    color: #222;
+    margin-top: -10px;
 }
 
 /* Preset icon colors */
 
-.inspector-body-line .icon.feature-marker-stroked {
-    top: 30px;
-}
-
 .preset-icon-fill.icon-area {
     cursor: inherit;
     height: 45px;
     width: 45px;
     margin: auto;
     position: absolute;
-    left: 0; right: 0; top: 19px;
+    left: 7px; top: 7px;
     background:transparent url(<%= asset_path("iD/img/sprite.svg") %>) no-repeat -240px -80px;
 }
 
@@ -2100,12 +2181,17 @@ a:hover .icon.out-link   { background-position: -500px -14px;}
 
 /* preset form basics */
 
-.tag-wrap .preset-icon-wrap {
-    border-bottom: 1px solid #CCC;
-    background-color: #e8ebff;
+.inspector-preset {
+    overflow: hidden;
+}
+
+.inspector-preset .preset-form {
+    padding: 10px;
+    margin: 0 10px 20px 10px;
+    border-radius: 8px;
 }
 
-.tag-wrap .preset-icon-wrap::after {
+.entity-editor-pane .preset-list-item::after {
     content: "";
     position: absolute;
     height: 0;
@@ -2116,23 +2202,25 @@ a:hover .icon.out-link   { background-position: -500px -14px;}
     margin: auto;
     border: solid rgba(0, 0, 0, 0);
     border-width: 10px;
-    border-bottom-color: #CCC;
+    border-bottom-color: #ececec;
 }
 
-.tag-wrap .preset-icon-wrap > div {
-    height: 90px;
-    width: 33.3333%;
-    width: -webkit-calc(33.3333% - 10px);
-    width: calc(33.3333% - 10px);
-    margin: auto;
-    border-radius: 4px;
-    border: 1px solid #CCC;
-    position: relative;
+.entity-editor-pane .preset-list-item .preset-list-button-wrap {
+    margin-bottom: 0;
+}
+
+
+.form-field {
+    margin-bottom: 10px;
+    width: 100%;
+    -webkit-transition: margin-bottom 200ms;
+       -moz-transition: margin-bottom 200ms;
+         -o-transition: margin-bottom 200ms;
+            transition: margin-bottom 200ms;
 }
 
-.inspector-preset .form-field {
-    padding-left: 20px;
-    padding-right: 20px;
+.form-field:last-child {
+    margin-bottom: 0;
 }
 
 .form-label {
@@ -2143,30 +2231,46 @@ a:hover .icon.out-link   { background-position: -500px -14px;}
     background: #f6f6f6;
     display: block;
     border-radius: 4px 4px 0 0;
+    overflow: hidden;
 }
 
-.form-label button {
-    border-left: 1px solid #CCC;
+.form-label-button-wrap {
+    position: absolute;
+    top: 0;
+    right: 0;
+    height: 100%;
+    width: 100%;
+    background: transparent;
+    text-align: right;
 }
 
-.form-label .modified-icon {
-    border-right: 0;
-    opacity: 0;
-    right: 20px;
+.form-label-button-wrap .icon {
+    opacity: .5;
 }
 
-.modified .form-label .modified-icon {
-    opacity: .5;
+.form-label button {
+    border-left: 1px solid #CCC;
+    width: 10%;
+    height: 100%;
+    border-radius: 0;
+    background: #fafafa;
 }
 
-.form-label button.tag-reference-button {
-    border-top-right-radius: 3px;
+.form-label .modified-icon,
+.form-field .remove-icon {
+    display: none;
+}
+
+.modified .form-label .modified-icon,
+.present .form-label .remove-icon {
+    display: inline-block;
 }
 
 .form-field > input,
 .form-field > textarea,
 .form-field .preset-input-wrap {
     border: 1px solid #CCC;
+    min-height: 30px;
     border-top: 0;
     border-radius: 0 0 4px 4px;
 }
@@ -2175,34 +2279,216 @@ a:hover .icon.out-link   { background-position: -500px -14px;}
     height: 65px;
 }
 
-.form-field-name input.localized-main {
-    height: 35px;
-    font-size: 18px;
-    font-weight: bold;
+.inspector-border {
+    border-bottom: 1px solid #CCC
 }
 
-/* adding additional preset fields */
+/* Preset form (hover mode) */
 
-.more-buttons {
-    margin-top: 20px;
-    border-top: 1px solid #CCC;
+.inspector-hover .checkselect label:last-of-type,
+.inspector-hover .preset-input-wrap .label,
+.inspector-hover input,
+.inspector-hover label {
+    background: #ececec;
 }
 
-.more-buttons:nth-last-child(2) {
-    border-bottom: 1px solid #CCC;
+.inspector-hover a,
+.inspector-hover .checkselect label:last-of-type {
+    color: #666;
+}
+
+/* hide and remove from layout */
+.inspector-hidden,
+.inspector-hover label input[type="checkbox"],
+.inspector-hover label input[type="radio"],
+.inspector-hover .toggle-list label,
+.inspector-hover .toggle-list label span,
+.inspector-hover .inspector-inner .add-tag,
+.inspector-hover .inspector-inner .add-relation,
+.inspector-hover .toggle-list label.remove .icon {
+    height: 0;
+    width: 0;
+    overflow: hidden;
+    opacity: 0 !important;
+    border-width: 0;
+    margin: 0;
+    padding: 0;
+}
+
+/* hide but preserve in layout */
+.inspector-hover .entity-editor-pane button.minor,
+.inspector-hover .combobox-caret,
+.inspector-hover .entity-editor-pane .header button,
+.inspector-hover .spin-control,
+.inspector-hover .hide-toggle:before,
+.inspector-hover .more-buttons,
+.inspector-hover .form-label-button-wrap,
+.inspector-hover .tag-reference-button,
+.inspector-hover .view-on-osm {
+    opacity: 0;
+}
+
+/* Styles for raw tag inspector on hover */
+.inspector-hover .tag-row .key-wrap,
+.inspector-hover .tag-row .input-wrap-position {
+    width: 50%;
+}
+
+.inspector-hover .tag-row:first-child input.value {
+    border-top-right-radius: 4px;
+}
+
+.inspector-hover .tag-row:last-child input.value {
+    border-bottom-right-radius: 4px;
+}
+
+.inspector-hover .tag-row:last-child input.key {
+    border-bottom-left-radius: 4px;
+}
+
+.inspector-hover .inspector-body .more-buttons {
+    max-height: 0;
+    padding-bottom: 0;
+}
+
+/* Unstyle button fields */
+.inspector-hover .toggle-list label.active,
+.inspector-hover .entity-editor-pane a.hide-toggle {
+    opacity: 1;
+    background-color: transparent;
+    color: #666;
+    padding-left: 0;
+    border-width: 0;
+}
+
+.inspector-hover .toggle-list button.active {
+    padding-left: 10px;
+}
+
+/* Add placeholder only on hover for radio buttons */
+.inspector-hover .toggle-list .placeholder {
+    color: #a9a9a9;
+    padding: 5px 10px;
+    opacity: 1;
+    line-height: 20px;
+    width: 100%;
+}
+
+/* Hide placeholder for radio buttons if another is active, or not in hover state */
+.toggle-list label.active ~ .placeholder,
+.toggle-list .placeholder {
+    padding: 0;
+    opacity: 0;
+    width: 0;
+    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 */
+
+.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;
+       -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%;
@@ -2228,15 +2514,6 @@ button.preset-add-field:nth-last-child(8) ~ button.preset-add-field {
     width: 12.5%;
 }
 
-.preset-add-field .tooltip.top .tooltip-arrow {
-    border-top-color: #000;
-}
-
-.preset-add-field .tooltip-inner {
-    background: #000;
-    color: #ccc;
-}
-
 .preset-fav button.fav {
     height: 30px;
     margin: 5px;
@@ -2245,18 +2522,19 @@ button.preset-add-field:nth-last-child(8) ~ button.preset-add-field {
 
 /* preset form access */
 
-.preset-input-wrap li {
+.preset-input-wrap .label {
+    height: 30px;
+    background: #F6F6F6;
+    padding: 5px 10px;
+}
+
+.form-field-access .preset-input-wrap li {
     border-bottom: 1px solid #CCC;
 }
-.preset-input-wrap li:last-child {
+.form-field-access .preset-input-wrap li:last-child {
     border-bottom: 0;
 }
 
-.preset-input-wrap .label {
-    background: #F6F6F6;
-    padding: 5px;
-}
-
 .preset-input-access-wrap input {
     border-radius: 0;
     border-width: 0;
@@ -2271,28 +2549,26 @@ button.preset-add-field:nth-last-child(8) ~ button.preset-add-field {
 
 input[type=number] {
     position: relative;
-    padding-right: 65px;
+    padding-right: 20%;
 }
 
 .spin-control {
-    width: 41px;
+    width: 20%;
     height: 29px;
-    border-left: 1px solid #CCC;
     display: inline-block;
-    margin-left: -41px;
+    margin-left: -20%;
     margin-bottom: -11px;
     position: relative;
 }
 
 .spin-control button {
+    right: 1px;
     position: relative;
     float: left;
     height: 100%;
     width: 50%;
     border-left: 1px solid #CCC;
-    border-right: 1px solid #CCC;
     border-radius: 0;
-    border-left: 0;
     background: rgba(0, 0, 0, 0);
 }
 
@@ -2325,9 +2601,9 @@ input[type=number] {
 
 .checkselect label:last-of-type {
     display: block;
-    padding: 5px;
-    box-sizing: border-box;
-    color: #999;
+    background: white;
+    padding: 5px 10px;
+    color: #7092FF;
 }
 
 .checkselect label:hover {
@@ -2338,190 +2614,138 @@ input[type=number] {
     color: inherit;
 }
 
-.checkselect input[type="checkbox"] {
-    margin-right: 5px;
-    width: 20px;
-    vertical-align: middle;
-    opacity: 0.5;
-}
-
-.checkselect .set input[type="checkbox"] {
-    opacity: 1;
+.checkselect label:not(.set) input[type="checkbox"] {
+    opacity: .5;
 }
 
 /* Preset form radio button */
 
-.radio-wrap button {
-    position: relative;
-    text-align: left;
-    font-weight: normal;
-    height: 30px;
-    border-radius: 0;
-    border-bottom: 1px solid #CCC;
-    color: #7092FF;
-    width: 100%;
-    padding-left: 25px;
+.toggle-list button.remove {
+    border-radius: 0 0 3px 3px;
 }
 
-.radio-wrap button::before {
-    content: "";
-    display: inline-block;
-    border-radius: 50%;
-    height: 12px;
-    width: 12px;
-    margin-right: 10px;
-    border: 1px solid #CCC;
+.toggle-list button.remove .icon {
     position: absolute;
     left: 5px;
-    top: 8px;
 }
 
-.radio-wrap button:hover::before {
-    box-shadow: inset 0 0 0 2px white;
+.toggle-list button.remove::before {
+    content: none;
 }
 
-.radio-wrap button.active::before {
-    background: #7092ff;
-    box-shadow: inset 0 0 0 2px white;
+.form-field .wiki-lang {
+    border-radius: 0;
 }
 
-.radio-wrap button:last-child {
-    border-bottom: 0;
+.form-field .wiki-title {
+    padding-right: 10%;
 }
 
-.radio-wrap button.active {
-    background-color: #E8EBFF !important;
+.form-field .wiki-title ~ .combobox-caret {
+    margin-left: -18%;
+    margin-right: 9%;
 }
 
-.radio-wrap button.remove {
-    border-radius: 0 0 3px 3px;
-}
-.radio-wrap button.remove .icon {
-    position: absolute;
-    left: 2px;
+.form-field .wiki-link {
+    float: right;
+    background: #fafafa;
+    padding: 5px;
+    text-align: center;
 }
 
-.radio-wrap button.remove::before {
-    content: none;
+.form-field .wiki-link:hover {
+    background: #f1f1f1;
 }
 
-.form-field .localized-main {
-    width: 90%;
+#preset-input-maxspeed {
+    border-right: none;
     border-radius: 0 0 0 4px;
+    width: 80%;
 }
 
-.form-field .localized-add {
-    width: 10%;
-    height: 35px;
+.form-field .maxspeed-unit {
     border-radius: 0 0 4px 0;
-    border-bottom: 1px solid #ccc;
-    border-right: 1px solid #ccc;
-    vertical-align: top;
+    width: 20%;
 }
 
-.form-field .localized-wrap .entry .localized-lang {
-    border-top: none;
-    border-right: none;
-    border-radius: 0;
-    width: 30%;
-}
+/* Name + translate form */
 
-.form-field .localized-wrap .entry .localized-value {
-    border-top: none;
-    border-radius: 0;
-    width: 60%;
+.form-field .localized-main {
+    padding-right: 10%;
 }
 
-.form-field .localized-wrap .entry .localized-remove {
+.form-field .button-input-action {
+    position: relative;
+    right: 1px;
+    width: 10%;
+    margin-left: -10%;
+    border: 1px solid #CCC;
+    border-top-width: 0;
+    border-right-width: 0;
+    border-radius: 0 0 4px 0;
     height: 30px;
-    border-radius: 0;
-    border-bottom: 1px solid #ccc;
-    border-right: 1px solid #ccc;
     vertical-align: top;
-    width: 10%;
 }
 
-.form-field .localized-wrap .entry:last-child .localized-lang {
-    border-radius: 0 0 0 4px;
+.form-field .localized-wrap {
+    padding: 0 10px;
 }
 
-.form-field .localized-wrap .entry:last-child .localized-remove {
-    border-radius: 0 0 4px 0;
+.form-field .localized-wrap .entry {
+    position: relative;
+    overflow: hidden;
 }
 
-.form-field .wiki-lang {
-    width: 30%;
-    border-right: none;
-    border-radius: 0 0 0 4px;
+.form-field .localized-wrap .entry::before {
+    content: "";
+    display: block;
+    position: absolute;
+    background:#ccc;
+    height: 11px;
+    width: 1px;
+    left: 0;
+    right: 0;
+    top: -11px;
+    margin: auto;
 }
 
-.form-field .wiki-title {
-    width: 60%;
-    border-right: none;
+.form-field .localized-wrap .entry .localized-lang {
     border-radius: 0;
+    border-top-width: 0;
 }
 
-.form-field .wiki-link {
-    border-radius: 0 0 4px 0;
-    border: 1px solid #ccc;
-    border-top: none;
-    height: 30px;
-    width: 10%;
-    float: right;
-    padding: 5px;
-    text-align: center;
-    -webkit-transition: all 100ms;
-       -moz-transition: all 100ms;
-         -o-transition: all 100ms;
-            transition: all 100ms;
-}
-
-.form-field .wiki-link:hover {
-    background: #ececec;
-}
-
-#preset-input-maxspeed {
-    border-right: none;
-    border-radius: 0 0 0 4px;
-    width: 80%;
+.form-field .localized-wrap .entry .localized-value {
+    border-top-width: 0;
+    border-radius: 0 0 4px 4px;
 }
 
-.form-field .maxspeed-unit {
-    border-radius: 0 0 4px 0;
-    border: 1px solid #ccc;
-    border-top: none;
-    height: 30px;
-    width: 20%;
-    float: right;
-    padding: 5px;
-    text-align: center;
-    color: #A9A9A9;
-    font-weight: bold;
+.form-field .localized-wrap .form-label button {
+    border-top-right-radius: 3px;
 }
 
 /* Preset form address */
 
 .form-field .addr-housename {
     border: 0;
+    border-radius: 0;
 }
 
 .form-field .addr-number {
-    width: 33%;
-    border-left: 0;
-    border-right: 0;
-    border-bottom: 0;
+    width: 33.3333%;
+    border: 0;
     border-radius: 0;
 }
 
 .form-field .addr-street {
-    width: 66%;
+    width: 66.6666%;
+    border-top: 0;
     border-right: 0;
     border-bottom: 0;
     border-radius: 0;
 }
 
 .form-field .addr-city {
-    width: 66%;
+    width: 66.6666%;
     border-left: 0;
     border-right: 0;
     border-bottom: 0;
@@ -2529,7 +2753,7 @@ input[type=number] {
 }
 
 .form-field .addr-postcode {
-    width: 33%;
+    width: 33.3333%;
     border-right: 0;
     border-bottom: 0;
     border-radius: 0 0 4px 0;
@@ -2567,23 +2791,30 @@ div.combobox {
     border-top: 0;
 }
 
-.combobox-carat {
-    margin-left: -20px;
-    margin-right: 10px;
-    display:inline-block;
+.combobox-caret {
+    display: inline-block;
+    position: relative;
+    height: 30px;
+    width: 30px;
+    margin-left: -30px;
+    vertical-align: top;
+}
+
+.combobox-caret::after {
+    content:"";
+    height: 0; width: 0;
+    position: absolute;
+    left: 0; right: 0; bottom: 0; top: 0;
+    margin: auto;
     border-top: 5px solid #ccc;
     border-left: 5px solid transparent;
     border-right: 5px solid transparent;
 }
 
-/* tag editor */
-
-.inspector-inner.additional-tags {
-    border-top: 1px solid #ccc;
-}
+/* Raw Tag Editor */
 
 .tag-list {
-    margin-right: 40px;
+    padding-top: 10px;
 }
 
 .tag-row {
@@ -2593,13 +2824,26 @@ div.combobox {
 }
 
 .tag-row input {
+    height: 31px;
     border: 0;
     border-radius: 0;
     border-bottom: 1px solid #CCC;
     border-left: 1px solid #CCC;
 }
 
+.tag-row .key-wrap,
+.tag-row .input-wrap-position {
+    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 {
+    font-weight: bold;
     background-color: #f6f6f6;
 }
 
@@ -2618,13 +2862,11 @@ div.combobox {
 
 .tag-row button {
     position: absolute;
-    height: 30px;
-    right: -20px;
+    height: 31px;
+    right: 10%;
     border: 1px solid #CCC;
-    border-top-width: 0; border-left-width: 0;
-    border-radius: 0;
-    opacity: 1;
-    background: #fafafa;
+    border-top-width: 0;
+    border-left-width: 0;
 }
 
 .tag-row button:hover {
@@ -2639,23 +2881,26 @@ div.combobox {
     border-top-width: 1px;
 }
 
-.tag-row:first-child button.tag-help-button {
+.tag-row:first-child .tag-reference-button {
     border-top-right-radius: 4px;
 }
 
-.tag-row:last-child button.tag-help-button {
+.tag-row:last-child .tag-reference-button {
     border-bottom-right-radius: 4px;
 }
 
-.tag-row button.tag-help-button {
-    right: -40px;
+.tag-row .tag-reference-button {
+    right: 0;
+    border-radius: 0;
+    width: 10%;
+    top: 0;
+    background: #fafafa;
 }
 
 /* Adding form fields to tag editor */
 
 .inspector-inner .add-tag {
-    width: -webkit-calc(50% - 20px);
-    width: calc(50% - 20px);
+    width: 40%;
     height: 30px;
     border-top: 0;
     background: rgba(0,0,0,.5);
@@ -2672,61 +2917,124 @@ div.combobox {
 
 /* Tag reference */
 
-.preset-inspect {
-    position: relative;
+button.minor.tag-reference-loading {
+    background-color: #f5f5f5;
 }
 
-.tag-help {
+.tag-reference-loading .icon {
+    background-image: url(<%= asset_path("iD/img/mini-loader.gif") %>);
+    background-position: 0 0;
+}
+
+.tag-reference-body {
     overflow: hidden;
 }
 
-.tag-help a {
-    margin-top: 5px;
+.tag-reference-body p,
+.tag-reference-body img {
+    margin-top: 20px;
+}
+
+.tag-reference-body p:last-child {
+    padding-bottom: 10px;
+}
+
+.tag-reference-body a {
     display: block;
+    padding-bottom: 10px;
 }
 
-.grid-pane .tag-reference-wrap {
-    padding: 10px 0 20px 0;
+.preset-list .tag-reference-body {
+    position: relative;
+    width: 100%;
 }
 
-.tag-pane .tag-reference-wrap {
-    padding-top: 20px;
+.preset-list .tag-reference-body a {
+    padding-bottom: 20px;
+}
+
+.preset-list .tag-reference-body p,
+.preset-list .tag-reference-body img {
+    margin-top: 10px;
 }
 
-.additional-tags .tag-reference-wrap {
+.raw-tag-editor .tag-reference-body {
     border-bottom: 1px solid #ccc;
-    padding: 20px 0;
+    float: left;
+    width: 100%;
+}
+
+.raw-tag-editor .tag-reference-body p:last-child {
+    padding-bottom: 20px;
+}
+
+.raw-tag-editor .tag-reference-body a {
+    padding-bottom: 20px;
+}
+
+img.wiki-image {
+    float: right;
+    width: 33.3333%;
+    width: -webkit-calc(33.3333% - 10px);
+    width: calc(33.3333% - 10px);
+    margin-left: 20px;
+    margin-right: 10px;
+    border-radius: 4px;
+    max-height: 200px;
+    margin-bottom: 20px;
+}
+
+/* Raw relation membership editor */
+
+.raw-member-editor .member-list li:first-child,
+.raw-membership-editor .member-list li:first-child {
+    padding-top: 10px;
+}
+
+.raw-member-editor .member-row,
+.raw-membership-editor .member-row {
+    position: relative;
+}
+
+.raw-member-editor .member-row .member-entity-name,
+.raw-membership-editor .member-row .member-entity-name {
+    font-weight: normal;
+    padding-left: 10px;
+}
+
+.member-incomplete .member-delete {
+    display: none;
 }
 
-.additional-tags div.tag-help {
-    float: left;
-    width: 100%;
-    width: -webkit-calc(100% + 40px);
-    width: calc(100% + 40px);
+.member-row-new .member-entity-input {
+    border-radius: 4px 4px 0 0;
+    border: 1px solid #cfcfcf;
 }
 
-img.wiki-image {
-    float: right;
-    width: 33.3333%;
-    width: -webkit-calc(33.3333% - 10px);
-    width: calc(33.3333% - 10px);
-    margin-left: 20px;
+.add-relation {
+    width: 40%;
+    height: 30px;
+    background: rgba(0,0,0,.5);
     border-radius: 4px;
-    max-height: 200px;
+    margin-top: 10px;
+}
+
+.add-relation:hover {
+    background: rgba(0,0,0,.8);
 }
 
 /* Map Controls */
 
 .map-controls {
-    left: 0;
-    top: 80px;
-    width: 30px;
-    position: absolute;
+    right: 0;
+    top: 70px;
+    width: 40px;
+    position: fixed;
     z-index: 100;
 }
 
 .map-control > button {
-    width: 30px;
+    width: 40px;
     background: rgba(0,0,0,.5);
     border-radius: 0;
 }
@@ -2735,49 +3043,92 @@ img.wiki-image {
     background: rgba(0, 0, 0, .8);
 }
 
+.map-control > button.active,
 .map-control > button.active:hover {
     background: #7092ff;
 }
 
-.map-overlay {
-    z-index: -1;
-    right: 75%;
-    max-width: 260px;
-    min-width: 210px;
-    position: fixed;
-    left: 30px;
-    display: block;
-    padding: 10px 10px 0 10px;
-}
-
 /* Zoomer */
 
 .zoombuttons button.zoom-in {
-    border-radius:0 4px 0 0;
+    border-radius: 4px 0 0 0;
 }
 
 /* Background Settings */
 
 .background-control button {
-    border-radius:0 4px 0 0;
+    border-radius: 4px 0 0 0;
 }
 
-.background-control button.active {
-    border-radius: 0;
+.background-control {
+    position: relative;
 }
 
 .nudge-container {
-    border-top: 1px solid #CCC;
-    margin: 0 -10px;
+    border: 1px solid #CCC;
 }
 
 .background-control .adjustments button:last-child {
     border: 0;
 }
 
+.background-control .hide-toggle  {
+    padding-bottom: 10px;
+}
+
+.layer-list {
+    margin-bottom: 10px;
+    border: 1px solid #CCC;
+    border-radius: 4px;
+}
+
+.layer-list li {
+    position: relative;
+    height: 30px;
+    background-color: white;
+    color: #7092FF;
+}
+
+.layer-list > li:first-child {
+    border-radius: 3px 3px 0 0;
+}
+
+.layer-list > li:last-child {
+    border-radius: 0 0 3px 3px;
+}
+
+.layer-list > li:only-child {
+    border-radius: 3px;
+}
+
+.layer-list li:not(:last-child) {
+    border-bottom: 1px solid #ccc;
+}
+
+.layer-list li:hover {
+    background-color: #ececec;
+}
+
+.layer-list li.active {
+    background: #E8EBFF;
+}
+
+.layer-list label {
+    display: block;
+    padding: 5px 10px;
+    cursor: pointer;
+}
+
+.layer-list label > span {
+    display: block;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+}
+
 .hide-toggle {
     display: block;
-    padding: 0 0 10px 12px;
+    padding-left:12px;
     position: relative;
 }
 
@@ -2805,7 +3156,6 @@ img.wiki-image {
     float: left;
     display: block;
     width:20%;
-    border-radius: 0;
     border-right: 1px solid #CCC;
     position: relative;
 }
@@ -2847,10 +3197,10 @@ img.wiki-image {
 .opacity-options {
     background: url(<%= asset_path("iD/img/background-pattern-opacity.png") %>) 0 0 repeat;
     height:20px;
-    width:62px;
+    width:82px;
     position: absolute;
-    right: 10px;
-    top: 10px;
+    right: 50px;
+    top: 20px;
     border: 1px solid #ccc;
 }
 
@@ -2886,74 +3236,48 @@ img.wiki-image {
     height:18px;
 }
 
-.background-control .layer-toggle-gpx .layer-extent {
+.background-control .layer-toggle-gpx button {
+    float: right;
+    height: 100%;
+    width: 10%;
     border-left: 1px solid #CCC;
+    border-radius: 0;
 }
 
-.background-control .layer-toggle-gpx.selected .layer-extent {
-    display:inline-block;
-}
-
-/* Geocoder */
-
-.geocode-control form {
-    top:260px;
+.background-control .layer-toggle-gpx button .icon {
+    opacity: 0.5;
 }
 
-.geocode-control form {
-    padding: 5px;
+.background-control .layer-toggle-gpx button.layer-extent {
+    border-radius: 0 3px 3px 0;
 }
 
-.geocode-control input {
-    width: 100%;
-}
+/* Geolocator */
 
-.geocode-control div.map-overlay {
-    border-top: 1px solid #CCC;
-    z-index: 100;
-    max-height: 240px;
-    overflow-y: auto;
-    padding: 0;
-    margin-top: 40px;
+.geolocate-control {
+    margin-bottom: 10px;
 }
 
-.geocode-control div.map-overlay span {
-    display: inline-block;
-    border-bottom: 1px solid #CCC;
-    padding: 5px 10px;
-}
-.geocode-control div.map-overlay span.not-found {
-    line-height: 28px;
-    width: 100%;
+.geolocate-control button {
+    border-radius: 0 0 0 4px;
 }
 
-.geocode-control a:focus {
-    text-decoration: underline;
+.map-overlay.content {
+    position: fixed;
+    top:60px;
+    bottom: 30px;
+    padding: 20px 50px 20px 20px;
+    right: 0;
+    overflow: auto;
 }
 
-/* Geolocator */
-
-.geolocate-control button {
-    border-radius: 0 0 4px 0;
+.background-control .map-overlay {
+    z-index: -1;
 }
-
 /* Help */
 
-.help-control {
-    margin-bottom: 20px;
-}
-
 .help-control button {
-    border-radius: 0 0 4px 0;
-}
-
-.help-wrap {
-    position: absolute;
-    top:60px;
-    bottom: 30px;
-    padding: 20px 20px 20px 50px;
-    left: 0;
-    overflow-y: scroll;
+    border-radius: 0 0 0 4px;
 }
 
 .help-wrap p {
@@ -3039,13 +3363,9 @@ img.wiki-image {
 ------------------------------------------------------- */
 
 #map {
-    display:block;
-    position:absolute;
+    position:relative;
     overflow:hidden;
-    top:0px;
-    left:0;
-    right:0;
-    bottom:0;
+    height:100%;
     background:#000;
 }
 
@@ -3061,8 +3381,12 @@ img.wiki-image {
     user-select: none;
 }
 
-#surface, #layer-g, .layer-layer {
+#supersurface, .layer-layer {
     position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
 }
 
 /* About Section
@@ -3070,11 +3394,8 @@ img.wiki-image {
 
 .about-block {
     position: absolute;
-    right:0px;
-    bottom:0px;
-    overflow: hidden;
-    white-space: nowrap;
-    text-overflow: ellipsis;
+    right:0;
+    bottom:0;
     border-radius: 0;
     opacity: .625;
     -webkit-transition: opacity 200ms;
@@ -3101,12 +3422,24 @@ img.wiki-image {
 }
 
 /* Attribution overlay */
-.attribution {
+.base-layer-attribution,
+.overlay-layer-attribution {
     position: absolute;
     bottom: 35px;
-    left:10px;
-    color:#888;
-    font-size:10px;
+    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 {
@@ -3166,8 +3499,10 @@ img.wiki-image {
 .shaded {
     z-index: 2;
     position: absolute;
-    height: 100%;
-    width: 100%;
+    top: 0;
+    bottom: 0;
+    left: 0;
+    right: 0;
     overflow: auto;
 }
 
@@ -3192,32 +3527,24 @@ img.wiki-image {
 }
 
 .modal-actions button,
-.modal-actions a {
-    background-size: white;
+.save-success a.button {
     font-weight: normal;
     color: #7092FF;
     border-bottom: 1px solid #CCC;
     border-radius: 0;
-    height: 180px;
+    height: 160px;
     text-align: center;
     display: inline-block;
 }
 
-.modal-actions a {
-    /* `button` elements have box-algin: auto, need
-    compensate this for `a`*/
-    padding-top: 25px;
-}
-
-.modal-actions button:hover,
-.modal-actions a:hover {
+.modal-actions button:hover
+.save-success a.button:hover {
     background-color: #ececec;
 }
 
-.modal-actions a:before,
 .modal-actions button:before,
+.save-success a.button:before,
 .walkthrough a:before {
-    background-size: white;
     display: block;
     content: '';
     height: 100px;
@@ -3235,26 +3562,46 @@ img.wiki-image {
 ------------------------------------------------------- */
 
 .modal-actions .restore:before {
-    background-position: -500px -220px;
+    background-position: -600px -220px;
 }
 
 .modal-actions .reset:before {
-    background-position: -600px -220px;
+    background-position: -700px -220px;
 }
 
 /* Success Modal
 ------------------------------------------------------- */
 
-.modal-actions .twitter:before {
-    background-position: -100px -220px;
+.save-success p {
+    padding: 15px;
+}
+
+.save-success .button {
+    padding-top: 15px;
+}
+
+.save-success .button.social {
+    height: 80px;
+}
+
+.save-success .button.social:before {
+    height: 50px;
+}
+
+.save-success .button.osm:before {
+    background-position: 0px -220px;
+}
+
+.save-success .button.twitter:before {
+    background-position: -100px -245px;
 }
 
-.modal-actions .facebook {
-    border-left: 1px solid #ccc;
+.save-success .button.facebook:before {
+    background-position: -200px -245px;
 }
 
-.modal-actions .facebook:before {
-    background-position: -200px -220px;
+.save-success .button.google:before {
+    background-position: -300px -245px;
 }
 
 /* Splash Modal
@@ -3262,30 +3609,37 @@ img.wiki-image {
 
 .modal-actions .walkthrough:before,
 .walkthrough a:before {
-    background-position: -300px -220px;
+    background-position: -400px -220px;
 }
 
 .modal-actions .start:before {
-    background-position: -400px -220px;
+    background-position: -500px -220px;
 }
 
 /* Commit Modal
 ------------------------------------------------------- */
 
-.commit-modal a.user-info {
+.mode-save a.user-info {
     display: inline-block;
 }
 
-.commit-modal .commit-info {
-    margin-top: 10px;
-    padding-bottom: 20px;
+.mode-save .commit-form {
+    margin-bottom: 0;
+}
+
+.mode-save button.action {
+    float: none;
+    margin: auto;
+    display: block;
+    color: white;
+    font-size: 14px;
 }
 
-.commit-modal .user-info img {
+.mode-save .user-info img {
     float: left;
 }
 
-.commit-modal h3 small.count {
+.mode-save h3 small.count {
     margin-right: 10px;
     text-align: center;
     float: left;
@@ -3299,22 +3653,33 @@ img.wiki-image {
     color:#fff;
 }
 
-.commit-modal .changeset-list {
-    overflow: auto;
+.mode-save .commit-info {
+    margin-bottom: 10px;
+}
+
+.mode-save .changeset-list {
     border:1px solid #ccc;
     border-radius: 4px;
     background:#fff;
-    max-height: 160px;
 }
 
-.commit-modal .warning-section .changeset-list button {
+.mode-save .warning-section .changeset-list button {
     border-left: 1px solid #CCC;
 }
 
-.commit-modal .changeset-list li {
+.mode-save .changeset-list li {
     position: relative;
     border-top:1px solid #ccc;
     padding:5px 10px;
+    cursor: pointer;
+}
+
+.mode-save .changeset-list li:hover {
+    background-color: #ececec;
+}
+
+.mode-save .changeset-list .alert {
+    opacity: 0.5;
 }
 
 .changeset-list li span.count {
@@ -3322,6 +3687,10 @@ img.wiki-image {
     color:#555;
 }
 
+.mode-save .commit-section .changeset-list button {
+    border-left: 1px solid #CCC;
+}
+
 .changeset-list li span.count:before { content: '('; }
 
 .changeset-list li span.count:after { content: ')'; }
@@ -3332,18 +3701,21 @@ img.wiki-image {
 ------------------------------------------------------- */
 
 .notice {
-    float:left;
-    width:25%;
-    padding-right: 10px;
-    text-align:center;
+    position: absolute;
+    top: 0;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    text-align: center;
+    background: #fff;
 }
 
 .notice .zoom-to {
-    width:100%;
-    height: 40px;
+    margin: auto;
+    width: 80%;
+    height: 100px;
     border-radius: 5px;
     line-height: 40px;
-    background: #fff;
     color: #000;
     opacity: 0.9;
 }
@@ -3365,7 +3737,6 @@ img.wiki-image {
 ------------------------------------------------------- */
 
 .tooltip {
-    width: 200px;
     position: absolute;
     display: none;
     color:#333;
@@ -3396,10 +3767,13 @@ img.wiki-image {
 
 .tooltip.left {
     margin-left: -20px;
+    text-align: right;
 }
 
 .tooltip-inner {
     display: inline-block;
+    max-width: 200px;
+    min-width: 80px;
     padding: 10px;
     font-weight: normal;
     background-color: white;
@@ -3493,22 +3867,13 @@ img.wiki-image {
     border-width: 0 5px 5px;
 }
 
-
-/* Exceptions for tooltips that are up against the edge of the screen */
-.add-point .tooltip {
-    left: -20px !important; }
-
-.curtain-tooltip.intro-points-add .tooltip-arrow,
-.add-point .tooltip .tooltip-arrow {
-    left: 60px;
-}
-
-.tooltip .keyhint-wrap {
-    padding: 5px 0 5px 0;
+.keyhint-wrap {
+    background: #F6F6F6;
+    padding: 10px;
+    margin: 10px -10px -10px;
 }
 
 .tooltip-inner .keyhint {
-    color: #222;
     font-size: 10px;
     padding: 0 7px;
     font-weight: bold;
@@ -3518,11 +3883,6 @@ img.wiki-image {
     position: relative;
     z-index: 1;
     text-align: left;
-    clear: both;
-}
-
-.tooltip .keyhint .keyhint-label {
-    display: inline-block;
 }
 
 .tooltip-inner .keyhint::after {
@@ -3538,8 +3898,60 @@ img.wiki-image {
     border-top: 0;
 }
 
+/* Exceptions for tooltip layouts */
+
+/* make tooltips in panels dark */
+.map-overlay .tooltip.top .tooltip-arrow,
+.entity-editor-pane .tooltip.top .tooltip-arrow,
+.warning-section .tooltip.top .tooltip-arrow {
+    border-top-color: #000;
+}
+
+.map-overlay .tooltip.bottom .tooltip-arrow,
+.entity-editor-pane .tooltip.bottom .tooltip-arrow,
+.warning-section .tooltip.bottom .tooltip-arrow {
+    border-bottom-color: #000;
+}
+
+.map-overlay .tooltip.left .tooltip-arrow,
+.entity-editor-pane .tooltip.left .tooltip-arrow,
+.warning-section .tooltip.left .tooltip-arrow {
+    border-left-color: #000;
+}
+
+.map-overlay .tooltip.right .tooltip-arrow,
+.entity-editor-pane .tooltip.right .tooltip-arrow,
+.warning-section .tooltip.right .tooltip-arrow {
+    border-right-color: #000;
+}
+
+.map-overlay .tooltip-inner,
+.entity-editor-pane .tooltip-inner,
+.warning-section .tooltip-inner {
+    background: #000;
+    color: #ccc;
+}
+/* commit warning tooltips need to be closer */
+.warning-section .tooltip.top {
+    margin-top: -5px;
+}
+
+/* Uncramp map-control tooltips */
+.map-control .tooltip {
+    min-width: 160px;
+}
+/* Move over tooltips that are near the edge of screen */
+.add-point .tooltip {
+    left: 33.3333% !important;
+}
+
+.curtain-tooltip.intro-points-add .tooltip-arrow,
+.add-point .tooltip .tooltip-arrow {
+    left: 60px;
+}
+
 .radial-menu-tooltip {
-    background-color: rgba(255, 255, 255, 0.8);
+    opacity: 0.8;
     display: none;
     position: absolute;
     width: 200px;
@@ -3583,7 +3995,6 @@ img.wiki-image {
 ------------------------------------------------------- */
 
 @media only screen and (max-width: 840px) {
-    #bar .label {display: none;}
     #bar .icon.icon-pre-text { margin-right: 0;}
     /* override hide for save button */
     #bar .save .label { display: block;}
@@ -3688,6 +4099,7 @@ img.wiki-image {
 .intro-points-add .tooltip-inner::before,
 .intro-areas-add .tooltip-inner::before,
 .intro-lines-add .tooltip-inner::before {
+    margin-left: -20px;
     display: block;
     content: "";
     height: 80px;
@@ -3712,101 +4124,124 @@ img.wiki-image {
 .huge-modal-button .illustration {
     height: 100px;
     width: 100px;
-    background: rgba(0, 0, 0, 0) url(<%= asset_path("iD/img/sprite.svg") %>) no-repeat -301px -220px;
+    background: rgba(0, 0, 0, 0) url(<%= asset_path("iD/img/sprite.svg") %>) no-repeat -400px -220px;
     margin: auto;
 }
 /* This file is generated by make. Do NOT edit manually. */
 
 .preset-icon{background-image:url(<%= asset_path("iD/img/maki-sprite.png") %>);background-repeat:no-repeat;width:24px;height:24px;}
 .preset-icon-line{background-image:url(<%= asset_path("iD/img/line-presets.png") %>);background-repeat:no-repeat;width:60px;height:60px;}
-.feature-airfield{background-position:-0px -34px;}
-.feature-airport{background-position:-0px -94px;}
-.feature-alcohol-shop{background-position:-0px -154px;}
-.feature-america-football{background-position:-0px -214px;}
-.feature-art-gallery{background-position:-0px -274px;}
-.feature-bank{background-position:-0px -334px;}
-.feature-bar{background-position:-0px -394px;}
-.feature-baseball{background-position:-0px -454px;}
-.feature-basketball{background-position:-0px -514px;}
-.feature-beer{background-position:-0px -574px;}
-.feature-bicycle{background-position:-0px -634px;}
-.feature-building{background-position:-0px -694px;}
-.feature-bus{background-position:-0px -754px;}
-.feature-cafe{background-position:-0px -814px;}
-.feature-campsite{background-position:-0px -874px;}
-.feature-cemetery{background-position:-0px -934px;}
-.feature-cinema{background-position:-0px -994px;}
-.feature-circle{background-position:-0px -1054px;}
-.feature-circle-stroked{background-position:-0px -1114px;}
-.feature-college{background-position:-0px -1174px;}
-.feature-commercial{background-position:-0px -1234px;}
-.feature-cricket{background-position:-0px -1294px;}
-.feature-cross{background-position:-0px -1354px;}
-.feature-dam{background-position:-0px -1414px;}
-.feature-danger{background-position:-0px -1474px;}
-.feature-disability{background-position:-0px -1534px;}
-.feature-embassy{background-position:-0px -1594px;}
-.feature-emergency-telephone{background-position:-0px -1654px;}
-.feature-fast-food{background-position:-0px -1714px;}
-.feature-ferry{background-position:-0px -1774px;}
-.feature-fire-station{background-position:-0px -1834px;}
-.feature-fuel{background-position:-0px -1894px;}
-.feature-garden{background-position:-0px -1954px;}
-.feature-golf{background-position:-0px -2014px;}
-.feature-grocery{background-position:-0px -2074px;}
-.feature-harbor{background-position:-0px -2134px;}
-.feature-heliport{background-position:-0px -2194px;}
-.feature-hospital{background-position:-0px -2254px;}
-.feature-industrial{background-position:-0px -2314px;}
-.feature-library{background-position:-0px -2374px;}
-.feature-lodging{background-position:-0px -2434px;}
-.feature-logging{background-position:-0px -2494px;}
-.feature-marker{background-position:-0px -2554px;}
-.feature-marker-stroked{background-position:-0px -2614px;}
-.feature-monument{background-position:-0px -2674px;}
-.feature-museum{background-position:-0px -2734px;}
-.feature-music{background-position:-0px -2794px;}
-.feature-oil-well{background-position:-0px -2854px;}
-.feature-park{background-position:-0px -2914px;}
-.feature-park2{background-position:-0px -2974px;}
-.feature-parking{background-position:-0px -3034px;}
-.feature-parking-garage{background-position:-0px -3094px;}
-.feature-pharmacy{background-position:-0px -3154px;}
-.feature-pitch{background-position:-0px -3214px;}
-.feature-place-of-worship{background-position:-0px -3274px;}
-.feature-police{background-position:-0px -3334px;}
-.feature-post{background-position:-0px -3394px;}
-.feature-prison{background-position:-0px -3454px;}
-.feature-rail{background-position:-0px -3514px;}
-.feature-rail-above{background-position:-0px -3574px;}
-.feature-rail-underground{background-position:-0px -3634px;}
-.feature-religious-christian{background-position:-0px -3694px;}
-.feature-religious-jewish{background-position:-0px -3754px;}
-.feature-religious-muslim{background-position:-0px -3814px;}
-.feature-restaurant{background-position:-0px -3874px;}
-.feature-roadblock{background-position:-0px -3934px;}
-.feature-school{background-position:-0px -3994px;}
-.feature-shop{background-position:-0px -4054px;}
-.feature-skiing{background-position:-0px -4114px;}
-.feature-slaughterhouse{background-position:-0px -4174px;}
-.feature-soccer{background-position:-0px -4234px;}
-.feature-square{background-position:-0px -4294px;}
-.feature-square-stroked{background-position:-0px -4354px;}
-.feature-star{background-position:-0px -4414px;}
-.feature-star-stroked{background-position:-0px -4474px;}
-.feature-swimming{background-position:-0px -4534px;}
-.feature-telephone{background-position:-0px -4594px;}
-.feature-tennis{background-position:-0px -4654px;}
-.feature-theatre{background-position:-0px -4714px;}
-.feature-toilets{background-position:-0px -4774px;}
-.feature-town-hall{background-position:-0px -4834px;}
-.feature-triangle{background-position:-0px -4894px;}
-.feature-triangle-stroked{background-position:-0px -4954px;}
-.feature-warehouse{background-position:-0px -5014px;}
-.feature-waste-basket{background-position:-0px -5074px;}
-.feature-water{background-position:-0px -5134px;}
-.feature-wetland{background-position:-0px -5194px;}
-.feature-zoo{background-position:-0px -5254px;}
+.preset-icon-relation{background-image:url(<%= asset_path("iD/img/relation-presets.png") %>);background-repeat:no-repeat;width:60px;height:60px;}
+.feature-circle-stroked{background-position:-0px -0px;}
+.feature-circle{background-position:-54px -0px;}
+.feature-square-stroked{background-position:-108px -0px;}
+.feature-square{background-position:-162px -0px;}
+.feature-triangle-stroked{background-position:-216px -0px;}
+.feature-triangle{background-position:-0px -24px;}
+.feature-star-stroked{background-position:-54px -24px;}
+.feature-star{background-position:-108px -24px;}
+.feature-cross{background-position:-162px -24px;}
+.feature-marker-stroked{background-position:-216px -24px;}
+.feature-marker{background-position:-0px -48px;}
+.feature-religious-jewish{background-position:-54px -48px;}
+.feature-religious-christian{background-position:-108px -48px;}
+.feature-religious-muslim{background-position:-162px -48px;}
+.feature-cemetery{background-position:-216px -48px;}
+.feature-rocket{background-position:-0px -72px;}
+.feature-airport{background-position:-54px -72px;}
+.feature-heliport{background-position:-108px -72px;}
+.feature-rail{background-position:-162px -72px;}
+.feature-rail-metro{background-position:-216px -72px;}
+.feature-rail-light{background-position:-0px -96px;}
+.feature-bus{background-position:-54px -96px;}
+.feature-fuel{background-position:-108px -96px;}
+.feature-parking{background-position:-162px -96px;}
+.feature-parking-garage{background-position:-216px -96px;}
+.feature-airfield{background-position:-0px -120px;}
+.feature-roadblock{background-position:-54px -120px;}
+.feature-ferry{background-position:-108px -120px;}
+.feature-harbor{background-position:-162px -120px;}
+.feature-bicycle{background-position:-216px -120px;}
+.feature-park{background-position:-0px -144px;}
+.feature-park2{background-position:-54px -144px;}
+.feature-museum{background-position:-108px -144px;}
+.feature-lodging{background-position:-162px -144px;}
+.feature-monument{background-position:-216px -144px;}
+.feature-zoo{background-position:-0px -168px;}
+.feature-garden{background-position:-54px -168px;}
+.feature-campsite{background-position:-108px -168px;}
+.feature-theatre{background-position:-162px -168px;}
+.feature-art-gallery{background-position:-216px -168px;}
+.feature-pitch{background-position:-0px -192px;}
+.feature-soccer{background-position:-54px -192px;}
+.feature-america-football{background-position:-108px -192px;}
+.feature-tennis{background-position:-162px -192px;}
+.feature-basketball{background-position:-216px -192px;}
+.feature-baseball{background-position:-0px -216px;}
+.feature-golf{background-position:-54px -216px;}
+.feature-swimming{background-position:-108px -216px;}
+.feature-cricket{background-position:-162px -216px;}
+.feature-skiing{background-position:-216px -216px;}
+.feature-school{background-position:-0px -240px;}
+.feature-college{background-position:-54px -240px;}
+.feature-library{background-position:-108px -240px;}
+.feature-post{background-position:-162px -240px;}
+.feature-fire-station{background-position:-216px -240px;}
+.feature-town-hall{background-position:-0px -264px;}
+.feature-police{background-position:-54px -264px;}
+.feature-prison{background-position:-108px -264px;}
+.feature-embassy{background-position:-162px -264px;}
+.feature-beer{background-position:-216px -264px;}
+.feature-restaurant{background-position:-0px -288px;}
+.feature-cafe{background-position:-54px -288px;}
+.feature-shop{background-position:-108px -288px;}
+.feature-fast-food{background-position:-162px -288px;}
+.feature-bar{background-position:-216px -288px;}
+.feature-bank{background-position:-0px -312px;}
+.feature-grocery{background-position:-54px -312px;}
+.feature-cinema{background-position:-108px -312px;}
+.feature-pharmacy{background-position:-162px -312px;}
+.feature-hospital{background-position:-216px -312px;}
+.feature-danger{background-position:-0px -336px;}
+.feature-industrial{background-position:-54px -336px;}
+.feature-warehouse{background-position:-108px -336px;}
+.feature-commercial{background-position:-162px -336px;}
+.feature-building{background-position:-216px -336px;}
+.feature-place-of-worship{background-position:-0px -360px;}
+.feature-alcohol-shop{background-position:-54px -360px;}
+.feature-logging{background-position:-108px -360px;}
+.feature-oil-well{background-position:-162px -360px;}
+.feature-slaughterhouse{background-position:-216px -360px;}
+.feature-dam{background-position:-0px -384px;}
+.feature-water{background-position:-54px -384px;}
+.feature-wetland{background-position:-108px -384px;}
+.feature-disability{background-position:-162px -384px;}
+.feature-telephone{background-position:-216px -384px;}
+.feature-emergency-telephone{background-position:-0px -408px;}
+.feature-toilets{background-position:-54px -408px;}
+.feature-waste-basket{background-position:-108px -408px;}
+.feature-music{background-position:-162px -408px;}
+.feature-land-use{background-position:-216px -408px;}
+.feature-city{background-position:-0px -432px;}
+.feature-town{background-position:-54px -432px;}
+.feature-village{background-position:-108px -432px;}
+.feature-farm{background-position:-162px -432px;}
+.feature-bakery{background-position:-216px -432px;}
+.feature-dog-park{background-position:-0px -456px;}
+.feature-lighthouse{background-position:-54px -456px;}
+.feature-clothing-store{background-position:-108px -456px;}
+.feature-polling-place{background-position:-162px -456px;}
+.feature-playground{background-position:-216px -456px;}
+.feature-entrance{background-position:-0px -480px;}
+.feature-heart{background-position:-54px -480px;}
+.feature-london-underground{background-position:-108px -480px;}
+.feature-minefield{background-position:-162px -480px;}
+.feature-rail-underground{background-position:-216px -480px;}
+.feature-rail-above{background-position:-0px -504px;}
+.feature-camera{background-position:-54px -504px;}
+.feature-laundry{background-position:-108px -504px;}
+.feature-car{background-position:-162px -504px;}
+.feature-suitcase{background-position:-216px -504px;}
 .preset-icon-line.feature-highway-motorway{background-position:-20px -25px;}
 .preset-icon-line.feature-highway-trunk{background-position:-80px -25px;}
 .preset-icon-line.feature-highway-primary{background-position:-140px -25px;}
@@ -3844,3 +4279,21 @@ img.wiki-image {
 .preset-icon-line.feature-category-rail{background-position:-2060px -25px;}
 .preset-icon-line.feature-category-path{background-position:-2120px -25px;}
 .preset-icon-line.feature-category-water{background-position:-2180px -25px;}
+.preset-icon-line.feature-ferry{background-position:-2240px -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-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-route-bicycle{background-position:-380px -25px;}
+.preset-icon-relation.feature-route-foot{background-position:-440px -25px;}
+.preset-icon-relation.feature-route-bus{background-position:-500px -25px;}
+.preset-icon-relation.feature-route-train{background-position:-560px -25px;}
+.preset-icon-relation.feature-route-detour{background-position:-620px -25px;}
+.preset-icon-relation.feature-route-tram{background-position:-680px -25px;}
+.preset-icon-relation.feature-route-ferry{background-position:-740px -25px;}
+.preset-icon-relation.feature-route-power{background-position:-800px -25px;}
+.preset-icon-relation.feature-route-pipeline{background-position:-860px -25px;}
+.preset-icon-relation.feature-route-master{background-position:-920px -25px;}