Use redaction factory for old_relation controller tests.

[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 758d1518c8335d78209284ce23482738f9468eaa..cce5fb89a267a65c14e11e9fdfad9cbdd0f6f077 100644 (file)
--- a/vendor/assets/iD/iD.css.erb
+++ b/vendor/assets/iD/iD.css.erb
@@ -184,7 +184,6 @@ path.shadow {
     pointer-events: stroke;
 }
 
     pointer-events: stroke;
 }
 

-

 /* points */
 
 g.point .stroke {
 /* points */
 
 g.point .stroke {


@@ -236,19 +235,6 @@ g.midpoint .fill {
     opacity: .7;
 }
 
     opacity: .7;
 }
 

-g.midpoint.tag-highway-corridor .fill,
-g.midpoint.tag-highway-pedestrian .fill,
-g.midpoint.tag-highway-steps .fill,
-g.midpoint.tag-highway-path .fill,
-g.midpoint.tag-highway-footway .fill,
-g.midpoint.tag-highway-cycleway .fill,
-g.midpoint.tag-highway-bridleway .fill {
-    fill: #fff;
-    stroke: #333;
-    stroke-opacity: .8;
-    opacity: .8;
-}
-

 g.vertex .shadow,
 g.midpoint .shadow {
     fill: #f6634f;
 g.vertex .shadow,
 g.midpoint .shadow {
     fill: #f6634f;


@@ -324,6 +310,111 @@ path.line.stroke {
     stroke-width: 2;
 }
 
     stroke-width: 2;
 }
 

+
+/* Labels / Markers */
+
+text {
+    font-size:10px;
+    pointer-events: none;
+    color: #222;
+    opacity: 1;
+}
+
+.oneway .textpath.tag-waterway {
+    fill: #002F35;
+}
+
+path.oneway {
+    stroke-width: 6px;
+}
+
+
+text.arealabel-halo,
+text.linelabel-halo,
+text.pointlabel-halo,
+text.arealabel,
+text.linelabel,
+text.pointlabel {
+    dominant-baseline: middle;
+    text-anchor: middle;
+    font-size: 12px;
+    font-weight: bold;
+    fill: #333;
+    pointer-events: none;
+    -webkit-transition: opacity 100ms linear;
+    transition: opacity 100ms linear;
+    -moz-transition: opacity 100ms linear;
+}
+
+/* Opera doesn't support dominant-baseline. See #715 */
+/* Safari 10 seems to have regressed too */
+.linelabel-halo .textpath,
+.linelabel .textpath {
+  baseline-shift: -33%;
+  dominant-baseline: auto;
+}
+
+.layer-halo text {
+    opacity: 0.7;
+    stroke: #fff;
+    stroke-width: 5px;
+    stroke-miterlimit: 1;
+}
+
+text.proximate {
+    opacity: 0;
+}
+
+text.point {
+    font-size: 10px;
+}
+
+.icon.areaicon-halo {
+    opacity: 0.6;
+    stroke: #999;
+    stroke-width: 2px;
+    stroke-miterlimit: 1;
+}
+
+.icon.areaicon {
+    fill: #222;
+    opacity: 0.8;
+}
+
+
+/* Turns */
+
+g.turn rect,
+g.turn circle {
+    fill: none;
+    pointer-events: all;
+}
+
+.form-field-restrictions .vertex {
+    pointer-events: none;
+    cursor: auto !important;
+}
+
+.lasso #map {
+    pointer-events: visibleStroke;
+}
+
+/* GPX Paths */
+
+.layer-gpx {
+    pointer-events: none;
+}
+
+path.gpx {
+    stroke: #FF26D4;
+    stroke-width: 2;
+    fill: none;
+}
+
+text.gpx {
+    fill: #FF26D4;
+}
+

 path.area.stroke {
     stroke: #fff;
     stroke-width: 1;
 path.area.stroke {
     stroke: #fff;
     stroke-width: 1;


@@ -387,12 +478,14 @@ path.fill.tag-leisure-park {
 path.stroke.tag-amenity-swimming_pool,
 path.stroke.tag-leisure-swimming_pool,
 path.stroke.tag-natural-water,
 path.stroke.tag-amenity-swimming_pool,
 path.stroke.tag-leisure-swimming_pool,
 path.stroke.tag-natural-water,

+path.stroke.tag-landuse-aquaculture,

 path.stroke.tag-landuse-basin,
 path.stroke.tag-landuse-reservoir {
     stroke: rgb(119, 211, 222);
 }
 path.fill.tag-amenity-swimming_pool,
 path.fill.tag-leisure-swimming_pool,
 path.stroke.tag-landuse-basin,
 path.stroke.tag-landuse-reservoir {
     stroke: rgb(119, 211, 222);
 }
 path.fill.tag-amenity-swimming_pool,
 path.fill.tag-leisure-swimming_pool,

+path.fill.tag-landuse-aquaculture,

 path.fill.tag-landuse-basin,
 path.fill.tag-landuse-reservoir,
 path.fill.tag-natural-water {
 path.fill.tag-landuse-basin,
 path.fill.tag-landuse-reservoir,
 path.fill.tag-natural-water {


@@ -401,6 +494,7 @@ path.fill.tag-natural-water {
 }
 .preset-icon-fill-area.tag-amenity-swimming_pool,
 .preset-icon-fill-area.tag-leisure-swimming_pool,
 }
 .preset-icon-fill-area.tag-amenity-swimming_pool,
 .preset-icon-fill-area.tag-leisure-swimming_pool,

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

 .preset-icon-fill-area.tag-landuse-basin,
 .preset-icon-fill-area.tag-landuse-reservoir,
 .preset-icon-fill-area.tag-natural-water {
 .preset-icon-fill-area.tag-landuse-basin,
 .preset-icon-fill-area.tag-landuse-reservoir,
 .preset-icon-fill-area.tag-natural-water {


@@ -629,9 +723,9 @@ path.fill.tag-amenity-parking {
     background-color: rgba(170, 170, 170, 0.3);
 }
 
     background-color: rgba(170, 170, 170, 0.3);
 }
 

+/* highways */

 
 /* highway areas */
 
 /* highway areas */

-

 path.stroke.area.tag-highway {
     stroke:#fff;
     stroke-dasharray: none;
 path.stroke.area.tag-highway {
     stroke:#fff;
     stroke-dasharray: none;


@@ -954,16 +1048,16 @@ path.casing.tag-road {
 }
 
 .preset-icon .icon.highway-living-street {
 }
 
 .preset-icon .icon.highway-living-street {

-    color: #ccc;
-    fill: #fff;
+    color: #bbb;
+    fill: #ddd;

 }
 path.stroke.tag-highway-living_street,
 path.stroke.tag-living_street {
 }
 path.stroke.tag-highway-living_street,
 path.stroke.tag-living_street {

-    stroke:#ccc;
+    stroke: #ccc;

 }
 path.casing.tag-highway-living_street,
 path.casing.tag-living_street {
 }
 path.casing.tag-highway-living_street,
 path.casing.tag-living_street {

-    stroke:#fff;
+    stroke: #fff;

 }
 
 .preset-icon .icon.highway-footway.tag-highway-corridor,
 }
 
 .preset-icon .icon.highway-footway.tag-highway-corridor,


@@ -1116,12 +1210,67 @@ path.casing.tag-highway-steps.tag-unpaved {
     stroke-dasharray: none;
 }
 
     stroke-dasharray: none;
 }
 

+/* highway midpoints */

 
 

+g.midpoint.tag-highway-corridor .fill,
+g.midpoint.tag-highway-pedestrian .fill,
+g.midpoint.tag-highway-steps .fill,
+g.midpoint.tag-highway-path .fill,
+g.midpoint.tag-highway-footway .fill,
+g.midpoint.tag-highway-cycleway .fill,
+g.midpoint.tag-highway-bridleway .fill {
+    fill: #fff;
+    stroke: #333;
+    stroke-opacity: .8;
+    opacity: .8;
+}

 /* aeroways */
 /* aeroways */

-path.stroke.tag-aeroway-taxiway {
-    stroke: #805C80;
+
+/* areas */
+path.stroke.area.tag-aeroway {
+    stroke:#fff;
+    stroke-dasharray: none;
+    stroke-width: 2;
+}
+
+/* lines */
+path.stroke.tag-aeroway-taxiway,
+path.stroke.tag-taxiway {
+    stroke-width: 4;
+}
+path.casing.tag-aeroway-taxiway,
+path.casing.tag-taxiway {
+    stroke-width: 6;
+}
+
+.low-zoom path.stroke.tag-aeroway-taxiway,
+.low-zoom path.stroke.tag-taxiway {
+    stroke-width: 2;
+}
+.low-zoom path.casing.tag-aeroway-taxiway,
+.low-zoom path.casing.tag-taxiway {

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

+
+.preset-icon .icon.tag-aeroway-taxiway,
+.preset-icon .icon.tag-taxiway {
+    color: #ff0;
+    fill: #666;
+}
+path.stroke.tag-aeroway-taxiway,
+path.stroke.tag-taxiway {
+    stroke: #ff0;
+}
+path.casing.tag-aeroway-taxiway,
+path.casing.tag-taxiway {
+    stroke: #666;
+}
+
+.preset-icon .icon.tag-aeroway-runway,
+.preset-icon .icon.tag-runway {
+    color: #444;
+    fill: #000;
+}

 path.shadow.tag-aeroway-runway {
     stroke-width: 20;
 }
 path.shadow.tag-aeroway-runway {
     stroke-width: 20;
 }


@@ -1140,16 +1289,9 @@ path.fill.tag-aeroway-runway {
     stroke: rgba(0, 0, 0, 0.6);
     fill: rgba(0, 0, 0, 0.6);
 }
     stroke: rgba(0, 0, 0, 0.6);
     fill: rgba(0, 0, 0, 0.6);
 }

-path.stroke.tag-aeroway-apron {
-    stroke: #805C80;
-}
-path.fill.tag-aeroway-apron {
-    stroke: rgba(128, 92, 128, 0.2);
-    fill: rgba(128, 92, 128, 0.2);
-}
-

 
 /* railways */
 
 /* railways */

+

 .preset-icon .icon.tag-railway.other-line {
     color: #fff;
     fill: #777;
 .preset-icon .icon.tag-railway.other-line {
     color: #fff;
     fill: #777;


@@ -1209,9 +1351,8 @@ path.casing.tag-railway-platform {
 .area.casing.tag-railway {
     stroke: none;
 }
 .area.casing.tag-railway {
     stroke: none;
 }

-
-

 /* waterways */
 /* waterways */

+

 .preset-icon .icon.tag-waterway.other-line {
     color: #77d3de;
     fill: #77d3de;
 .preset-icon .icon.tag-waterway.other-line {
     color: #77d3de;
     fill: #77d3de;


@@ -1274,7 +1415,6 @@ path.area.fill.tag-waterway-fuel {
     fill: rgba(255, 255, 255, 0.3);
 }
 
     fill: rgba(255, 255, 255, 0.3);
 }
 

-

 /* power */
 .preset-icon .icon.tag-man_made-pipeline,
 .preset-icon .icon.tag-power {
 /* power */
 .preset-icon .icon.tag-man_made-pipeline,
 .preset-icon .icon.tag-power {


@@ -1480,92 +1620,6 @@ path.fill.tag-amenity-shelter {
     border-color: rgb(224, 110, 95);
     background-color: rgba(224, 110, 95, 0.3);
 }
     border-color: rgb(224, 110, 95);
     background-color: rgba(224, 110, 95, 0.3);
 }

-
-
-/* Labels / Markers */
-
-text {
-    font-size:10px;
-    pointer-events: none;
-    color: #222;
-    opacity: 1;
-}
-
-.oneway .textpath.tag-waterway {
-    fill: #002F35;
-}
-
-path.oneway {
-    stroke-width: 6px;
-}
-
-
-text.arealabel-halo,
-text.linelabel-halo,
-text.pointlabel-halo,
-text.arealabel,
-text.linelabel,
-text.pointlabel {
-    dominant-baseline: middle;
-    text-anchor: middle;
-    font-size: 12px;
-    font-weight: bold;
-    fill: #333;
-    pointer-events: none;
-    -webkit-transition: opacity 100ms linear;
-    transition: opacity 100ms linear;
-    -moz-transition: opacity 100ms linear;
-}
-
-/* Opera doesn't support dominant-baseline. See #715 */
-/* Safari 10 seems to have regressed too */
-.linelabel-halo .textpath,
-.linelabel .textpath {
-  baseline-shift: -33%;
-  dominant-baseline: auto;
-}
-
-.layer-halo text {
-    opacity: 0.7;
-    stroke: #fff;
-    stroke-width: 5px;
-    stroke-miterlimit: 1;
-}
-
-text.proximate {
-    opacity: 0;
-}
-
-text.point {
-    font-size: 10px;
-}
-
-.icon.areaicon-halo {
-    opacity: 0.6;
-    stroke: #999;
-    stroke-width: 2px;
-    stroke-miterlimit: 1;
-}
-
-.icon.areaicon {
-    fill: #222;
-    opacity: 0.8;
-}
-
-
-/* Turns */
-
-g.turn rect,
-g.turn circle {
-    fill: none;
-    pointer-events: all;
-}
-
-.form-field-restrictions .vertex {
-    pointer-events: none;
-    cursor: auto !important;
-}
-

 /* Cursors */
 
 .map-in-map,
 /* Cursors */
 
 .map-in-map,


@@ -1672,26 +1726,6 @@ g.turn circle {
     cursor: pointer; /* Opera */
     cursor: url(<%= asset_path("iD/img/cursor-pointer.png") %>) 6 1, pointer; /* FF */
 }
     cursor: pointer; /* Opera */
     cursor: url(<%= asset_path("iD/img/cursor-pointer.png") %>) 6 1, pointer; /* FF */
 }

-
-.lasso #map {
-    pointer-events: visibleStroke;
-}
-
-/* GPX Paths */
-.layer-gpx {
-    pointer-events: none;
-}
-
-path.gpx {
-    stroke: #FF26D4;
-    stroke-width: 2;
-    fill: none;
-}
-
-text.gpx {
-    fill: #FF26D4;
-}
-

 /* Mapillary Image Layer */
 
 .layer-mapillary-images {
 /* Mapillary Image Layer */
 
 .layer-mapillary-images {


@@ -1769,67 +1803,67 @@ text.gpx {
 .layer-mapillary-signs .icon-sign.selected .t {
     z-index: 80;
 }
 .layer-mapillary-signs .icon-sign.selected .t {
     z-index: 80;
 }

-
-/* Modes */
-
-.mode-draw-line .vertex.active,
-.mode-draw-area .vertex.active,
-.mode-drag-node .vertex.active {
-    display: none;
-}
-
-.mode-draw-line .way.active,
-.mode-draw-area .way.active,
-.mode-drag-node .active {
-    pointer-events: none;
-}
-
-/* Ensure drawing doesn't interact with area fills. */
-.mode-add-point .area.fill,
-.mode-draw-line .area.fill,
-.mode-draw-area .area.fill,
-.mode-add-line .area.fill,
-.mode-add-area .area.fill,
-.mode-drag-node .area.fill {
-    pointer-events: none;
-}
-
-

 /* Fill Styles */
 /* Fill Styles */

+

 .low-zoom.fill-wireframe path.stroke,
 .fill-wireframe path.stroke {
 .low-zoom.fill-wireframe path.stroke,
 .fill-wireframe path.stroke {

-    stroke-width: 1;
-    stroke-opacity: 0.5;
-    stroke-dasharray: none;
-    fill: none;
+    stroke-width: 1 !important;
+    stroke-opacity: 0.5 !important;
+    stroke-dasharray: none !important;
+    fill: none !important;

 }
 
 .low-zoom.fill-wireframe path.shadow,
 .fill-wireframe path.shadow {
 }
 
 .low-zoom.fill-wireframe path.shadow,
 .fill-wireframe path.shadow {

-    stroke-width: 8;
+    stroke-width: 8 !important;

 }
 
 .fill-wireframe path.shadow.related:not(.selected),
 .fill-wireframe path.shadow.hover:not(.selected) {
 }
 
 .fill-wireframe path.shadow.related:not(.selected),
 .fill-wireframe path.shadow.hover:not(.selected) {

-    stroke-opacity: 0.4;
+    stroke-opacity: 0.4 !important;

 }
 .fill-wireframe path.shadow.selected {
 }
 .fill-wireframe path.shadow.selected {

-    stroke-opacity: 0.6;
+    stroke-opacity: 0.6 !important;

 }
 
 .fill-wireframe .point,
 .fill-wireframe .areaicon,
 }
 
 .fill-wireframe .point,
 .fill-wireframe .areaicon,

+.fill-wireframe .areaicon-halo,

 .fill-wireframe path.casing,
 .fill-wireframe path.fill,
 .fill-wireframe path.oneway {
 .fill-wireframe path.casing,
 .fill-wireframe path.fill,
 .fill-wireframe path.oneway {

-    display: none;
+    display: none !important;

 }
 
 }
 

-.fill-partial path.fill {
+.fill-partial path.area.fill {

     fill-opacity: 0;
     stroke-width: 60px;
     pointer-events: visibleStroke;
 }
     fill-opacity: 0;
     stroke-width: 60px;
     pointer-events: visibleStroke;
 }

+
+/* Modes */
+
+.mode-draw-line .vertex.active,
+.mode-draw-area .vertex.active,
+.mode-drag-node .vertex.active {
+    display: none;
+}
+
+.mode-draw-line .way.active,
+.mode-draw-area .way.active,
+.mode-drag-node .active {
+    pointer-events: none;
+}
+
+/* Ensure drawing doesn't interact with area fills. */
+.mode-add-point path.area.fill,
+.mode-draw-line path.area.fill,
+.mode-draw-area path.area.fill,
+.mode-add-line path.area.fill,
+.mode-add-area path.area.fill,
+.mode-drag-node path.area.fill {
+    pointer-events: none;
+}

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