Update to iD v1.7.4

[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 3f733c3b4dd0cc0411f2bcd4777c1c74fb23191d..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;
 }
 
+g.midpoint.tag-highway-corridor .fill,
 g.midpoint.tag-highway-pedestrian .fill,
 g.midpoint.tag-highway-steps .fill,
 g.midpoint.tag-highway-path .fill,
@@ -509,10 +510,10 @@ path.fill.tag-landuse-landfill {
 .pattern-color-construction {
     fill: rgba(196, 189, 25, 0.2);
 }
-path.stroke.tag-landuse-construction {
+path.stroke.tag-landuse.tag-ephemeral {
     stroke: rgb(196, 189, 25);
 }
-.preset-icon-fill-area.tag-landuse-construction {
+.preset-icon-fill-area.tag-landuse.tag-ephemeral {
     border-color: rgb(196, 189, 25);
     background-color: rgba(196, 189, 25, 0.2);
 }
@@ -616,7 +617,15 @@ path.fill.tag-boundary {
     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;
@@ -642,170 +651,251 @@ path.stroke.tag-highway {
 
 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,
-path.casing.tag-construction-motorway {
+path.casing.tag-motorway {
     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,
-path.casing.tag-construction-trunk {
+path.casing.tag-trunk {
     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,
-path.casing.tag-construction-primary {
+path.casing.tag-primary {
     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,
-path.casing.tag-construction-secondary {
+path.casing.tag-secondary {
     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,
-path.casing.tag-construction-tertiary {
+path.casing.tag-tertiary {
     stroke:#7f7f3f;
 }
 
 path.stroke.tag-highway-unclassified,
-path.stroke.tag-construction-unclassified {
+path.stroke.tag-unclassified {
     stroke:#eaeaea;
 }
 path.casing.tag-highway-unclassified,
-path.casing.tag-construction-unclassified {
+path.casing.tag-unclassified {
     stroke:#444;
 }
 
 path.stroke.tag-highway-residential,
-path.stroke.tag-construction-residential {
+path.stroke.tag-residential {
     stroke:#fff;
 }
 path.casing.tag-highway-residential,
-path.casing.tag-construction-residential {
+path.casing.tag-residential {
     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;
 }
-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;
 }
 
-path.stroke.tag-highway-pedestrian {
-    stroke:#fff;
-    stroke-dasharray: 2, 8;
+.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.casing.tag-highway-pedestrian {
-    stroke:#8cd05f;
-    stroke-width:6;
+
+
+path.stroke.tag-highway-living_street,
+path.stroke.tag-living_street {
+    stroke:#ccc;
 }
-path.stroke.area.tag-highway-pedestrian {
+path.casing.tag-highway-living_street,
+path.casing.tag-living_street {
     stroke:#fff;
-    stroke-dasharray: none;
-    stroke-width: 2;
 }
 
-path.stroke.tag-highway-service {
+path.stroke.tag-highway-corridor,
+path.stroke.tag-highway-pedestrian,
+path.stroke.tag-corridor,
+path.stroke.tag-pedestrian {
     stroke:#fff;
-    stroke-width:4;
-}
-path.casing.tag-highway-service {
-    stroke:#666;
-    stroke-width:6;
-}
-.low-zoom path.stroke.tag-highway-service {
-    stroke-width:2;
+    stroke-dasharray: 2, 8;
 }
-.low-zoom path.casing.tag-highway-service {
-    stroke-width:4;
+path.casing.tag-highway-corridor,
+path.casing.tag-highway-pedestrian,
+path.casing.tag-corridor,
+path.casing.tag-pedestrian {
+    stroke:#8cd05f;
 }
 
-path.stroke.tag-highway-track {
-    stroke: #fff;
-    stroke-width: 4;
+path.stroke.tag-highway-road,
+path.stroke.tag-road {
+    stroke:#9e9e9e;
 }
-path.casing.tag-highway-track {
-    stroke: #996600;
-    stroke-width: 6;
-    stroke-linecap: butt;
-    stroke-dasharray: 6, 6;
+path.casing.tag-highway-road,
+path.casing.tag-road {
+    stroke:#444;
 }
-.low-zoom path.stroke.tag-highway-track {
-    stroke-width:2;
+
+path.stroke.tag-highway-service,
+path.stroke.tag-service {
+    stroke:#fff;
 }
-.low-zoom path.casing.tag-highway-track {
-    stroke-width:4;
+path.casing.tag-highway-service,
+path.casing.tag-service {
+    stroke:#666;
 }
 
-path.stroke.tag-highway-path {
-    stroke: #000;
-    stroke-width: 1 !important;
-    stroke-linecap: butt;
-    stroke-dasharray: 8, 4;
+path.stroke.tag-highway-track,
+path.stroke.tag-track {
+    stroke: #ccc;
 }
-path.casing.tag-highway-path {
-    stroke-width: 1 !important;
-    stroke: #fff;
+path.casing.tag-highway-track,
+path.casing.tag-track {
+    stroke: #996600;
+    stroke-linecap: butt;
+    stroke-dasharray: 6, 6;
+    stroke-width:7;
 }
 
+path.stroke.tag-highway-path,
 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;
 }
+
+path.casing.tag-highway-path{
+    stroke: #c5b59f;
+}
 path.casing.tag-highway-footway,
 path.casing.tag-highway-cycleway,
 path.casing.tag-highway-bridleway {
-    stroke-width: 6;
     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;
 }
@@ -818,12 +908,10 @@ path.stroke.tag-highway-bridleway {
 
 path.stroke.tag-highway-steps {
     stroke: #81d25c;
-    stroke-width: 4;
     stroke-linecap: butt;
     stroke-dasharray: 3, 3;
 }
 path.casing.tag-highway-steps {
-    stroke-width: 6;
     stroke: #fff;
 }
 
@@ -996,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.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,
@@ -1009,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.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,
@@ -1034,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.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,
@@ -1047,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.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,
@@ -1094,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-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-dasharray: 5, 5;
+    stroke-dasharray: 5, 2;
 }
 
 text {
@@ -1345,23 +1437,30 @@ text.gpx {
 }
 
 .layer-mapillary g * {
-    stroke-width: 2;
-    stroke: #ffc600;
+    stroke-width: 1;
+    stroke: #444;
     fill: #ffc600;
 }
 
 .layer-mapillary g:hover * {
-    stroke-width: 2;
-    stroke: #ff9900;
+    stroke-width: 1;
+    stroke: #333;
     fill: #ff9900;
 }
 
-.layer-mapillary g.selected * {
-    stroke-width: 4;
-    stroke: #ff5800;
+.layer-mapillary g.selected  * {
+    stroke-width: 2;
+    stroke: #222;
     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,
@@ -1452,7 +1551,6 @@ body {
 .id-container {
     height: 100%;
     width: 100%;
-    position: fixed;
     min-width: 768px;
 }
 
@@ -1481,14 +1579,12 @@ body {
 
 .spinner {
     opacity: .5;
+    float: right;
 }
 
 .spinner img {
-    position: absolute;
     height: 40px;
     width: 40px;
-    right: 10px;
-    top: 10px;
     border-radius: 4px;
     margin-right: 10px;
     background: black;
@@ -1978,6 +2074,9 @@ button.save.has-count .count::before {
 .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;}
@@ -2657,6 +2756,21 @@ a:hover .icon.out-link   { background-position: -500px -14px;}
     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] {
@@ -3148,6 +3262,27 @@ img.wiki-image {
     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 {
@@ -3208,7 +3343,7 @@ img.wiki-image {
     padding-bottom: 10px;
 }
 
-.layer-list {
+.layer-list, .controls-list {
     margin-bottom: 10px;
     border: 1px solid #CCC;
     border-radius: 4px;
@@ -3258,6 +3393,22 @@ img.wiki-image {
     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;
@@ -3559,13 +3710,24 @@ img.wiki-image {
     user-select: none;
 }
 
-.map-in-map-svg {
-    position: relative;
+.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);
@@ -3808,6 +3970,13 @@ img.wiki-image {
     vertical-align: middle;
 }
 
+.save-section .buttons .action {
+    display: inline-block;
+    margin: 0 20px 0 0;
+    text-align: center;
+    vertical-align: middle;
+}
+
 .loading-modal {
     text-align: center;
 }