X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/673b58f96f3acfd0281c62a2a7f080825b6fb28b..315df40f19cab71bf2d0b393cb84ba7a64afaef0:/vendor/assets/iD/iD.css.erb diff --git a/vendor/assets/iD/iD.css.erb b/vendor/assets/iD/iD.css.erb index 75ea2d0ac..05d0cbe16 100644 --- a/vendor/assets/iD/iD.css.erb +++ b/vendor/assets/iD/iD.css.erb @@ -189,6 +189,11 @@ input::-moz-focus-inner { pointer-events: none; } +.lasso #map { + pointer-events: visibleStroke; +} + + /* `.target` objects are interactive */ /* They can be picked up, clicked, hovered, or things can connect to them */ .node.target { @@ -223,7 +228,21 @@ input::-moz-focus-inner { } -/* points */ +/* points & notes */ + +g.note .stroke { + stroke: #222; + stroke-width: 1; + fill: #222; + opacity: 0.6; +} + +g.note.active .stroke { + stroke: #222; + stroke-width: 1; + fill: #222; + opacity: 0.8; +} g.point .stroke { stroke: #444; @@ -231,26 +250,31 @@ g.point .stroke { fill: #fff; } -g.point .shadow { +g.point .shadow, +g.note .shadow { fill: none; stroke: #f6634f; stroke-width: 16; stroke-opacity: 0; } +g.note.related:not(.selected) .shadow, +g.note.hover:not(.selected) .shadow, g.point.related:not(.selected) .shadow, g.point.hover:not(.selected) .shadow { stroke-opacity: 0.5; } +g.note.selected .shadow, g.point.selected .shadow { stroke-opacity: 0.7; } +/* g.note ellipse.stroke, */ g.point ellipse.stroke { display: none; } - +.mode-drag-note g.note.active ellipse.stroke, .mode-drag-node g.point.active ellipse.stroke { display: block; } @@ -300,7 +324,7 @@ g.vertex.selected .shadow { /* lines */ -.preset-icon .icon.other-line { +.preset-icon .icon.iD-other-line { color: #fff; fill: #777; } @@ -405,7 +429,7 @@ text.point { } -/* Turns */ +/* Turn Restrictions */ g.turn rect, g.turn circle { @@ -418,10 +442,34 @@ g.turn circle { pointer-events: none; } -.lasso #map { - pointer-events: visibleStroke; +/* Turn restriction paths and vertices */ +.surface.tr .way.target, +.surface.tr path.shadow.selected, +.surface.tr path.shadow.related { + stroke-width: 25px; +} + +.surface.tr path.shadow.selected, +.surface.tr path.shadow.related, +.surface.tr g.vertex.selected .shadow, +.surface.tr g.vertex.related .shadow { + stroke-opacity: 0.7; + stroke: #777; +} +.surface.tr path.shadow.related.allow, +.surface.tr g.vertex.related.allow .shadow { + stroke: #5b3; +} +.surface.tr path.shadow.related.restrict, +.surface.tr g.vertex.related.restrict .shadow { + stroke: #d53; +} +.surface.tr path.shadow.related.only, +.surface.tr g.vertex.related.only .shadow { + stroke: #68f; } + /* GPX Paths */ .layer-gpx { @@ -452,6 +500,35 @@ text.gpxlabel-halo { stroke-miterlimit: 1; } +/* MVT Paths */ + +.layer-mvt { + pointer-events: none; +} + +path.mvt { + stroke: #ff26d4; + stroke-width: 2; + fill: none; +} + +text.mvtlabel-halo, +text.mvtlabel { + font-size: 10px; + font-weight: bold; + dominant-baseline: middle; +} + +text.mvtlabel { + fill: #ff26d4; +} + +text.mvtlabel-halo { + opacity: 0.7; + stroke: #000; + stroke-width: 5px; + stroke-miterlimit: 1; +} /* Default - light gray */ path.area.stroke { @@ -773,190 +850,190 @@ path.stroke.tag-highway { stroke-width: 5; } -.preset-icon .icon.highway-motorway, -.preset-icon .icon.highway-motorway-link { +.preset-icon .icon.iD-highway-motorway, +.preset-icon .icon.iD-highway-motorway-link { color: #CF2081; fill: #70372f; } path.stroke.tag-highway-motorway, path.stroke.tag-highway-motorway_link, path.stroke.tag-motorway { - stroke:#CF2081; + stroke: #CF2081; } path.casing.tag-highway-motorway, path.casing.tag-highway-motorway_link, path.casing.tag-motorway { - stroke:#70372f; + stroke: #70372f; } -.preset-icon .icon.highway-trunk, -.preset-icon .icon.highway-trunk-link { +.preset-icon .icon.iD-highway-trunk, +.preset-icon .icon.iD-highway-trunk-link { color: #DD2F22; fill: #70372f; } path.stroke.tag-highway-trunk, path.stroke.tag-highway-trunk_link, path.stroke.tag-trunk { - stroke:#DD2F22; + stroke: #DD2F22; } path.casing.tag-highway-trunk, path.casing.tag-highway-trunk_link, path.casing.tag-trunk { - stroke:#70372f; + stroke: #70372f; } -.preset-icon .icon.highway-primary, -.preset-icon .icon.highway-primary-link { +.preset-icon .icon.iD-highway-primary, +.preset-icon .icon.iD-highway-primary-link { color: #F99806; fill: #70372f; } path.stroke.tag-highway-primary, path.stroke.tag-highway-primary_link, path.stroke.tag-primary { - stroke:#F99806; + stroke: #F99806; } path.casing.tag-highway-primary, path.casing.tag-highway-primary_link, path.casing.tag-primary { - stroke:#70372f; + stroke: #70372f; } -.preset-icon .icon.highway-secondary, -.preset-icon .icon.highway-secondary-link { +.preset-icon .icon.iD-highway-secondary, +.preset-icon .icon.iD-highway-secondary-link { color: #F3F312; fill: #70372f; } path.stroke.tag-highway-secondary, path.stroke.tag-highway-secondary_link, path.stroke.tag-secondary { - stroke:#F3F312; + stroke: #F3F312; } path.casing.tag-highway-secondary, path.casing.tag-highway-secondary_link, path.casing.tag-secondary { - stroke:#70372f; + stroke: #70372f; } -.preset-icon .icon.highway-tertiary, -.preset-icon .icon.highway-tertiary-link { +.preset-icon .icon.iD-highway-tertiary, +.preset-icon .icon.iD-highway-tertiary-link { color: #FFF9B3; fill: #70372f; } path.stroke.tag-highway-tertiary, path.stroke.tag-highway-tertiary_link, path.stroke.tag-tertiary { - stroke:#FFF9B3; + stroke: #FFF9B3; } path.casing.tag-highway-tertiary, path.casing.tag-highway-tertiary_link, path.casing.tag-tertiary { - stroke:#70372f; + stroke: #70372f; } -.legacy-carto .preset-icon .icon.highway-motorway, -.legacy-carto .preset-icon .icon.highway-motorway-link { +.legacy-carto .preset-icon .icon.iD-highway-motorway, +.legacy-carto .preset-icon .icon.iD-highway-motorway-link { color: #58a9ed; fill: #2c5476; } .legacy-carto path.stroke.tag-highway-motorway, .legacy-carto path.stroke.tag-highway-motorway_link, .legacy-carto path.stroke.tag-motorway { - stroke:#58a9ed; + stroke: #58a9ed; } .legacy-carto path.casing.tag-highway-motorway, .legacy-carto path.casing.tag-highway-motorway_link, .legacy-carto path.casing.tag-motorway { - stroke:#2c5476; + stroke: #2c5476; } -.legacy-carto .preset-icon .icon.highway-trunk, -.legacy-carto .preset-icon .icon.highway-trunk-link { +.legacy-carto .preset-icon .icon.iD-highway-trunk, +.legacy-carto .preset-icon .icon.iD-highway-trunk-link { color: #8cd05f; fill: #46682f; } .legacy-carto path.stroke.tag-highway-trunk, .legacy-carto path.stroke.tag-highway-trunk_link, .legacy-carto path.stroke.tag-trunk { - stroke:#8cd05f; + stroke: #8cd05f; } .legacy-carto path.casing.tag-highway-trunk, .legacy-carto path.casing.tag-highway-trunk_link, .legacy-carto path.casing.tag-trunk { - stroke:#46682f; + stroke: #46682f; } -.legacy-carto .preset-icon .icon.highway-primary, -.legacy-carto .preset-icon .icon.highway-primary-link { +.legacy-carto .preset-icon .icon.iD-highway-primary, +.legacy-carto .preset-icon .icon.iD-highway-primary-link { color: #e06d5f; fill: #70372f; } .legacy-carto path.stroke.tag-highway-primary, .legacy-carto path.stroke.tag-highway-primary_link, .legacy-carto path.stroke.tag-primary { - stroke:#e06d5f; + stroke: #e06d5f; } .legacy-carto path.casing.tag-highway-primary, .legacy-carto path.casing.tag-highway-primary_link, .legacy-carto path.casing.tag-primary { - stroke:#70372f; + stroke: #70372f; } -.legacy-carto .preset-icon .icon.highway-secondary, -.legacy-carto .preset-icon .icon.highway-secondary-link { +.legacy-carto .preset-icon .icon.iD-highway-secondary, +.legacy-carto .preset-icon .icon.iD-highway-secondary-link { color: #eab056; fill: #75582b; } .legacy-carto path.stroke.tag-highway-secondary, .legacy-carto path.stroke.tag-highway-secondary_link, .legacy-carto path.stroke.tag-secondary { - stroke:#eab056; + stroke: #eab056; } .legacy-carto path.casing.tag-highway-secondary, .legacy-carto path.casing.tag-highway-secondary_link, .legacy-carto path.casing.tag-secondary { - stroke:#75582b; + stroke: #75582b; } -.legacy-carto .preset-icon .icon.highway-tertiary, -.legacy-carto .preset-icon .icon.highway-tertiary-link { +.legacy-carto .preset-icon .icon.iD-highway-tertiary, +.legacy-carto .preset-icon .icon.iD-highway-tertiary-link { color: #ffff7e; fill: #7f7f3f; } .legacy-carto path.stroke.tag-highway-tertiary, .legacy-carto path.stroke.tag-highway-tertiary_link, .legacy-carto path.stroke.tag-tertiary { - stroke:#ffff7e; + stroke: #ffff7e; } .legacy-carto path.casing.tag-highway-tertiary, .legacy-carto path.casing.tag-highway-tertiary_link, .legacy-carto path.casing.tag-tertiary { - stroke:#7f7f3f; + stroke: #7f7f3f; } -.preset-icon .icon.highway-residential { +.preset-icon .icon.iD-highway-residential { color: #fff; fill: #444; } path.stroke.tag-highway-residential, path.stroke.tag-residential { - stroke:#fff; + stroke: #fff; } path.casing.tag-highway-residential, path.casing.tag-residential { - stroke:#444; + stroke: #444; } -.preset-icon .icon.highway-unclassified { - color: #dcd9b9; +.preset-icon .icon.iD-highway-unclassified { + color: #dca; fill: #444; } path.stroke.tag-highway-unclassified, path.stroke.tag-unclassified { - stroke:#dcd9b9; + stroke: #dca; } path.casing.tag-highway-unclassified, path.casing.tag-unclassified { - stroke:#444; + stroke: #444; } @@ -1129,7 +1206,7 @@ path.stroke.tag-steps { } -.preset-icon .icon.highway-living-street { +.preset-icon .icon.iD-highway-living-street { color: #bbb; fill: #ddd; } @@ -1142,8 +1219,8 @@ path.casing.tag-living_street { stroke: #fff; } -.preset-icon .icon.highway-footway.tag-highway-corridor, -.preset-icon .icon.highway-footway.tag-highway-pedestrian { +.preset-icon .icon.iD-highway-footway.tag-highway-corridor, +.preset-icon .icon.iD-highway-footway.tag-highway-pedestrian { color: #8cd05f; fill: #fff; } @@ -1151,7 +1228,7 @@ path.stroke.tag-highway-corridor, path.stroke.tag-highway-pedestrian, path.stroke.tag-corridor, path.stroke.tag-pedestrian { - stroke:#fff; + stroke: #fff; stroke-dasharray: 2, 8; } .low-zoom path.stroke.tag-highway-corridor, @@ -1173,43 +1250,43 @@ path.casing.tag-pedestrian.tag-unpaved { stroke-dasharray: none; } -.preset-icon .icon.highway-road { +.preset-icon .icon.iD-highway-road { color: #9e9e9e; fill: #666; } path.stroke.tag-highway-road, path.stroke.tag-road { - stroke:#9e9e9e; + stroke: #9e9e9e; } path.casing.tag-highway-road, path.casing.tag-road { - stroke:#666; + stroke: #666; } -.preset-icon .icon.highway-service { +.preset-icon .icon.iD-highway-service { color: #fff; fill: #666; } path.stroke.tag-highway-service, path.stroke.tag-service { - stroke:#fff; + stroke: #fff; } path.casing.tag-highway-service, path.casing.tag-service { - stroke:#666; + stroke: #666; } /* special service roads and bus guideways */ /* with `service=* tag` (e.g. parking_aisle, alley, drive-through */ -.preset-icon .icon.highway-bus_guideway, -.preset-icon .icon.highway-service.tag-service { - color: #dcd9b9; +.preset-icon .icon.iD-highway-bus_guideway, +.preset-icon .icon.iD-highway-service.tag-service { + color: #dca; fill: #666; } path.stroke.tag-highway-bus_guideway, path.stroke.tag-highway-service.tag-service, path.stroke.tag-service.tag-service { - stroke: #dcd9b9; + stroke: #dca; } path.casing.tag-highway-bus_guideway, path.casing.tag-highway-service.tag-service, @@ -1217,7 +1294,7 @@ path.casing.tag-service.tag-service { stroke: #666; } -.preset-icon .icon.highway-track { +.preset-icon .icon.iD-highway-track { color: #eaeaea; fill: #c5b59f; } @@ -1247,7 +1324,7 @@ path.stroke.tag-highway-bridleway { path.casing.tag-highway-path, path.casing.tag-highway-path.tag-unpaved { - stroke: #c5b59f; + stroke: #dca; stroke-linecap: round; stroke-dasharray: none; } @@ -1262,38 +1339,28 @@ path.casing.tag-highway-bridleway.tag-unpaved { stroke-dasharray: none; } -.preset-icon .icon.category-path, -.preset-icon .icon.highway-path { - color: #746f6f; - fill: #c5b59f; +.preset-icon .icon.iD-category-path, +.preset-icon .icon.iD-highway-path { + color: #988; + fill: #dca; } path.stroke.tag-highway-path { - stroke: #746f6f; + stroke: #988; } .preset-icon .icon.tag-route-foot, .preset-icon .icon.tag-route-hiking, -.preset-icon .icon.highway-footway { - color: #ae8681; +.preset-icon .icon.iD-highway-footway { + color: #988; fill: #fff; } path.stroke.tag-highway-footway { - stroke: #ae8681; + stroke: #988; } -.preset-icon .icon.highway-footway.tag-crossing { - color: #444; -} -path.stroke.tag-highway-footway.tag-crossing { - stroke: #444; - stroke-dasharray: 6, 4; -} -.low-zoom path.stroke.tag-highway-footway.tag-crossing { - stroke-dasharray: 3, 2; -} .preset-icon .icon.tag-route-bicycle, -.preset-icon .icon.highway-cycleway { +.preset-icon .icon.iD-highway-cycleway { color: #58a9ed; fill: #fff; } @@ -1302,7 +1369,7 @@ path.stroke.tag-highway-cycleway { } .preset-icon .icon.tag-route-horse, -.preset-icon .icon.highway-bridleway { +.preset-icon .icon.iD-highway-bridleway { color: #e06d5f; fill: #fff; } @@ -1310,7 +1377,7 @@ path.stroke.tag-highway-bridleway { stroke: #e06d5f; } -.preset-icon .icon.highway-steps { +.preset-icon .icon.iD-highway-steps { color: #81d25c; fill: #fff; } @@ -1330,7 +1397,6 @@ path.casing.tag-highway-steps.tag-unpaved { } /* highway midpoints */ - g.midpoint.tag-highway-corridor .fill, g.midpoint.tag-highway-pedestrian .fill, g.midpoint.tag-highway-steps .fill, @@ -1354,7 +1420,6 @@ path.stroke.area.tag-aeroway, } /* narrow aeroways (taxiway) */ - path.shadow.tag-aeroway-taxiway, path.shadow.tag-taxiway { stroke-width: 16; @@ -1397,7 +1462,6 @@ path.casing.tag-taxiway { /* wide aeroways (runway) */ - .preset-icon .icon.tag-aeroway-runway, .preset-icon .icon.tag-runway { color: #444; @@ -1435,7 +1499,6 @@ path.fill.tag-aeroway-runway { } /* railways */ - .preset-icon .icon.tag-railway.other-line { color: #fff; fill: #777; @@ -1446,7 +1509,6 @@ path.fill.tag-aeroway-runway { } /* railway areas */ - path.stroke.area.tag-railway, .low-zoom path.stroke.area.tag-railway { stroke: white; @@ -1460,7 +1522,6 @@ path.casing.area.tag-railway, } /* narrow widths */ - path.shadow.tag-railway { stroke-width: 16; } @@ -1486,7 +1547,6 @@ path.stroke.tag-railway { /* styles */ - path.casing.tag-railway { stroke: #555; } @@ -1500,9 +1560,11 @@ path.stroke.tag-railway { color: #999; fill: #eee; } +path.casing.tag-railway-disused, path.casing.tag-railway-abandoned { stroke: #999; } +path.stroke.tag-railway-disused, path.stroke.tag-railway-abandoned { stroke: #eee; } @@ -1518,55 +1580,12 @@ path.casing.tag-railway-subway { path.stroke.tag-railway-subway { stroke: #bbb; } - - -/* railway platforms - like sidewalks */ - -.preset-icon .icon.highway-footway.tag-railway-platform { - color: #ae8681; - fill: #dcd9b9; -} -path.shadow.tag-railway-platform { - stroke-width: 16; -} -path.casing.tag-railway-platform { - stroke: #dcd9b9; - stroke-width: 5; - stroke-linecap: round; - stroke-dasharray: none; -} -path.stroke.tag-railway-platform { - stroke: #ae8681; - stroke-width: 3; - stroke-linecap: butt; - stroke-dasharray: 6, 6; -} - -.low-zoom path.shadow.tag-railway-platform { - stroke-width: 12; -} -.low-zoom path.casing.tag-railway-platform { - stroke-width: 3; -} -.low-zoom path.stroke.tag-railway-platform { - stroke-width: 1; - stroke-linecap: butt; - stroke-dasharray: 3, 3; -} - -g.midpoint.tag-railway-platform .fill { - fill: #fff; - stroke: #333; - stroke-opacity: .8; - opacity: .8; -} /* waterways */ - .preset-icon .icon.tag-waterway.other-line { color: #77d3de; fill: #77d3de; } -.preset-icon .icon.category-water, +.preset-icon .icon.iD-category-water, .preset-icon .icon.tag-route-ferry, .preset-icon .icon.tag-type-waterway, .preset-icon .icon.tag-waterway { @@ -1587,7 +1606,6 @@ path.stroke.tag-waterway { /* narrow waterways (default) */ - path.shadow.tag-waterway { stroke-width: 16; } @@ -1610,7 +1628,6 @@ path.stroke.tag-waterway { /* wide waterways (river) */ - path.shadow.tag-waterway-river { stroke-width: 20; } @@ -1633,7 +1650,6 @@ path.stroke.tag-waterway-river { /* ditch */ - .preset-icon .icon.tag-waterway-ditch { color: #8eabf3; } @@ -1643,7 +1659,6 @@ path.stroke.tag-waterway-ditch { /* waterway areas */ - path.area.stroke.tag-waterway-dock, path.area.stroke.tag-waterway-boatyard, path.area.stroke.tag-waterway-fuel { @@ -1696,6 +1711,28 @@ path.casing.tag-boundary-national_park { } +/* Tree Rows */ +path.shadow.tag-natural-tree_row { + stroke-width: 16; +} +path.casing.tag-natural-tree_row { + stroke-width: 7; +} +path.stroke.tag-natural-tree_row { + stroke-width: 5; +} + +.low-zoom path.shadow.tag-natural-tree_row { + stroke-width: 12; +} +.low-zoom path.casing.tag-natural-tree_row { + stroke-width: 5; +} +.low-zoom path.stroke.tag-natural-tree_row { + stroke-width: 3; +} + + /* barriers */ path.stroke.tag-barrier { stroke: #ddd; @@ -1713,7 +1750,7 @@ path.stroke.tag-barrier { /* bridges */ path.casing.tag-bridge { stroke-opacity: 0.6; - stroke: #000; + stroke: #000 !important; stroke-linecap: butt; stroke-dasharray: none; } @@ -1853,20 +1890,121 @@ path.casing.tag-status { /* Buildings */ -path.stroke.tag-building, -path.stroke.tag-amenity-shelter { +path.stroke.tag-building { stroke: rgb(224, 110, 95); } -path.fill.tag-building, -path.fill.tag-amenity-shelter { +path.fill.tag-building { stroke: rgba(224, 110, 95, 0.3); fill: rgba(224, 110, 95, 0.3); } -.preset-icon-fill-area.tag-building, -.preset-icon-fill-area.tag-amenity-shelter { +.preset-icon-fill-area.tag-building { border-color: rgb(224, 110, 95); background-color: rgba(224, 110, 95, 0.3); } + + +/* "Special" paths - platforms, piers, crossings */ +.preset-icon .icon.tag-public_transport-platform, +.preset-icon .icon.tag-railway-platform, +.preset-icon .icon.tag-man_made-pier, +.preset-icon .icon.tag-footway.tag-footway-crossing, +.preset-icon .icon.tag-crossing { + color: #988; + fill: #dca; +} + +.preset-icon-fill-area.tag-public_transport-platform, +.preset-icon-fill-area.tag-railway-platform, +.preset-icon-fill-area.tag-man_made-pier, +.preset-icon-fill-area.tag-footway.tag-footway-crossing, +.preset-icon-fill-area.tag-crossing { + border-color: #988; + background-color: #dca; +} + +path.shadow.tag-public_transport-platform, +path.shadow.tag-railway-platform, +path.shadow.tag-man_made-pier, +path.shadow.tag-footway.tag-footway-crossing, +path.shadow.tag-crossing { + stroke-width: 16; +} +path.casing.tag-public_transport-platform, +path.casing.tag-railway-platform, +path.casing.tag-man_made-pier, +path.casing.tag-footway.tag-footway-crossing, +path.casing.tag-crossing { + stroke: #dca; + stroke-width: 5; + stroke-linecap: round; + stroke-dasharray: none; +} +path.stroke.tag-public_transport-platform, +path.stroke.tag-railway-platform, +path.stroke.tag-man_made-pier, +path.stroke.tag-footway.tag-footway-crossing, +path.stroke.tag-crossing { + stroke: #988; + stroke-width: 3; + stroke-linecap: butt; + stroke-dasharray: 6, 6; +} + +.low-zoom path.shadow.tag-public_transport-platform, +.low-zoom path.shadow.tag-railway-platform, +.low-zoom path.shadow.tag-man_made-pier, +.low-zoom path.shadow.tag-footway.tag-footway-crossing, +.low-zoom path.shadow.tag-crossing { + stroke-width: 12; +} +.low-zoom path.casing.tag-public_transport-platform, +.low-zoom path.casing.tag-railway-platform, +.low-zoom path.casing.tag-man_made-pier, +.low-zoom path.casing.tag-footway.tag-footway-crossing, +.low-zoom path.casing.tag-crossing { + stroke-width: 3; +} +.low-zoom path.stroke.tag-public_transport-platform, +.low-zoom path.stroke.tag-railway-platform, +.low-zoom path.stroke.tag-man_made-pier, +.low-zoom path.stroke.tag-footway.tag-footway-crossing, +.low-zoom path.stroke.tag-crossing { + stroke-width: 1; + stroke-linecap: butt; + stroke-dasharray: 3, 3; +} + +g.midpoint.tag-public_transport-platform .fill, +g.midpoint.tag-railway-platform .fill, +g.midpoint.tag-man_made-pier .fill, +g.midpoint.tag-footway.tag-footway-crossing .fill, +g.midpoint.tag-crossing .fill { + fill: #fff; + stroke: #333; + stroke-opacity: .8; + opacity: .8; +} + +/* marked crossings, zebras */ +.preset-icon .icon.tag-crossing.tag-crossing-marked, +.preset-icon .icon.tag-crossing.tag-crossing-zebra { + color: #444; + fill: #dca; +} +path.casing.tag-crossing.tag-crossing-marked, +path.casing.tag-crossing.tag-crossing-zebra { + stroke: #dca; +} +path.stroke.tag-crossing.tag-crossing-marked, +path.stroke.tag-crossing.tag-crossing-zebra { + stroke: #444; + stroke-dasharray: 6, 4; +} +.low-zoom path.stroke.tag-crossing.tag-crossing-marked, +.low-zoom path.stroke.tag-crossing.tag-crossing-zebra { + stroke-dasharray: 3, 2; +} + /* Cursors */ .nope, @@ -1927,30 +2065,32 @@ path.fill.tag-amenity-shelter { .mode-draw-area #map, .mode-add-line #map, .mode-add-area #map, -.mode-drag-node #map { +.mode-drag-node #map, +.mode-drag-note #map { cursor: crosshair; /* Opera */ cursor: url(<%= asset_path("iD/img/cursor-draw.png") %>) 9 9, crosshair; /* FF */ } -.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 { +.mode-draw-line .way.target, +.mode-draw-area .way.target, +.mode-add-line .way.target, +.mode-add-area .way.target, +.mode-drag-node .way.target { cursor: crosshair; /* Opera */ cursor: url(<%= asset_path("iD/img/cursor-draw-connect-line.png") %>) 9 9, crosshair; /* FF */ } -.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 { +.mode-draw-line .vertex.target, +.mode-draw-area .vertex.target, +.mode-add-line .vertex.target, +.mode-add-area .vertex.target, +.mode-drag-node .vertex.target { cursor: crosshair; /* Opera */ cursor: url(<%= asset_path("iD/img/cursor-draw-connect-vertex.png") %>) 9 9, crosshair; /* FF */ } .mode-add-point #map, +.mode-add-note #map, .mode-browse.lasso #map, .mode-browse.lasso .way, .mode-browse.lasso .vertex, @@ -1977,29 +2117,73 @@ path.fill.tag-amenity-shelter { background-color: #fff; } +@media screen and (min-width: 1600px) { + #photoviewer { + width: 490px; + height: 370px; + } +} + #photoviewer button.thumb-hide { border-radius: 0; padding: 5px; position: absolute; + right: 5px; + top: 5px; + z-index: 50; +} + +#photoviewer button.resize-handle-xy { + border-radius: 0; + position: absolute; + top: 0; right: 0; + z-index: 49; + cursor: nesw-resize; + height: 25px; + width: 25px; +} + +#photoviewer button.resize-handle-x { + border-radius: 0; + position: absolute; top: 0; + right: 0; + bottom: 0; z-index: 48; + cursor: ew-resize; + height: auto; + width: 6px; } +#photoviewer button.resize-handle-y { + border-radius: 0; + position: absolute; + top: 0; + right: 0; + z-index: 48; + cursor: ns-resize; + height: 6px; + width: 100%; +} + + .photo-wrapper, .photo-wrapper img { width: 100%; height: 100%; overflow: hidden; + object-fit: cover; } .photo-wrapper .photo-attribution { - width: 100%; - font-size: 10px; - text-align: right; position: absolute; bottom: 0; right: 0; + width: 100%; + font-size: 10px; + text-align: right; + line-height: 1.1em; padding: 4px 2px; z-index: 10; } @@ -2082,6 +2266,19 @@ path.fill.tag-amenity-shelter { } +/* Streetside Image Layer */ +.layer-streetside-images { + pointer-events: none; +} +.layer-streetside-images .viewfield-group * { + fill: #0fffc4; +} +.layer-streetside-images .sequence { + stroke: #0fffc4; + stroke-opacity: 0.85; /* bump opacity - only one per road */ +} + + /* Mapillary Image Layer */ .layer-mapillary-images { pointer-events: none; @@ -2098,25 +2295,18 @@ path.fill.tag-amenity-shelter { .layer-mapillary-signs { pointer-events: none; } -.layer-mapillary-signs .icon-sign .icon-sign-body { - min-width: 20px; - height: 24px; - width: 24px; +.layer-mapillary-signs .icon-sign { outline: 2px solid transparent; pointer-events: visible; cursor: pointer; - z-index: 30; - overflow: visible; } -.layer-mapillary-signs .icon-sign:hover .icon-sign-body { +.layer-mapillary-signs .icon-sign:hover { outline: 5px solid #eebb00; background-color: #eebb00; - z-index: 70; } -.layer-mapillary-signs .icon-sign.selected .icon-sign-body { +.layer-mapillary-signs .icon-sign.selected { outline: 5px solid #ffee00; background-color: #ffee00; - z-index: 40; } @@ -2125,10 +2315,57 @@ path.fill.tag-amenity-shelter { pointer-events: none; } .layer-openstreetcam-images .viewfield-group * { - fill: #77ddff; + fill: #20c4ff; } .layer-openstreetcam-images .sequence { - stroke: #77ddff; + stroke: #20c4ff; +} + + +/* Streetside Viewer (pannellum) */ +.ms-wrapper .photo-attribution .image-link { + display: block; +} +.ms-wrapper .photo-attribution .attribution-row { + display: flex; + flex-flow: row nowrap; + justify-content: space-between; + align-items: center; + padding: 0 5px; +} +.ms-wrapper .photo-attribution .image-view-link { + text-align: left; + margin: 0 5px; +} +.ms-wrapper .photo-attribution .image-report-link { + text-align: right; +} + +.ms-wrapper .photo-attribution a:active, +.ms-wrapper .photo-attribution a:hover { + color: #0fffc4; +} + +.ms-wrapper .pnlm-compass.pnlm-control { + width: 26px; + height: 26px; + left: 4px; + top: 60px; + background-size: contain; + background-repeat: no-repeat no-repeat; +} + +label.streetside-hires { + cursor: pointer; +} +.streetside-hires span { + margin-top: 2px; +} +.streetside-hires input[type="checkbox"] { + float: left; + width: 12px; + height: 12px; + margin: 0 5px; } @@ -2154,6 +2391,7 @@ path.fill.tag-amenity-shelter { z-index: 9; } + /* OpenStreetCam viewer */ .osc-wrapper { position: relative; @@ -2165,10 +2403,22 @@ path.fill.tag-amenity-shelter { .osc-wrapper .photo-attribution a:active, .osc-wrapper .photo-attribution a:hover { - color: #77ddff; + color: #20c4ff; } -.osc-controls-wrap { +.osc-image-wrap { + width: 100%; + height: 100%; + transform-origin:0 0; + -ms-transform-origin:0 0; + -webkit-transform-origin:0 0; + -moz-transform-origin:0 0; + -o-transform-origin:0 0; +} + + +/* photo-controls (step forward, back, rotate) */ +.photo-controls-wrap { text-align: center; position: absolute; top: 10px; @@ -2176,37 +2426,208 @@ path.fill.tag-amenity-shelter { z-index: 10; } -.osc-controls { +.photo-controls { display: inline-block; z-index: 10; } -.osc-controls button { +.photo-controls button, +.photo-controls button:focus { height: 18px; width: 18px; background: rgba(0,0,0,0.65); color: #eee; border-radius: 0; } -.osc-controls button:first-of-type { +.photo-controls button:first-of-type { border-radius: 3px 0 0 3px; } -.osc-controls button:last-of-type { +.photo-controls button:last-of-type { border-radius: 0 3px 3px 0; } -.osc-controls button:hover, -.osc-controls button:active, -.osc-controls button:focus { +.photo-controls button:hover, +.photo-controls button:active { background: rgba(0,0,0,0.85); color: #fff; } -.osc-image-wrap { - transform-origin:0 0; - -ms-transform-origin:0 0; - -webkit-transform-origin:0 0; - -moz-transform-origin:0 0; - -o-transform-origin:0 0; + +/* OSM Notes Layer */ +.layer-notes { + pointer-events: none; +} +.layer-notes .note * { + pointer-events: none; +} +.layer-notes .note .note-fill { + pointer-events: visible; + cursor: pointer; /* Opera */ + cursor: url(<%= asset_path("iD/img/cursor-select-point.png") %>), pointer; /* FF */ +} + +.note-header-icon .note-shadow, +.layer-notes .note .note-shadow { + color: #000; +} +.note-header-icon .note-fill, +.layer-notes .note .note-fill { + color: #ff3300; + stroke: #333; + stroke-width: 40px; +} +.note-header-icon.new .note-fill, +.layer-notes .note.new .note-fill { + color: #ffee00; + stroke: #333; + stroke-width: 40px; +} +.note-header-icon.closed .note-fill, +.layer-notes .note.closed .note-fill { + color: #55dd00; + stroke: #333; + stroke-width: 40px; +} + +/* slight adjustments to preset icon for note icons */ +.note-header-icon .preset-icon-28 { + top: 18px; +} + +.note-header-icon .note-icon-annotation { + position: absolute; + top: 22px; + left: 22px; + margin: auto; +} + +.note-header-icon .note-icon-annotation .icon { + width: 15px; + height: 15px; +} + + +/* OSM Note UI */ +.note-header { + background-color: #f6f6f6; + border-radius: 5px; + border: 1px solid #ccc; + display: flex; + flex-flow: row nowrap; + align-items: center; +} + +.note-header-icon { + background-color: #fff; + padding: 10px; + flex: 0 0 62px; + position: relative; + width: 60px; + height: 60px; + border-right: 1px solid #ccc; + border-radius: 5px 0 0 5px; +} +[dir='rtl'] .note-header-icon { + border-right: unset; + border-left: 1px solid #ccc; + border-radius: 0 5px 5px 0; +} + +.note-header-icon .icon-wrap { + position: absolute; + top: 0px; +} + +.note-header-label { + background-color: #f6f6f6; + padding: 0 15px; + flex: 1 1 100%; + font-size: 14px; + font-weight: bold; + border-radius: 0 5px 5px 0; +} +[dir='rtl'] .note-header-label { + border-radius: 5px 0 0 5px; +} + +.note-category { + margin: 20px 0px; +} + +.comments-container { + background: #ececec; + padding: 1px 10px; + border-radius: 8px; + margin-top: 20px; +} + +.comment { + background-color: #fff; + border-radius: 5px; + border: 1px solid #ccc; + margin: 10px auto; + display: flex; + flex-flow: row nowrap; +} +.comment-avatar { + padding: 10px; + flex: 0 0 62px; +} +.comment-avatar .icon.comment-avatar-icon { + width: 40px; + height: 40px; + object-fit: cover; + border: 1px solid #ccc; + border-radius: 20px; +} +.comment-main { + padding: 10px 10px 10px 0; + flex: 1 1 100%; + flex-flow: column nowrap; + overflow: hidden; + overflow-wrap: break-word; +} +[dir='rtl'] .comment-main { + padding: 10px 0 10px 10px; +} + +.comment-metadata { + flex-flow: row nowrap; + justify-content: space-between; +} +.comment-author { + font-weight: bold; + color: #333; +} +.comment-date { + color: #aaa; +} +.comment-text { + color: #333; + margin-top: 10px; + overflow-y: auto; + max-height: 250px; +} +.comment-text::-webkit-scrollbar { + border-left: none; +} + +.note-save { + padding: 10px; +} + +.note-save #new-comment-input { + width: 100%; + height: 100px; + max-height: 300px; + min-height: 100px; +} + +.note-save .detail-section { + margin: 10px 0; +} + +.note-report { + float: right; } /* Fill Styles */ @@ -2267,10 +2688,10 @@ body { "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", "Arial", sans-serif; - margin:0; - padding:0; + margin: 0; + padding: 0; min-width: 768px; - color:#333; + color: #333; overflow: hidden; -ms-user-select: none; } @@ -2375,8 +2796,8 @@ div, textarea, label, input, form, span, ul, li, ol, a, button, h1, h2, h3, h4, } a, button, input, textarea { - -webkit-tap-highlight-color:rgba(0,0,0,0); - -webkit-touch-callout:none; + -webkit-tap-highlight-color: rgba(0,0,0,0); + -webkit-touch-callout: none; } a, @@ -2415,10 +2836,21 @@ h4, h5 { outline-style: none; } +::placeholder { /* Chrome, Firefox, Opera, Safari 10.1+ */ + color: #aaa; + opacity: 1; /* Firefox */ +} +:-ms-input-placeholder { /* Internet Explorer 10-11 */ + color: #aaa; +} +::-ms-input-placeholder { /* Microsoft Edge */ + color: #aaa; +} + p { font-size: 12px; - margin:0; - padding:0; + margin: 0; + padding: 0; } p:last-child { @@ -2459,13 +2891,13 @@ input[type=number], input[type=url], input[type=tel], input[type=email] { - background-color: white; + background-color: #fff; color: #333; - border:1px solid #ccc; - padding:5px 20px 5px 10px; - height:30px; + border: 1px solid #ccc; + padding: 5px 20px 5px 10px; + height: 30px; width: 100%; - border-radius:4px; + border-radius: 4px; text-overflow: ellipsis; } [dir='rtl'] textarea, @@ -2475,7 +2907,7 @@ input[type=email] { [dir='rtl'] input[type=url], [dir='rtl'] input[type=tel], [dir='rtl'] input[type=email] { - padding:5px 10px 5px 20px; + padding: 5px 10px 5px 20px; } textarea:focus, @@ -2508,14 +2940,14 @@ input[type="radio"] { /* tables */ table { - background-color: white; + background-color: #fff; border-collapse: collapse; - width:100%; - border-spacing:0; + width: 100%; + border-spacing: 0; } table th { - text-align:left; + text-align: left; } table.tags, table.tags td, table.tags th { @@ -2530,19 +2962,19 @@ table.tags, table.tags td, table.tags th { /* Grid ------------------------------------------------------- */ -.col0 { float:left; width:04.1666%; } -.col1 { float:left; width:08.3333%; } -.col2 { float:left; width:16.6666%; } -.col3 { float:left; width:25.0000%; max-width: 300px; } -.col4 { float:left; width:33.3333%; max-width: 400px; } -.col5 { float:left; width:41.6666%; max-width: 500px; } -.col6 { float:left; width:50.0000%; max-width: 600px; } -.col7 { float:left; width:58.3333%; } -.col8 { float:left; width:66.6666%; } -.col9 { float:left; width:75.0000%; } -.col10 { float:left; width:83.3333%; } -.col11 { float:left; width:91.6666%; } -.col12 { float:left; width:100.0000%; } +.col0 { float: left; width: 04.1666%; } +.col1 { float: left; width: 08.3333%; } +.col2 { float: left; width: 16.6666%; } +.col3 { float: left; width: 25.0000%; max-width: 300px; } +.col4 { float: left; width: 33.3333%; max-width: 400px; } +.col5 { float: left; width: 41.6666%; max-width: 500px; } +.col6 { float: left; width: 50.0000%; max-width: 600px; } +.col7 { float: left; width: 58.3333%; } +.col8 { float: left; width: 66.6666%; } +.col9 { float: left; width: 75.0000%; } +.col10 { float: left; width: 83.3333%; } +.col11 { float: left; width: 91.6666%; } +.col12 { float: left; width: 100.0000%; } /* UI Lists ------------------------------------------------------- */ @@ -2554,7 +2986,7 @@ ul li { list-style: none;} padding: 5px 10px; display: block; height: 30px; - background-color: white; + background-color: #fff; color: #7092ff; cursor: pointer; } @@ -2586,7 +3018,7 @@ ul li { list-style: none;} /* Utility Classes ------------------------------------------------------- */ .fillL { - background: white; + background: #fff; color: #333; } @@ -2601,13 +3033,13 @@ ul li { list-style: none;} } .fillD { - background:rgba(0,0,0,.5); - color: white; + background: rgba(0,0,0,.5); + color: #fff; } .fillD2 { - background:rgba(0,0,0,.75); - color: white; + background: rgba(0,0,0,.75); + color: #fff; } .fl { float: left;} @@ -2634,20 +3066,20 @@ li.hide { .loading { background: url(<%= asset_path("iD/img/loader_bg.gif") %>); - background-size:5px 5px; + background-size: 5px 5px; } .panewrap { - position:absolute; - width:200%; - height:100%; + position: absolute; + width: 200%; + height: 100%; right: -100%; } .pane { - position:absolute; - width:50%; + position: absolute; + width: 50%; top: 0; bottom: 30px; } @@ -2664,15 +3096,15 @@ li.hide { button { text-align: center; - line-height:20px; - border:0; - background: white; + line-height: 20px; + border: 0; + background: #fff; font-weight: bold; - color:#333; - font-size:12px; + color: #333; + font-size: 12px; display: inline-block; - height:40px; - border-radius:4px; + height: 40px; + border-radius: 4px; } button:focus, @@ -2714,7 +3146,7 @@ button.minor:hover { .button-wrap { display: inline-block; - padding-right:10px; + padding-right: 10px; margin: 0; } @@ -2731,7 +3163,7 @@ button.minor:hover { } .joined button { - border-radius:0; + border-radius: 0; border-right: 1px solid rgba(0,0,0,.5); } [dir='rtl'] .joined button { @@ -2740,7 +3172,7 @@ button.minor:hover { } .fillL .joined button { - border-right: 1px solid white; + border-right: 1px solid #fff; } .joined button:first-child { @@ -2760,7 +3192,7 @@ button.minor:hover { button.action { background: #7092ff; - color: white; + color: #fff; } button[disabled].action, @@ -2829,6 +3261,29 @@ button.save.has-count .count::before { right: -6px; } +.help-wrap svg.icon.pre-text.add-note, +button.add-note svg.icon { + height: 15px; + width: 15px; + color: rgba(0,0,0,0.25); + stroke: #333; + stroke-width: 60px; + margin-top: 3px; +} +button.add-note svg.icon { + margin-left: unset; + margin-right: 7px; +} +[dir='rtl'] button.add-note svg.icon { + margin-left: 7px; + margin-right: unset; +} +.help-wrap svg.icon.pre-text.add-note { + margin-left: 3px; + margin-right: 3px; +} + + /* Icons */ .icon { @@ -2848,8 +3303,13 @@ button.save.has-count .count::before { margin-right: 5px; } [dir='rtl'] .icon.pre-text { - margin-left: 5px; - margin-right: 0; + margin-left: 5px; + margin-right: 0; +} + +.icon.pre-text.user-icon { + margin-left: 5px; + margin-right: 5px; } .icon.light { @@ -2908,16 +3368,12 @@ button.save.has-count .count::before { } .header h3 { - text-align: left; + text-align: center; margin-bottom: 0; white-space: nowrap; text-overflow: ellipsis; overflow: hidden; - padding: 20px 20px 20px 40px; -} -[dir='rtl'] .header h3 { - text-align: right; - padding: 20px 40px 20px 20px; + padding: 20px; } .header button, @@ -2933,12 +3389,16 @@ button.save.has-count .count::before { height: 100%; } +.field-help-title button.close, +.sidebar-component .header button.note-editor-close, .entity-editor-pane .header button.preset-close, .preset-list-pane .header button.preset-choose { position: absolute; right: 0; top: 0; } +[dir='rtl'] .field-help-title button.close, +[dir='rtl'] .sidebar-component .header button.note-editor-close, [dir='rtl'] .entity-editor-pane .header button.preset-close, [dir='rtl'] .preset-list-pane .header button.preset-choose { left: 0; @@ -2976,11 +3436,21 @@ button.save.has-count .count::before { .footer { position: absolute; bottom: 0; + margin: 0; padding: 5px 20px 5px 20px; border-top: 1px solid #ccc; background-color: #fafafa; width: 100%; z-index: 1; + flex-wrap: wrap; + justify-content: space-between; + list-style: none; + display: flex; + +} + +.footer > a { + justify-content: center; } .sidebar-component .body { @@ -3107,7 +3577,7 @@ a.hide-toggle { /* Feature list */ .feature-list { - width:100%; + width: 100%; } .no-results-item, @@ -3120,7 +3590,7 @@ a.hide-toggle { } .feature-list-item { - background-color: white; + background-color: #fff; font-weight: bold; height: 40px; line-height: 20px; @@ -3160,11 +3630,11 @@ a.hide-toggle { } .feature-list-item .entity-type { - color:#7092ff; + color: #7092ff; } .feature-list-item:hover .entity-type { - color:#597be7; + color: #597be7; } .feature-list-item .entity-name { @@ -3184,7 +3654,7 @@ a.hide-toggle { /* Preset grid */ .preset-list { - width:100%; + width: 100%; padding: 20px 20px 10px 20px; border-bottom: 1px solid #ccc; } @@ -3239,13 +3709,11 @@ a.hide-toggle { position: absolute; top: 7px; left: 7px; - height: 42px; - width: 42px; margin: auto; } [dir='rtl'] .preset-icon-frame { - left: auto; - right: 7px; + left: auto; + right: 7px; } .preset-icon-frame .icon { @@ -3518,6 +3986,7 @@ a.hide-toggle { border-top: 0; border-radius: 0 0 4px 4px; overflow: hidden; + position: relative; } .form-field textarea { @@ -3534,6 +4003,7 @@ a.hide-toggle { .inspector-hover .preset-input-wrap .label, .inspector-hover .form-field-multicombo, .inspector-hover .structure-extras-wrap, +.inspector-hover .comments-container .comment, .inspector-hover input, .inspector-hover textarea, .inspector-hover label { @@ -3551,6 +4021,12 @@ a.hide-toggle { border: 1px solid #ccc; } +/* no scrollbars */ +.inspector-hover div { + overflow-x: hidden; + overflow-y: hidden; +} + /* hide and remove from layout */ .inspector-hidden, .inspector-hover label input[type="checkbox"], @@ -3573,14 +4049,14 @@ a.hide-toggle { /* 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 .header button, .inspector-hover .spin-control, .inspector-hover .form-field-multicombo .chips .remove, .inspector-hover .hide-toggle:before, .inspector-hover .more-fields, .inspector-hover .form-label-button-wrap, .inspector-hover .tag-reference-button, -.inspector-hover .view-on-osm { +.inspector-hover .footer * { opacity: 0; } @@ -3894,7 +4370,7 @@ input[type=number] { .checkselect label:last-of-type { display: block; - background: white; + background: #fff; padding: 5px 10px; color: #7092ff; } @@ -3941,11 +4417,13 @@ input[type=number] { content: none; } +#preset-input-maxspeed_advisory, #preset-input-maxspeed { border-right: none; border-radius: 0 0 0 4px; width: 80%; } +[dir='rtl'] #preset-input-maxspeed_advisory, [dir='rtl'] #preset-input-maxspeed { border-right: 1px solid #ccc; border-radius: 0 0 4px 0; @@ -4021,7 +4499,7 @@ input[type=number] { content: ""; display: block; position: absolute; - background:#ccc; + background: #ccc; height: 11px; width: 1px; left: 0; @@ -4077,18 +4555,61 @@ input[type=number] { border-radius: 0 0 4px 0; } -.addr-row:last-of-type input:last-of-type { - border-radius: 0 0 4px 0; +.addr-row:last-of-type input:last-of-type { + border-radius: 0 0 4px 0; +} +[dir='rtl'] .addr-row:last-of-type input:last-of-type { + border-radius: 0 0 0 4px; +} + +/* Restrictions editor */ + +.form-field-restrictions .restriction-controls-container { + background-color: #fff; + border-top: 1px solid #ccc; + width: 100%; + padding: 5px; +} + +.restriction-controls-container .restriction-controls { + display: table; + -moz-user-select: none; + -webkit-user-select: none; + -ms-user-select: none; + user-select: none; +} + +.restriction-controls .restriction-control { + display: table-row; + padding: 5px 10px; + height: 25px; +} + +.restriction-control input, +.restriction-control span { + display: table-cell; + text-align: start; + padding: 0px 5px; } -[dir='rtl'] .addr-row:last-of-type input:last-of-type { - border-radius: 0 0 0 4px; + +.restriction-control span.restriction-control-label { + text-align: end; } -/* Restrictions editor */ +.restriction-control input { + width: 60px; + padding: 0; + margin: 0px 5px; + vertical-align: middle; +} -.form-field-restrictions .preset-input-wrap { +.form-field-restrictions .restriction-container { position: relative; - height: 300px; + height: 370px; +} +/* zero width space, so container takes up space */ +.form-field-restrictions .restriction-container:after { + content: '\200b'; } .form-field-restrictions svg.surface { @@ -4096,7 +4617,7 @@ input[type=number] { height: 100%; } -.form-field-restrictions .restriction-help { +.restriction-container .restriction-help { z-index: 1; position: absolute; top: 0; @@ -4104,8 +4625,32 @@ input[type=number] { right: 0; padding: 2px 6px; background-color: rgba(255, 255, 255, .8); - color: #999; + color: #888; text-align: center; + pointer-events: none; + + -moz-user-select: none; + -webkit-user-select: none; + -ms-user-select: none; + user-select: none; +} + +.restriction-help span { + margin: 2px; +} + +.restriction-help .qualifier { + color: #666; + font-weight: bold; +} +.restriction-help .qualifier.allow { + color: #8b5; +} +.restriction-help .qualifier.restrict { + color: #d53; +} +.restriction-help .qualifier.only { + color: #78f; } /* Changeset editor while comment text is empty */ @@ -4135,10 +4680,10 @@ input[type=number] { div.combobox { z-index: 9999; display: none; - box-shadow: 0 0 10px 0 rgba(0,0,0,.1); + box-shadow: 0 4px 10px 1px rgba(0,0,0,.2); margin-top: -1px; - background: white; - max-height: 120px; + background: #fff; + max-height: 245px; overflow-y: auto; overflow-x: hidden; border: 1px solid #ccc; @@ -4148,7 +4693,7 @@ div.combobox { .combobox a { display: block; padding: 5px 10px; - border-top:1px solid #ccc; + border-top: 1px solid #ccc; text-overflow: ellipsis; white-space: nowrap; overflow: hidden; @@ -4161,6 +4706,7 @@ div.combobox { .combobox a:first-child { border-top: 0; + padding: 4px 10px; } .combobox-caret { @@ -4177,7 +4723,7 @@ div.combobox { } .combobox-caret::after { - content:""; + content: ""; height: 0; width: 0; position: absolute; left: 0; right: 0; bottom: 0; top: 0; @@ -4187,6 +4733,107 @@ div.combobox { border-right: 5px solid transparent; } +/* Field Help */ + +.field-help-body { + display: block; + position: absolute; + top: 0; + left: 20px; + right: 20px; + margin: 5px; + padding: 8px; + border: 1px solid #ccc; + border-top: 0; + border-radius: 0 0 4px 4px; + z-index: 20; + background: rgba(255,255,255,0.95); + box-shadow: 0 0 30px 5px rgba(0,0,0,.4); +} + +.field-help-title h2 { + padding: 10px; + margin-bottom: 0px; + font-size: 17px; +} +.field-help-title button { + width: 45px; + height: 55px; + border-radius: 0; +} + +.field-help-nav { + font-size: 13px; + font-weight: bold; + margin-bottom: 10px; +} +.field-help-nav-item { + display: inline-block; + padding: 5px 10px; + cursor: pointer; + color: #666; +} +.field-help-nav-item.active { + color: #7092ff; +} +.field-help-nav-item:hover { + color: #597be7; + background-color: #efefef; +} + +.field-help-content { + padding: 10px; + overflow-y: auto; + overflow-x: hidden; +} +.field-help-content h3 { + font-size: 12px; + margin-bottom: 5px; +} +.field-help-content p { + margin-bottom: 15px; +} +.field-help-content ul li { + list-style: inside; + margin-bottom: 5px; +} + +.field-help-content .field-help-image { + width: 100%; + margin-bottom: 15px; +} + +.field-help-content svg.turn { + width: 40px; + height: 20px; +} +.field-help-content svg.shadow { + opacity: 0.7; + width: 60px; + height: 20px; +} +.field-help-content svg.from { + color: #777; +} +.field-help-content svg.allow { + color: #5b3; +} +.field-help-content svg.restrict { + color: #d53; +} +.field-help-content svg.only { + color: #68f; +} + +.field-help-content p.from_shadow, +.field-help-content p.allow_shadow, +.field-help-content p.restrict_shadow, +.field-help-content p.allow_turn, +.field-help-content p.restrict_turn { + margin-bottom: 5px; +} + + /* Raw Tag Editor */ .tag-list { @@ -4466,7 +5113,7 @@ div.full-screen > button:hover { .map-controls { right: 0; - top: 70px; + top: 132px; width: 40px; position: fixed; z-index: 100; @@ -4492,27 +5139,46 @@ div.full-screen > button:hover { } /* Zoomer */ - -.zoombuttons button.zoom-in { +.zoombuttons > button.zoom-in { border-radius: 4px 0 0 0; } -[dir='rtl'] .zoombuttons button.zoom-in { +[dir='rtl'] .zoombuttons > button.zoom-in { border-radius: 0 4px 0 0; } -/* Background / Map Data Settings */ +/* Geolocator */ +.geolocate-control { + margin-bottom: 10px; +} +.geolocate-control > button { + border-radius: 0 0 0 4px; +} +[dir='rtl'] .geolocate-control > button { + border-radius: 0 0 4px 0; +} + +/* Pane Buttons */ +.help-control > button { + border-radius: 0 0 0 4px; +} +[dir='rtl'] .help-control > button { + border-radius: 0 0 4px 0; +} .map-data-control button { border-radius: 0; } -.background-control button { +.background-control > button { border-radius: 4px 0 0 0; } -[dir='rtl'] .background-control button { +[dir='rtl'] .background-control > button { border-radius: 0 4px 0 0; } + +/* Background / Map Data Settings */ + .map-data-control, .background-control { position: relative; @@ -4532,7 +5198,7 @@ div.full-screen > button:hover { .layer-list li { position: relative; height: 30px; - background-color: white; + background-color: #fff; color: #7092ff; } @@ -4575,6 +5241,10 @@ div.full-screen > button:hover { transform: rotateY(180deg); } +[dir='rtl'] .list-item-mvt-browse svg { + transform: rotateY(180deg); +} + /* make sure tooltip fits in map-control panel */ /* if too wide, placement will be wrong the first time it displays */ .layer-list li.best .tooltip-inner { @@ -4786,51 +5456,54 @@ div.full-screen > button:hover { border-radius: 3px 0 0 3px; } -.map-data-control .map-overlay, -.background-control .map-overlay, -.help-control .map-overlay { +/* Side panes */ +.map-pane { + position: fixed; + top: 60px; + bottom: 30px; + right: 0; + padding-bottom: 50px; + overflow: hidden; z-index: -1; } +[dir='rtl'] .map-pane { + left: 0; + right: auto !important; +} -/* Geolocator */ - -.geolocate-control { - margin-bottom: 10px; +.pane-heading { + display: flex; + flex-flow: row nowrap; + justify-content: space-between; + border-bottom: 1px solid #ccc; } -.geolocate-control button { - border-radius: 0 0 0 4px; +.pane-heading h2 { + margin: 15px 20px; } -[dir='rtl'] .geolocate-control button { - border-radius: 0 0 4px 0; + +.pane-heading button { + width: 40px; + height: 61px; + border-radius: 0; } -.map-overlay.content { - position: fixed; - top: 60px; - bottom: 30px; - padding: 20px 50px 20px 20px; - right: 0; - overflow: auto; +.pane-content { + height: 100%; + padding: 10px 50px 20px 20px; + overflow-x: hidden; + overflow-y: scroll; } -[dir='rtl'] .map-overlay.content { - padding: 20px 20px 20px 50px; - left: 0; - right: auto !important; +[dir='rtl'] .pane-content { + padding: 10px 20px 20px 50px; } -.map-overlay.content > div { +.pane-content > div { padding-bottom: 15px; } /* Help */ -.help-control button { - border-radius: 0 0 0 4px; -} -[dir='rtl'] .help-control button { - border-radius: 0 0 4px 0; -} .help-wrap p { font-size: 15px; @@ -4859,7 +5532,7 @@ div.full-screen > button:hover { .help-wrap .toc { width: 40%; - float:right; + float: right; margin-left: 20px; margin-bottom: 20px; padding-left: 5px; @@ -4877,7 +5550,7 @@ div.full-screen > button:hover { } .help-wrap .toc li a:hover, -.help-wrap .nav a:hover { +.help-wrap .nav a:hover { background: #ececec; } @@ -4908,6 +5581,7 @@ div.full-screen > button:hover { .help-wrap .nav { position: relative; + padding-bottom: 30px; } .help-wrap .nav a { @@ -5036,11 +5710,11 @@ img.tile-debug { } .map-in-map-tiles { - transform-origin:0 0; - -ms-transform-origin:0 0; - -webkit-transform-origin:0 0; - -moz-transform-origin:0 0; - -o-transform-origin:0 0; + transform-origin: 0 0; + -ms-transform-origin: 0 0; + -webkit-transform-origin: 0 0; + -moz-transform-origin: 0 0; + -o-transform-origin: 0 0; -moz-user-select: none; -webkit-user-select: none; @@ -5092,7 +5766,7 @@ img.tile-debug { .nocolor { color: rgba(0, 0, 0, 0); } .red { color: rgba(255, 0, 0, 0.75); } .green { color: rgba(0, 255, 0, 0.75); } -.blue { color: rgba(0, 0, 255, 0.75); } +.blue { color: rgba(176, 176, 255, 0.75); } .yellow { color: rgba(255, 255, 0, 0.75); } .cyan { color: rgba(0, 255, 255, 0.75); } .magenta { color: rgba(255, 0, 255, 0.75); } @@ -5198,7 +5872,7 @@ img.tile-debug { padding: 0 4px; margin-top: 10px; margin-right: 10px; - color: white; + color: #fff; } [dir='rtl'] .panel-content .button { margin-right: auto; @@ -5229,8 +5903,8 @@ img.tile-debug { #about { width: 100%; position: absolute; - right:0; - bottom:0; + right: 0; + bottom: 0; border-radius: 0; pointer-events: none; display: flex; @@ -5465,7 +6139,7 @@ img.tile-debug { } .source-switch a.live { background: #d32232; - color:#fff; + color: #fff; } .feature-warning a { @@ -5502,6 +6176,9 @@ img.tile-debug { color: #ccf; } +/* Notification Badges */ + +/* For an icon (e.g. new version) */ .badge { display: inline-block; background: #d32232; @@ -5525,7 +6202,25 @@ img.tile-debug { vertical-align: baseline; width: 11px; height: 11px; - fill: white; + fill: #fff; +} + +/* For text (e.g. upcoming events) */ +.badge-text { + display: inline-block; + color: #fff; + text-align: center; + width: 16px; + height: 16px; + font-size: 10px; + font-weight: bold; + margin-left: 5px; + background: #f00; + border-radius: 9px; +} +[dir='rtl'] .badge-text { + margin-left: 0; + margin-right: 5px; } @@ -5535,7 +6230,7 @@ img.tile-debug { .modal { top: 40px; display: inline-block; - position:absolute; + position: absolute; border-radius: 3px; overflow: hidden; left: 0; @@ -5564,9 +6259,9 @@ img.tile-debug { .shaded:before { content:''; - background:rgba(0,0,0,0.5); - position:fixed; - left:0px; right:0px; top:0px; bottom:0px; + background: rgba(0,0,0,0.5); + position: fixed; + left: 0px; right: 0px; top: 0px; bottom: 0px; } .modal-section { @@ -5589,10 +6284,17 @@ img.tile-debug { vertical-align: middle; } +.save-section .buttons { + display: flex; + flex-wrap: wrap; + justify-content: space-around; + margin-bottom: 30px; +} + .save-section .buttons .action, .save-section .buttons .secondary-action { - display: inline-block; - margin: 0 20px 0 0; + width: 45%; + margin: 10px auto; text-align: center; vertical-align: middle; } @@ -5601,8 +6303,7 @@ img.tile-debug { text-align: center; } -.modal-actions button, -.save-success a.button { +.modal-actions button { font-weight: normal; color: #7092ff; border-bottom: 1px solid #ccc; @@ -5611,12 +6312,16 @@ img.tile-debug { text-align: center; display: inline-block; } - -.modal-actions button:hover -.save-success a.button:hover { +.modal-actions button:hover { background-color: #ececec; } +.logo-small { + height: 40px; + width: 40px; + margin: auto; +} + .logo { height: 100px; width: 100%; @@ -5638,33 +6343,102 @@ img.tile-debug { color: #7092ff; } .modal-actions .logo-reset { - color: #E06C5E; + color: #e06c5e; } /* Success Modal ------------------------------------------------------- */ +.save-success.body { + overflow-y: scroll; + overflow-x: hidden; +} + +.save-success .link-out { + margin: 0px 5px; + white-space: nowrap; +} + +.save-summary, +.save-communityLinks { + padding: 0px 20px 15px 20px; +} + +.save-communityLinks { + border-top: 1px solid #ccc; +} + +.save-success table, .save-success p { - padding: 15px 15px 0 15px; + margin-top: 15px; +} +.save-success h3 { + font-size: 14px; + margin-top: 15px; + line-height: 1.5; + padding-bottom: 0; } -.save-success a.details { - padding-left: 15px; +.save-success td { + vertical-align: top; } -.save-success .button { - padding-top: 15px; +.save-success td.cell-icon { + width: 40px; } -.save-success .logo-osm { - color: #7092ff; - margin-bottom: 10px; +.save-success td.cell-detail { + padding: 0 10px; } -.save-success a.button.social { - height: auto; - border-bottom: none; +.save-success td.community-detail { + padding-bottom: 15px; } -.save-success .icon.social { - height: 80px; - width: 80px; - color: #7092ff; + +.summary-view-on-osm, +.community-name { + font-size: 14px; + font-weight: bold; +} +.community-languages { + margin-top: 5px; + font-style: italic; } +.community-languages:only-child { + margin-top: 0; +} + +.community-detail a.hide-toggle, +.community-detail a:visited.hide-toggle { + font-size: 12px; + font-weight: normal; + padding-bottom: 0; +} +.community-detail .hide-toggle svg.icon.pre-text { + width: 12px; + height: 15px; +} + +.community-events { + margin-top: 5px; +} + +.community-event, +.community-more { + background-color: #efefef; + padding: 8px; + border-radius: 4px; + margin-bottom: 5px; +} + +.community-event-name { + font-size: 14px; + font-weight: bold; +} +.community-event-when { + font-weight: bold; +} + +.community-missing { + padding: 10px; + text-align: center; +} + /* Splash Modal ------------------------------------------------------- */ @@ -5774,7 +6548,6 @@ svg.mouseclick use.right { } - /* Save Mode ------------------------------------------------------- */ .mode-save a.user-info { @@ -5803,6 +6576,7 @@ svg.mouseclick use.right { color: #fff; } +.note-save .field-warning, .mode-save .field-warning { background: #ffb; border: 1px solid #ccc; @@ -5810,6 +6584,7 @@ svg.mouseclick use.right { padding: 10px; } +.note-save .field-warning:empty, .mode-save .field-warning:empty { display: none; } @@ -5960,7 +6735,7 @@ svg.mouseclick use.right { .tooltip { position: absolute; display: none; - color:#333; + color: #333; font-size: 12px; } @@ -5998,7 +6773,7 @@ svg.mouseclick use.right { min-width: 80px; padding: 10px; font-weight: normal; - background-color: white; + background-color: #fff; } .tail { @@ -6021,14 +6796,14 @@ svg.mouseclick use.right { top: 50%; right: -5px; margin-top: -5px; - border-left-color: white; + border-left-color: #fff; border-width: 5px 0 5px 5px; } .tail div { border-radius: 3px; padding: 10px; - background: white; + background: #fff; position: absolute; top: 180px; left: 0; @@ -6046,7 +6821,7 @@ svg.mouseclick use.right { top: 50%; left: -5px; margin-top: -5px; - border-right-color: white; + border-right-color: #fff; border-width: 5px 5px 5px 0; } @@ -6062,7 +6837,7 @@ svg.mouseclick use.right { bottom: -5px; left: 50%; margin-left: -5px; - border-top-color: white; + border-top-color: #fff; border-width: 5px 5px 0; } @@ -6070,7 +6845,7 @@ svg.mouseclick use.right { top: 50%; left: -5px; margin-top: -5px; - border-right-color: white; + border-right-color: #fff; border-width: 5px 5px 5px 0; } @@ -6078,7 +6853,7 @@ svg.mouseclick use.right { top: 50%; right: -5px; margin-top: -5px; - border-left-color: white; + border-left-color: #fff; border-width: 5px 0 5px 5px; } @@ -6086,7 +6861,7 @@ svg.mouseclick use.right { top: -5px; left: 50%; margin-left: -5px; - border-bottom-color: white; + border-bottom-color: #fff; border-width: 0 5px 5px; } @@ -6114,33 +6889,33 @@ svg.mouseclick use.right { /* Exceptions for tooltip layouts */ /* make tooltips in panels dark */ -.map-overlay .tooltip.top .tooltip-arrow, +.map-pane .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, +.map-pane .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, +.map-pane .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, +.map-pane .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, -.map-overlay .tooltip-heading, -.map-overlay .keyhint-wrap, +.map-pane .tooltip-inner, +.map-pane .tooltip-heading, +.map-pane .keyhint-wrap, .entity-editor-pane .tooltip-inner, .warning-section .tooltip-inner { background: #000; @@ -6279,7 +7054,7 @@ li.hide + li.version .badge .tooltip .tooltip-arrow { .lasso-path { - fill-opacity:0.3; + fill-opacity: 0.3; stroke: #fff; stroke-width: 1; stroke-opacity: 1; @@ -6314,7 +7089,7 @@ li.hide + li.version .badge .tooltip .tooltip-arrow { height: 20px; overflow: visible; width: 10px; - background: white; + background: #fff; border-left: 1px solid #DDD; } @@ -6361,7 +7136,7 @@ li.hide + li.version .badge .tooltip .tooltip-arrow { flex: 0 0 auto; height: 40px; width: 40px; - color: white; + color: #fff; margin: 0px 20px; vertical-align: middle; }