X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/db78390ef34c5bca78a6edc3ca58143a845d32f3..e5c4822d2cbae7ebd6efa9c10c2f09a63750aa61:/vendor/assets/iD/iD.css.erb?ds=sidebyside diff --git a/vendor/assets/iD/iD.css.erb b/vendor/assets/iD/iD.css.erb index 25103657d..3a6602e30 100644 --- a/vendor/assets/iD/iD.css.erb +++ b/vendor/assets/iD/iD.css.erb @@ -187,8 +187,14 @@ img.tile-removing { use { pointer-events: none; } /* base styles */ -.layer path { fill: none; } -.layer use path { fill: #333; } /* FF svg icons */ +.layer path:not(.oneway) { fill: none; } /* IE needs :not(.oneway) */ + +/* the above fill: none rule affects paths in shadow dom only in Firefox */ +.layer use.icon path { fill: #333; } /* FF svg Maki icons */ +.layer .turn use path { fill: #000; } /* FF turn restriction icons */ +#turn-only-shape2, #turn-only-u-shape2 { fill: #7092FF; } /* FF turn-only, turn-only-u */ +#turn-no-shape2, #turn-no-u-shape2 { fill: #E06D5F; } /* FF turn-no, turn-no-u */ +#turn-yes-shape2, #turn-yes-u-shape2 { fill: #8CD05F; } /* FF turn-yes, turn-yes-u */ g.point .shadow, g.vertex .shadow, @@ -509,10 +515,10 @@ path.fill.tag-landuse-landfill { .pattern-color-construction { fill: rgba(196, 189, 25, 0.2); } -path.stroke.tag-landuse.tag-ephemeral { +path.stroke.tag-landuse.tag-status { stroke: rgb(196, 189, 25); } -.preset-icon-fill-area.tag-landuse.tag-ephemeral { +.preset-icon-fill-area.tag-landuse.tag-status { border-color: rgb(196, 189, 25); background-color: rgba(196, 189, 25, 0.2); } @@ -611,10 +617,6 @@ path.fill.tag-amenity-parking { background-color: rgba(170, 170, 170, 0.3); } -path.fill.tag-place, -path.fill.tag-boundary { - fill: none; -} /* highway areas */ @@ -965,8 +967,14 @@ path.stroke.tag-pedestrian { path.casing.tag-highway-corridor, path.casing.tag-highway-pedestrian, path.casing.tag-corridor, -path.casing.tag-pedestrian { - stroke:#8cd05f; +path.casing.tag-pedestrian, +path.casing.tag-highway-corridor.tag-unpaved, +path.casing.tag-highway-pedestrian.tag-unpaved, +path.casing.tag-corridor.tag-unpaved, +path.casing.tag-pedestrian.tag-unpaved { + stroke: #8cd05f; + stroke-linecap: round; + stroke-dasharray: none; } .preset-icon .icon.highway-road { @@ -996,19 +1004,16 @@ path.casing.tag-service { } .preset-icon .icon.highway-track { - color: #ccc; - fill: #996600; + color: #eaeaea; + fill: #c5b59f; } path.stroke.tag-highway-track, path.stroke.tag-track { - stroke: #ccc; + stroke: #c5b59f; } path.casing.tag-highway-track, path.casing.tag-track { - stroke: #996600; - stroke-linecap: butt; - stroke-dasharray: 6, 6; - stroke-width:7; + stroke: #746f6f; } path.stroke.tag-highway-path, @@ -1019,13 +1024,21 @@ path.stroke.tag-highway-bridleway { stroke-dasharray: 6, 6; } -path.casing.tag-highway-path{ +path.casing.tag-highway-path, +path.casing.tag-highway-path.tag-unpaved { stroke: #c5b59f; + stroke-linecap: round; + stroke-dasharray: none; } path.casing.tag-highway-footway, path.casing.tag-highway-cycleway, -path.casing.tag-highway-bridleway { +path.casing.tag-highway-bridleway, +path.casing.tag-highway-footway.tag-unpaved, +path.casing.tag-highway-cycleway.tag-unpaved, +path.casing.tag-highway-bridleway.tag-unpaved { stroke: #fff; + stroke-linecap: round; + stroke-dasharray: none; } .preset-icon .icon.category-path, @@ -1073,12 +1086,15 @@ path.stroke.tag-highway-steps { stroke-linecap: butt; stroke-dasharray: 3, 3; } -path.casing.tag-highway-steps { +path.casing.tag-highway-steps, +path.casing.tag-highway-steps.tag-unpaved { stroke: #fff; + stroke-linecap: round; + stroke-dasharray: none; } -/* aeroways */ +/* aeroways */ path.stroke.tag-aeroway-taxiway { stroke: #805C80; stroke-width: 4; @@ -1171,6 +1187,7 @@ path.casing.tag-railway-platform { stroke: none; } + /* waterways */ .preset-icon .icon.tag-waterway.other-line { color: #77d3de; @@ -1215,6 +1232,18 @@ path.casing.tag-waterway-ditch { stroke: #6591ff; stroke-width: 3; } +path.area.stroke.tag-waterway-fuel { + stroke: white; + stroke-width: 1; +} +path.area.casing.tag-waterway-fuel { + stroke: none; +} +path.area.fill.tag-waterway-fuel { + stroke: rgba(255, 255, 255, 0.3); + fill: rgba(255, 255, 255, 0.3); +} + /* power */ .preset-icon .icon.tag-man_made-pipeline, @@ -1231,8 +1260,8 @@ path.casing.tag-power { stroke: none; } -/* boundary */ +/* boundaries */ path.stroke.tag-boundary { stroke: #fff; stroke-width: 2; @@ -1249,8 +1278,8 @@ path.casing.tag-boundary-national_park { stroke: #b0e298; } -/* barriers */ +/* barriers */ path.stroke.tag-barrier { stroke: #ddd; stroke-width: 3px; @@ -1263,19 +1292,19 @@ path.stroke.tag-barrier { stroke-dasharray: 8, 2, 2, 2; } -/* bridges */ +/* bridges */ path.casing.tag-bridge { stroke-width: 16; stroke-opacity: 0.6; stroke: #000; stroke-linecap: butt; + stroke-dasharray: none; } path.shadow.tag-bridge { stroke-width: 22; } - path.casing.line.tag-railway.tag-bridge, path.casing.tag-highway-living_street.tag-bridge, path.casing.tag-highway-path.tag-bridge, @@ -1289,7 +1318,6 @@ path.casing.tag-highway-cycleway.tag-bridge, path.casing.tag-highway-bridleway.tag-bridge { stroke-width: 10; } - path.shadow.line.tag-railway.tag-bridge, path.shadow.tag-highway-living_street.tag-bridge, path.shadow.tag-highway-path.tag-bridge, @@ -1303,15 +1331,9 @@ path.shadow.tag-highway-cycleway.tag-bridge, path.shadow.tag-highway-bridleway.tag-bridge { stroke-width: 17; } - - .low-zoom path.casing.tag-bridge { stroke-width: 10; - stroke-opacity: 0.6; - stroke: #000; - stroke-linecap: butt; } - .low-zoom path.shadow.tag-bridge { stroke-width: 14; } @@ -1344,18 +1366,19 @@ path.shadow.tag-highway-bridleway.tag-bridge { stroke-width: 13; } -/* tunnels */ +/* tunnels */ path.stroke.tag-tunnel { stroke-opacity: 0.3; } - path.casing.tag-tunnel { stroke-opacity: 0.5; + stroke-linecap: butt; + stroke-dasharray: none; } -/* embankments / cuttings */ +/* embankments / cuttings */ path.casing.tag-embankment, path.casing.tag-cutting { stroke-opacity: 0.5; @@ -1381,42 +1404,38 @@ path.shadow.tag-cutting { } -/* Ephemeral */ - -path.stroke.tag-ephemeral, -path.casing.tag-ephemeral { +/* Surface - unpaved */ +path.casing.tag-unpaved { + stroke: #eaeaea; stroke-linecap: butt; - stroke-dasharray: 7, 3; + stroke-dasharray: 4, 3; } - -.low-zoom path.stroke.tag-ephemeral, -.low-zoom path.casing.tag-ephemeral { - stroke-linecap: butt; - stroke-dasharray: 5, 2; +.low-zoom path.casing.tag-unpaved { + stroke-dasharray: 3, 2; } - -text { - font-size:10px; - pointer-events: none; - color: #222; - opacity: 1; +path.casing.tag-bridge.tag-unpaved { + stroke: #000; + stroke-dasharray: 4, 3; } - -.oneway .textpath.tag-waterway { - fill: #002F35; +.low-zoom path.casing.tag-bridge.tag-unpaved { + stroke: #000; + stroke-dasharray: 3, 2; } -marker#oneway-marker path { - fill:#000; - opacity: .5; -} -path.oneway { - stroke-width: 6px; +/* Status (e.g. construction, proposed, abandoned) */ +path.stroke.tag-status, +path.casing.tag-status { + stroke-linecap: butt; + stroke-dasharray: 7, 3; +} +.low-zoom path.stroke.tag-status, +.low-zoom path.casing.tag-status { + stroke-dasharray: 5, 2; } -/* Buildings */ +/* Buildings */ path.stroke.tag-building, path.stroke.tag-amenity-shelter { stroke: rgb(224, 110, 95); @@ -1433,9 +1452,23 @@ path.fill.tag-amenity-shelter { } -/* - * Labels - */ +/* 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, @@ -1703,7 +1736,7 @@ text.gpx { } .fill-wireframe .point, -.fill-wireframe .icon, +.fill-wireframe .areaicon, .fill-wireframe path.casing, .fill-wireframe path.fill, .fill-wireframe path.oneway { @@ -1923,6 +1956,10 @@ table.tags, table.tags td, table.tags th { padding: 4px; } +::-ms-clear { + display: none; +} + /* Grid ------------------------------------------------------- */ @@ -2749,6 +2786,7 @@ button.save.has-count .count::before { min-height: 30px; border-top: 0; border-radius: 0 0 4px 4px; + overflow: hidden; } .form-field textarea {