X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/2f28495d6b041c99536fe494c447c4e93fa79d16..6a77bbe544b9866844473230b0c2406062ab9b5b:/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 afacca4b5..01cf30904 100644 --- a/vendor/assets/iD/iD.css.erb +++ b/vendor/assets/iD/iD.css.erb @@ -122,7 +122,7 @@ input[type="radio"] { */ input[type="search"] { - -webkit-appearance: textfield; /* 1 */ + -webkit-appearance: none; /* 1 */ -moz-box-sizing: border-box; -webkit-box-sizing: border-box; /* 2 */ box-sizing: border-box; @@ -168,7 +168,7 @@ input::-moz-focus-inner { /* IE/Edge needs these overrides for markers to show up */ .layer-osm path.oneway-marker-path { fill: #000; } -.layer-osm path.sided-marker-natural-path { fill: rgb(140, 208, 95); } +.layer-osm path.sided-marker-natural-path { fill: rgb(170, 170, 170); } .layer-osm path.sided-marker-coastline-path { fill: #77dede; } .layer-osm path.sided-marker-barrier-path { fill: #ddd; } .layer-osm path.sided-marker-man_made-path { fill: #fff; } @@ -196,7 +196,8 @@ input::-moz-focus-inner { /* No interactivity except what we specifically allow */ .data-layer.osm *, .data-layer.notes *, -.data-layer.keepRight * { +.data-layer.keepRight *, +.data-layer.improveOSM * { pointer-events: none; } @@ -207,7 +208,7 @@ input::-moz-focus-inner { /* `.target` objects are interactive */ /* They can be picked up, clicked, hovered, or things can connect to them */ -.kr_error.target, +.qa_error.target, .note.target, .node.target, .turn .target { @@ -242,11 +243,10 @@ input::-moz-focus-inner { pointer-events: none !important; } -/* NOTE: when more QA layers are added, replace kr_error with generic QA layer selector */ /* points, notes & QA */ /* points, notes, markers */ -g.kr_error .stroke, +g.qa_error .stroke, g.note .stroke { stroke: #222; stroke-width: 1; @@ -254,7 +254,7 @@ g.note .stroke { opacity: 0.6; } -g.kr_error.active .stroke, +g.qa_error.active .stroke, g.note.active .stroke { stroke: #222; stroke-width: 1; @@ -268,7 +268,8 @@ g.point .stroke { fill: #fff; } -g.kr_error .shadow, + +g.qa_error .shadow, g.point .shadow, g.note .shadow { fill: none; @@ -277,14 +278,14 @@ g.note .shadow { stroke-opacity: 0; } -g.kr_error.hover:not(.selected) .shadow, +g.qa_error.hover: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.kr_error.selected .shadow, +g.qa_error.selected .shadow, g.note.selected .shadow, g.point.selected .shadow { stroke-opacity: 0.7; @@ -340,8 +341,10 @@ g.vertex.selected .shadow { /* lines */ .preset-icon .icon.iD-other-line { - color: #fff; - fill: #777; + color: #989898; +} +.preset-icon-container path.line.casing { + stroke: #afafaf; } path.line { @@ -358,6 +361,8 @@ path.shadow { stroke: #f6634f; stroke-width: 16; stroke-opacity: 0; + stroke-linecap: round; + stroke-linejoin: round; } path.shadow.related:not(.selected), @@ -441,6 +446,15 @@ text.point { opacity: 0.8; } + +/* Wikidata-tagged */ +g.point.tag-wikidata path.stroke { + stroke-width: 3px; + stroke: #777; + fill: #ddd; +} + + /* Highlighting */ g.point.highlighted .shadow, path.shadow.highlighted { @@ -486,6 +500,90 @@ g.vertex.highlighted .shadow { stroke: #68f; } +/* Visual Diffs +------------------ +`highlight-edited` - visual diff activated +`added` - entity was created by the user +`moved` - node has different coordinates +`geometry-edited` - way has different nodes +`segment-edited` - one or both adjacents nodes moved +`retagged` - some tagging change has occurred +*/ + +/* Vertex visual diffs */ +.highlight-edited g.points g.node.vertex.added > circle.shadow, +.highlight-edited g.points g.node.vertex.retagged > circle.shadow, +.highlight-edited g.points g.node.vertex.moved > circle.shadow { + fill-opacity: 0.8; +} +.highlight-edited g.points g.node.vertex.added > circle.shadow { + fill: rgb(133, 255, 103); +} +.highlight-edited g.points g.node.vertex.retagged > circle.shadow { + fill: #fcde5a; +} +.highlight-edited g.points g.node.vertex.moved > circle.shadow { + fill: rgb(255, 126, 46); +} + +/* Point visual diffs */ +.highlight-edited g.points g.node.point.added > path.shadow, +.highlight-edited g.points g.node.point.retagged > path.shadow, +.highlight-edited g.points g.node.point.moved > path.shadow { + stroke-opacity: 0.8; + stroke-width: 10; +} +.highlight-edited g.points g.node.point.added > path.shadow { + stroke: rgb(133, 255, 103); +} +.highlight-edited g.points g.node.point.retagged > path.shadow { + stroke: #fcde5a; +} +.highlight-edited g.points g.node.point.moved > path.shadow { + stroke: rgb(255, 126, 46); +} + +/* Line/area segment visual diffs +- segments are rendered on top of the ways for convenience and to differentiate + them from entire line diffs, so make them thin +*/ +.highlight-edited g.lines > path.line.segment-edited, +.highlight-edited g.areas > path.area.segment-edited { + stroke: rgb(255, 126, 46); + stroke-dasharray: 10, 3; + stroke-width: 1.5 !important; + stroke-opacity: 1; +} + +/* Entire line/area visual diffs */ +.highlight-edited path.line.shadow.added, +.highlight-edited path.line.shadow.retagged, +.highlight-edited path.line.shadow.geometry-edited, +.highlight-edited path.area.shadow.added, +.highlight-edited path.area.shadow.retagged, +.highlight-edited path.area.shadow.geometry-edited { + stroke-opacity: 0.6; +} +.highlight-edited.fill-wireframe path.line.shadow.added, +.highlight-edited.fill-wireframe path.line.shadow.retagged, +.highlight-edited.fill-wireframe path.line.shadow.geometry-edited, +.highlight-edited.fill-wireframe path.area.shadow.added, +.highlight-edited.fill-wireframe path.area.shadow.retagged, +.highlight-edited.fill-wireframe path.area.shadow.geometry-edited { + stroke-width: 3; +} +.highlight-edited path.line.shadow.added, +.highlight-edited path.area.shadow.added { + stroke: rgb(133, 255, 103); +} +.highlight-edited path.area.shadow.retagged, +.highlight-edited path.line.shadow.retagged { + stroke: #fcde5a; +} +.highlight-edited path.line.shadow.geometry-edited, +.highlight-edited path.area.shadow.geometry-edited { + stroke: rgb(255, 126, 46); +} /* Default - light gray */ path.area.stroke { @@ -498,9 +596,9 @@ path.area.fill { fill: rgba(255, 255, 255, 0.3); fill-rule: evenodd; } -.preset-icon-fill-area { - border: 1px solid rgb(170, 170, 170); - background-color: rgba(170, 170, 170, 0.3); +.preset-icon-fill path.fill { + stroke: rgb(170, 170, 170); + fill: rgba(170, 170, 170, 0.3); } path.shadow.old-multipolygon, @@ -511,48 +609,37 @@ path.stroke.old-multipolygon { /* Green things */ -path.stroke.tag-landuse, path.stroke.tag-natural, +path.stroke.tag-natural-wood, path.stroke.tag-leisure-nature_reserve, path.stroke.tag-leisure-pitch, path.stroke.tag-leisure-track, path.stroke.tag-leisure-golf_course, path.stroke.tag-leisure-garden, path.stroke.tag-leisure-park, -path.stroke.tag-barrier-hedge, +path.stroke.tag-landuse-recreation_ground, path.stroke.tag-landuse-forest, -path.stroke.tag-landuse-wood, -path.stroke.tag-landuse-grass { +path.stroke.tag-landuse-grass, +path.stroke.tag-landuse-flowerbed, +path.stroke.tag-barrier-hedge { stroke: rgb(140, 208, 95); } -path.fill.tag-landuse, path.fill.tag-natural, +path.fill.tag-natural-wood, path.fill.tag-leisure-nature_reserve, path.fill.tag-leisure-pitch, path.fill.tag-leisure-track, path.fill.tag-leisure-golf_course, path.fill.tag-leisure-garden, path.fill.tag-leisure-park, +path.fill.tag-landuse-recreation_ground, path.fill.tag-landuse-forest, -path.fill.tag-natural-wood, -path.fill.tag-landuse-grass { +path.fill.tag-landuse-grass, +path.fill.tag-landuse-flowerbed, +path.fill.tag-barrier-hedge { stroke: rgba(140, 208, 95, 0.3); fill: rgba(140, 208, 95, 0.3); } -.preset-icon-fill-area.tag-landuse, -.preset-icon-fill-area.tag-natural, -.preset-icon-fill-area.tag-leisure-nature_reserve, -.preset-icon-fill-area.tag-leisure-pitch, -.preset-icon-fill-area.tag-leisure-track, -.preset-icon-fill-area.tag-leisure-golf_course, -.preset-icon-fill-area.tag-leisure-garden, -.preset-icon-fill-area.tag-leisure-park, -.preset-icon-fill-area.tag-landuse-forest, -.preset-icon-fill-area.tag-natural-wood, -.preset-icon-fill-area.tag-landuse-grass { - border-color: rgb(140, 208, 95); - background-color: rgba(140, 208, 95, 0.3); -} .pattern-color-forest, .pattern-color-forest_broadleaved, .pattern-color-forest_needleleaved, @@ -565,39 +652,18 @@ path.fill.tag-landuse-grass { /* Blue things */ path.stroke.tag-amenity-fountain, -path.stroke.tag-amenity-swimming_pool, path.stroke.tag-leisure-swimming_pool, -path.stroke.tag-landuse-aquaculture, -path.stroke.tag-landuse-basin, -path.stroke.tag-landuse-harbour, -path.stroke.tag-landuse-reservoir, -path.stroke.tag-man_made-groyne, -path.stroke.tag-man_made-breakwater, +path.stroke.tag-natural-bay, path.stroke.tag-natural-water { stroke: rgb(119, 211, 222); } path.fill.tag-amenity-fountain, -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-harbour, -path.fill.tag-landuse-reservoir, +path.fill.tag-natural-bay, path.fill.tag-natural-water { stroke: rgba(119, 211, 222, 0.3); fill: rgba(119, 211, 222, 0.3); } -.preset-icon-fill-area.tag-amenity-fountain, -.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-harbour, -.preset-icon-fill-area.tag-landuse-reservoir, -.preset-icon-fill-area.tag-natural-water { - border-color: rgb(119, 211, 222); - background-color: rgba(119, 211, 222, 0.3); -} .pattern-color-waves, .pattern-color-water_standing, .pattern-color-pond { @@ -635,20 +701,19 @@ path.fill.tag-amenity-university { stroke: rgba(255, 255, 148, 0.25); fill: rgba(255, 255, 148, 0.25); } -.preset-icon-fill-area.tag-leisure-pitch.tag-sport-beachvolleyball, -.preset-icon-fill-area.tag-leisure-pitch.tag-sport-baseball, -.preset-icon-fill-area.tag-leisure-pitch.tag-sport-softball, -.preset-icon-fill-area.tag-leisure-track, -.preset-icon-fill-area.tag-natural-beach, -.preset-icon-fill-area.tag-natural-sand, -.preset-icon-fill-area.tag-natural-scrub, -.preset-icon-fill-area.tag-amenity-childcare, -.preset-icon-fill-area.tag-amenity-kindergarten, -.preset-icon-fill-area.tag-amenity-school, -.preset-icon-fill-area.tag-amenity-college, -.preset-icon-fill-area.tag-amenity-university { - border-color: rgb(232, 232, 0); - background-color: rgba(255, 255, 148, 0.25); +.preset-icon-fill path.area.stroke.tag-leisure-pitch.tag-sport-beachvolleyball, +.preset-icon-fill path.area.stroke.tag-leisure-pitch.tag-sport-baseball, +.preset-icon-fill path.area.stroke.tag-leisure-pitch.tag-sport-softball, +.preset-icon-fill path.area.stroke.tag-leisure-track, +.preset-icon-fill path.area.stroke.tag-natural-beach, +.preset-icon-fill path.area.stroke.tag-natural-sand, +.preset-icon-fill path.area.stroke.tag-natural-scrub, +.preset-icon-fill path.area.stroke.tag-amenity-childcare, +.preset-icon-fill path.area.stroke.tag-amenity-kindergarten, +.preset-icon-fill path.area.stroke.tag-amenity-school, +.preset-icon-fill path.area.stroke.tag-amenity-college, +.preset-icon-fill path.area.stroke.tag-amenity-university { + stroke: rgb(232, 232, 0); } .pattern-color-beach, .pattern-color-sand, @@ -659,18 +724,14 @@ path.fill.tag-amenity-university { /* Gold things */ path.stroke.tag-landuse-residential, -path.stroke.tag-landuse-construction { +path.stroke.tag-status-construction { stroke: rgb(196, 189, 25); } -path.fill.tag-landuse-residential { +path.fill.tag-landuse-residential, +path.fill.tag-status-construction { stroke: rgba(196, 189, 25, 0.3); fill: rgba(196, 189, 25, 0.3); } -.preset-icon-fill-area.tag-landuse-residential, -.preset-icon-fill-area.tag-landuse-construction { - border-color: rgb(196, 189, 25); - background: rgba(196, 189, 25, 0.3); -} .pattern-color-construction { fill: rgba(196, 189, 25, 0.3); } @@ -692,14 +753,6 @@ path.fill.tag-landuse-military { stroke: rgba(214, 136, 26, 0.3); fill: rgba(214, 136, 26, 0.3); } -.preset-icon-fill-area.tag-landuse-retail, -.preset-icon-fill-area.tag-landuse-commercial, -.preset-icon-fill-area.tag-landuse-landfill, -.preset-icon-fill-area.tag-military, -.preset-icon-fill-area.tag-landuse-military { - border-color: rgb(214, 136, 26); - background-color: rgba(214, 136, 26, 0.3); -} .pattern-color-landfill { fill: rgba(214, 136, 26, 0.3); } @@ -715,20 +768,14 @@ path.fill.tag-power-plant { stroke: rgba(228, 164, 245, 0.3); fill: rgba(228, 164, 245, 0.3); } -.preset-icon-fill-area.tag-landuse-industrial, -.preset-icon-fill-area.tag-power-plant { - border-color: rgb(228, 164, 245); - background-color: rgba(228, 164, 245, 0.3); -} /* Teal things */ path.stroke.tag-natural-wetland { stroke: rgb(153, 225, 170); } -.preset-icon-fill-area.tag-natural-wetland { - border-color: rgb(153, 225, 170); - background-color: rgba(153, 225, 170, 0.2); +.preset-icon-fill path.area.fill.tag-natural-wetland { + fill: rgba(153, 225, 170, 0.2); } .pattern-color-wetland, .pattern-color-wetland_marsh, @@ -747,12 +794,12 @@ path.stroke.tag-landuse-meadow, path.stroke.tag-landuse-farmland { stroke: rgb(191, 232, 63); } -.preset-icon-fill-area.tag-landuse-cemetery, -.preset-icon-fill-area.tag-landuse-orchard, -.preset-icon-fill-area.tag-landuse-vineyard, -.preset-icon-fill-area.tag-landuse-meadow, -.preset-icon-fill-area.tag-landuse-farmland { - background-color: rgba(191, 232, 63, 0.2); +.preset-icon-fill path.area.fill.tag-landuse-cemetery, +.preset-icon-fill path.area.fill.tag-landuse-orchard, +.preset-icon-fill path.area.fill.tag-landuse-vineyard, +.preset-icon-fill path.area.fill.tag-landuse-meadow, +.preset-icon-fill path.area.fill.tag-landuse-farmland { + fill: rgba(191, 232, 63, 0.2); } .pattern-color-cemetery, .pattern-color-cemetery_christian, @@ -775,9 +822,8 @@ path.fill.tag-landuse-farmyard { stroke: rgba(245, 220, 186, 0.3); fill: rgba(245, 220, 186, 0.3); } -.preset-icon-fill-area.tag-landuse-farmyard { - border-color: rgb(226, 177, 111); - background: rgba(245, 220, 186, 0.3); +.preset-icon-fill path.area.stroke.tag-landuse-farmyard { + stroke: rgb(226, 177, 111); } .pattern-color-farmyard { fill: rgba(245, 220, 186, 0.3); @@ -786,34 +832,44 @@ path.fill.tag-landuse-farmyard { /* Dark Gray things */ path.stroke.tag-amenity-parking, +path.stroke.tag-landuse-railway, +path.stroke.tag-landuse-quarry, path.stroke.tag-leisure-pitch.tag-sport-basketball, path.stroke.tag-leisure-pitch.tag-sport-skateboard, +path.stroke.tag-man_made-adit, +path.stroke.tag-man_made-groyne, +path.stroke.tag-man_made-breakwater, path.stroke.tag-natural-bare_rock, +path.stroke.tag-natural-cave_entrance, +path.stroke.tag-natural-cliff, +path.stroke.tag-natural-rock, path.stroke.tag-natural-scree, -path.stroke.tag-landuse-railway, -path.stroke.tag-landuse-quarry { +path.stroke.tag-natural-stone, +path.stroke.tag-natural-shingle, +path.stroke.tag-waterway-dam, +path.stroke.tag-waterway-weir { stroke: rgb(170, 170, 170); } path.fill.tag-amenity-parking, +path.fill.tag-landuse-railway, +path.fill.tag-landuse-quarry, path.fill.tag-leisure-pitch.tag-sport-basketball, path.fill.tag-leisure-pitch.tag-sport-skateboard, +path.fill.tag-man_made-adit, +path.fill.tag-man_made-groyne, +path.fill.tag-man_made-breakwater, path.fill.tag-natural-bare_rock, +path.fill.tag-natural-cliff, +path.fill.tag-natural-cave_entrance, +path.fill.tag-natural-rock, path.fill.tag-natural-scree, -path.fill.tag-landuse-railway, -path.fill.tag-landuse-quarry { +path.fill.tag-natural-stone, +path.fill.tag-natural-shingle, +path.fill.tag-waterway-dam, +path.fill.tag-waterway-weir { stroke: rgba(140, 140, 140, 0.5); fill: rgba(140, 140, 140, 0.5); } -.preset-icon-fill-area.tag-amenity-parking, -.preset-icon-fill-area.tag-leisure-pitch.tag-sport-basketball, -.preset-icon-fill-area.tag-leisure-pitch.tag-sport-skateboard, -.preset-icon-fill-area.tag-natural-bare_rock, -.preset-icon-fill-area.tag-natural-scree, -.preset-icon-fill-area.tag-landuse-railway, -.preset-icon-fill-area.tag-landuse-quarry { - border-color: rgb(170, 170, 170); - background-color: rgba(140, 140, 140, 0.5); -} .pattern-color-quarry { fill: rgba(140, 140, 140, 0.5); } @@ -829,12 +885,12 @@ path.fill.tag-natural-glacier { stroke: rgba(255, 255, 255, 0.3); fill: rgba(255, 255, 255, 0.3); } -.preset-icon-fill-area.tag-natural-cave_entrance, -.preset-icon-fill-area.tag-natural-glacier { - border-color: rgb(170, 170, 170); - background: rgba(170, 170, 170, 0.3); +.preset-icon-fill path.fill.tag-natural-cave_entrance, +.preset-icon-fill path.fill.tag-natural-glacier { + stroke: rgb(170, 170, 170); + fill: rgba(170, 170, 170, 0.3); } -/* highways */ +preset-icon-container/* highways */ /* defaults */ .preset-icon .icon.tag-highway.other-line { @@ -868,8 +924,8 @@ path.line.stroke.tag-highway { stroke-width: 5; } -.preset-icon .icon.iD-highway-motorway, -.preset-icon .icon.iD-highway-motorway-link { +.preset-icon .icon.tag-highway-motorway, +.preset-icon .icon.tag-highway-motorway_link { color: #CF2081; fill: #70372f; } @@ -884,8 +940,8 @@ path.line.casing.tag-motorway { stroke: #70372f; } -.preset-icon .icon.iD-highway-trunk, -.preset-icon .icon.iD-highway-trunk-link { +.preset-icon .icon.tag-highway-trunk, +.preset-icon .icon.tag-highway-trunk_link { color: #DD2F22; fill: #70372f; } @@ -900,8 +956,8 @@ path.line.casing.tag-trunk { stroke: #70372f; } -.preset-icon .icon.iD-highway-primary, -.preset-icon .icon.iD-highway-primary-link { +.preset-icon .icon.tag-highway-primary, +.preset-icon .icon.tag-highway-primary_link { color: #F99806; fill: #70372f; } @@ -916,8 +972,8 @@ path.line.casing.tag-primary { stroke: #70372f; } -.preset-icon .icon.iD-highway-secondary, -.preset-icon .icon.iD-highway-secondary-link { +.preset-icon .icon.tag-highway-secondary, +.preset-icon .icon.tag-highway-secondary_link { color: #F3F312; fill: #70372f; } @@ -932,8 +988,8 @@ path.line.casing.tag-secondary { stroke: #70372f; } -.preset-icon .icon.iD-highway-tertiary, -.preset-icon .icon.iD-highway-tertiary-link { +.preset-icon .icon.tag-highway-tertiary, +.preset-icon .icon.tag-highway-tertiary_link { color: #FFF9B3; fill: #70372f; } @@ -948,8 +1004,8 @@ path.line.casing.tag-tertiary { stroke: #70372f; } -.legacy-carto .preset-icon .icon.iD-highway-motorway, -.legacy-carto .preset-icon .icon.iD-highway-motorway-link { +.legacy-carto .preset-icon .icon.tag-highway-motorway, +.legacy-carto .preset-icon .icon.tag-highway-motorway_link { color: #58a9ed; fill: #2c5476; } @@ -964,8 +1020,8 @@ path.line.casing.tag-tertiary { stroke: #2c5476; } -.legacy-carto .preset-icon .icon.iD-highway-trunk, -.legacy-carto .preset-icon .icon.iD-highway-trunk-link { +.legacy-carto .preset-icon .icon.tag-highway-trunk, +.legacy-carto .preset-icon .icon.tag-highway-trunk_link { color: #8cd05f; fill: #46682f; } @@ -980,8 +1036,8 @@ path.line.casing.tag-tertiary { stroke: #46682f; } -.legacy-carto .preset-icon .icon.iD-highway-primary, -.legacy-carto .preset-icon .icon.iD-highway-primary-link { +.legacy-carto .preset-icon .icon.tag-highway-primary, +.legacy-carto .preset-icon .icon.tag-highway-primary_link { color: #e06d5f; fill: #70372f; } @@ -996,8 +1052,8 @@ path.line.casing.tag-tertiary { stroke: #70372f; } -.legacy-carto .preset-icon .icon.iD-highway-secondary, -.legacy-carto .preset-icon .icon.iD-highway-secondary-link { +.legacy-carto .preset-icon .icon.tag-highway-secondary, +.legacy-carto .preset-icon .icon.tag-highway-secondary_link { color: #eab056; fill: #75582b; } @@ -1012,8 +1068,8 @@ path.line.casing.tag-tertiary { stroke: #75582b; } -.legacy-carto .preset-icon .icon.iD-highway-tertiary, -.legacy-carto .preset-icon .icon.iD-highway-tertiary-link { +.legacy-carto .preset-icon .icon.tag-highway-tertiary, +.legacy-carto .preset-icon .icon.tag-highway-tertiary_link { color: #ffff7e; fill: #7f7f3f; } @@ -1028,7 +1084,7 @@ path.line.casing.tag-tertiary { stroke: #7f7f3f; } -.preset-icon .icon.iD-highway-residential { +.preset-icon .icon.tag-highway-residential { color: #fff; fill: #444; } @@ -1041,7 +1097,7 @@ path.line.casing.tag-residential { stroke: #444; } -.preset-icon .icon.iD-highway-unclassified { +.preset-icon .icon.tag-highway-unclassified { color: #dca; fill: #444; } @@ -1060,33 +1116,21 @@ path.line.shadow.tag-highway-living_street, path.line.shadow.tag-highway-bus_guideway, path.line.shadow.tag-highway-service, path.line.shadow.tag-highway-track, -path.line.shadow.tag-highway-road, -path.line.shadow.tag-living_street, -path.line.shadow.tag-service, -path.line.shadow.tag-track, -path.line.shadow.tag-road { +path.line.shadow.tag-highway-road { stroke-width: 16; } path.line.casing.tag-highway-living_street, path.line.casing.tag-highway-bus_guideway, path.line.casing.tag-highway-service, path.line.casing.tag-highway-track, -path.line.casing.tag-highway-road, -path.line.casing.tag-living_street, -path.line.casing.tag-service, -path.line.casing.tag-track, -path.line.casing.tag-road { +path.line.casing.tag-highway-road { stroke-width: 7; } path.line.stroke.tag-highway-living_street, path.line.stroke.tag-highway-bus_guideway, path.line.stroke.tag-highway-service, path.line.stroke.tag-highway-track, -path.line.stroke.tag-highway-road, -path.line.stroke.tag-living_street, -path.line.stroke.tag-service, -path.line.stroke.tag-track, -path.line.stroke.tag-road { +path.line.stroke.tag-highway-road { stroke-width: 5; } @@ -1096,14 +1140,7 @@ path.line.shadow.tag-highway-cycleway, path.line.shadow.tag-highway-bridleway, path.line.shadow.tag-highway-corridor, path.line.shadow.tag-highway-pedestrian, -path.line.shadow.tag-highway-steps, -path.line.shadow.tag-path, -path.line.shadow.tag-footway, -path.line.shadow.tag-cycleway, -path.line.shadow.tag-bridleway, -path.line.shadow.tag-corridor, -path.line.shadow.tag-pedestrian, -path.line.shadow.tag-steps { +path.line.shadow.tag-highway-steps { stroke-width: 16; } path.line.casing.tag-highway-path, @@ -1112,14 +1149,7 @@ path.line.casing.tag-highway-cycleway, path.line.casing.tag-highway-bridleway, path.line.casing.tag-highway-corridor, path.line.casing.tag-highway-pedestrian, -path.line.casing.tag-highway-steps, -path.line.casing.tag-path, -path.line.casing.tag-footway, -path.line.casing.tag-cycleway, -path.line.casing.tag-bridleway, -path.line.casing.tag-corridor, -path.line.casing.tag-pedestrian, -path.line.casing.tag-steps { +path.line.casing.tag-highway-steps { stroke-width: 5; } path.line.stroke.tag-highway-path, @@ -1128,14 +1158,7 @@ path.line.stroke.tag-highway-cycleway, path.line.stroke.tag-highway-bridleway, path.line.stroke.tag-highway-corridor, path.line.stroke.tag-highway-pedestrian, -path.line.stroke.tag-highway-steps, -path.line.stroke.tag-path, -path.line.stroke.tag-footway, -path.line.stroke.tag-cycleway, -path.line.stroke.tag-bridleway, -path.line.stroke.tag-corridor, -path.line.stroke.tag-pedestrian, -path.line.stroke.tag-steps { +path.line.stroke.tag-highway-steps { stroke-width: 3; } @@ -1143,33 +1166,21 @@ path.line.stroke.tag-steps { .low-zoom path.line.shadow.tag-highway-bus_guideway, .low-zoom path.line.shadow.tag-highway-service, .low-zoom path.line.shadow.tag-highway-track, -.low-zoom path.line.shadow.tag-highway-road, -.low-zoom path.line.shadow.tag-living_street, -.low-zoom path.line.shadow.tag-service, -.low-zoom path.line.shadow.tag-track, -.low-zoom path.line.shadow.tag-road { +.low-zoom path.line.shadow.tag-highway-road { stroke-width: 12; } .low-zoom path.line.casing.tag-highway-living_street, .low-zoom path.line.casing.tag-highway-bus_guideway, .low-zoom path.line.casing.tag-highway-service, .low-zoom path.line.casing.tag-highway-track, -.low-zoom path.line.casing.tag-highway-road, -.low-zoom path.line.casing.tag-living_street, -.low-zoom path.line.casing.tag-service, -.low-zoom path.line.casing.tag-track, -.low-zoom path.line.casing.tag-road { +.low-zoom path.line.casing.tag-highway-road { stroke-width: 5; } .low-zoom path.line.stroke.tag-highway-living_street, .low-zoom path.line.stroke.tag-highway-bus_guideway, .low-zoom path.line.stroke.tag-highway-service, .low-zoom path.line.stroke.tag-highway-track, -.low-zoom path.line.stroke.tag-highway-road, -.low-zoom path.line.stroke.tag-living_street, -.low-zoom path.line.stroke.tag-service, -.low-zoom path.line.stroke.tag-track, -.low-zoom path.line.stroke.tag-road { +.low-zoom path.line.stroke.tag-highway-road { stroke-width: 3; } @@ -1179,14 +1190,7 @@ path.line.stroke.tag-steps { .low-zoom path.line.shadow.tag-highway-bridleway, .low-zoom path.line.shadow.tag-highway-corridor, .low-zoom path.line.shadow.tag-highway-pedestrian, -.low-zoom path.line.shadow.tag-highway-steps, -.low-zoom path.line.shadow.tag-path, -.low-zoom path.line.shadow.tag-footway, -.low-zoom path.line.shadow.tag-cycleway, -.low-zoom path.line.shadow.tag-bridleway, -.low-zoom path.line.shadow.tag-corridor, -.low-zoom path.line.shadow.tag-pedestrian, -.low-zoom path.line.shadow.tag-steps { +.low-zoom path.line.shadow.tag-highway-steps { stroke-width: 12; } .low-zoom path.line.casing.tag-highway-path, @@ -1195,14 +1199,7 @@ path.line.stroke.tag-steps { .low-zoom path.line.casing.tag-highway-bridleway, .low-zoom path.line.casing.tag-highway-corridor, .low-zoom path.line.casing.tag-highway-pedestrian, -.low-zoom path.line.casing.tag-highway-steps, -.low-zoom path.line.casing.tag-path, -.low-zoom path.line.casing.tag-footway, -.low-zoom path.line.casing.tag-cycleway, -.low-zoom path.line.casing.tag-bridleway, -.low-zoom path.line.casing.tag-corridor, -.low-zoom path.line.casing.tag-pedestrian, -.low-zoom path.line.casing.tag-steps { +.low-zoom path.line.casing.tag-highway-steps { stroke-width: 3; } .low-zoom path.line.stroke.tag-highway-path, @@ -1211,19 +1208,12 @@ path.line.stroke.tag-steps { .low-zoom path.line.stroke.tag-highway-bridleway, .low-zoom path.line.stroke.tag-highway-corridor, .low-zoom path.line.stroke.tag-highway-pedestrian, -.low-zoom path.line.stroke.tag-highway-steps, -.low-zoom path.line.stroke.tag-path, -.low-zoom path.line.stroke.tag-footway, -.low-zoom path.line.stroke.tag-cycleway, -.low-zoom path.line.stroke.tag-bridleway, -.low-zoom path.line.stroke.tag-corridor, -.low-zoom path.line.stroke.tag-pedestrian, -.low-zoom path.line.stroke.tag-steps { +.low-zoom path.line.stroke.tag-highway-steps { stroke-width: 1; } - -.preset-icon .icon.iD-highway-living-street { +/* living streets */ +.preset-icon .icon.tag-highway-living-street { color: #bbb; fill: #ddd; } @@ -1236,8 +1226,9 @@ path.line.casing.tag-living_street { stroke: #fff; } -.preset-icon .icon.iD-highway-footway.tag-highway-corridor, -.preset-icon .icon.iD-highway-footway.tag-highway-pedestrian { +/* pedestrian streets and corridors */ +.preset-icon .icon.tag-highway-corridor, +.preset-icon .icon.tag-highway-pedestrian { color: #8cd05f; fill: #fff; } @@ -1267,7 +1258,8 @@ path.line.casing.tag-pedestrian.tag-unpaved { stroke-dasharray: none; } -.preset-icon .icon.iD-highway-road { +/* unknown roads */ +.preset-icon .icon.tag-highway-road { color: #9e9e9e; fill: #666; } @@ -1280,7 +1272,8 @@ path.line.casing.tag-road { stroke: #666; } -.preset-icon .icon.iD-highway-service { +/* service roads */ +.preset-icon .icon.tag-highway-service { color: #fff; fill: #666; } @@ -1294,9 +1287,9 @@ path.line.casing.tag-service { } /* special service roads and bus guideways */ -/* with `service=* tag` (e.g. parking_aisle, alley, drive-through */ -.preset-icon .icon.iD-highway-bus_guideway, -.preset-icon .icon.iD-highway-service.tag-service { +/* with `service=* tag` (e.g. parking_aisle, alley, drive-through) */ +.preset-icon .icon.tag-highway-bus_guideway, +.preset-icon .icon.tag-highway-service.tag-service { color: #dca; fill: #666; } @@ -1311,10 +1304,7 @@ path.line.casing.tag-service.tag-service { stroke: #666; } -.preset-icon .icon.iD-highway-track { - color: #eaeaea; - fill: #c5b59f; -} +/* unmaintained track roads */ path.line.stroke.tag-highway-track, path.line.stroke.tag-track { stroke: #c5b59f; @@ -1324,6 +1314,7 @@ path.line.casing.tag-track { stroke: #746f6f; } +/* paths */ path.line.stroke.tag-highway-path, path.line.stroke.tag-highway-footway, path.line.stroke.tag-highway-cycleway, @@ -1339,8 +1330,20 @@ path.line.stroke.tag-highway-bridleway { stroke-dasharray: 3, 3; } +/* style for features that should have highway=footway but don't yet */ +path.line.stroke.tag-crossing, +path.line.stroke.tag-public_transport-platform, +path.line.stroke.tag-highway-platform, +path.line.stroke.tag-railway-platform, +path.line.stroke.tag-man_made-pier { + stroke: #dca; +} + path.line.casing.tag-highway-path, -path.line.casing.tag-highway-path.tag-unpaved { +path.line.casing.tag-highway-path.tag-unpaved, +path.line.casing.tag-highway-footway.tag-public_transport-platform, +path.line.casing.tag-highway-footway.tag-man_made-pier, +path.line.casing.tag-highway.tag-crossing { stroke: #dca; stroke-linecap: round; stroke-dasharray: none; @@ -1356,8 +1359,9 @@ path.line.casing.tag-highway-bridleway.tag-unpaved { stroke-dasharray: none; } -.preset-icon .icon.iD-category-path, -.preset-icon .icon.iD-highway-path { +.preset-icon .icon.tag-highway-path, +.preset-icon .icon.tag-highway-footway.tag-public_transport-platform, +.preset-icon .icon.tag-highway-footway.tag-man_made-pier { color: #988; fill: #dca; } @@ -1365,41 +1369,75 @@ path.line.stroke.tag-highway-path { stroke: #988; } +/* footways */ .preset-icon .icon.tag-route-foot, .preset-icon .icon.tag-route-hiking, -.preset-icon .icon.iD-highway-footway { +.preset-icon .icon.tag-highway-footway { color: #988; fill: #fff; } -path.line.stroke.tag-highway-footway { +path.line.stroke.tag-highway-footway, +path.line.stroke.tag-highway_bus_stop, +.preset-icon-container path.casing.tag-highway-footway { stroke: #988; } +.preset-icon .icon.tag-highway-footway.tag-footway-sidewalk { + color: #d4b4b4; +} +path.stroke.tag-highway-footway.tag-footway-sidewalk, +.preset-icon-container path.casing.tag-highway-footway.tag-footway-sidewalk { + stroke: #d4b4b4; +} +.preset-icon-container path.stroke.tag-highway-footway:not(.tag-crossing-marked):not(.tag-crossing-unmarked):not(.tag-man_made-pier):not(.tag-public_transport-platform) { + stroke: #fff; +} - +/* cycleways */ .preset-icon .icon.tag-route-bicycle, -.preset-icon .icon.iD-highway-cycleway { +.preset-icon .icon.tag-highway-cycleway { color: #58a9ed; fill: #fff; } -path.line.stroke.tag-highway-cycleway { +path.line.stroke.tag-highway-cycleway, +.preset-icon-container path.casing.tag-highway-cycleway { stroke: #58a9ed; } +.preset-icon-container path.stroke.tag-highway-cycleway:not(.tag-crossing) { + stroke: #fff; +} +/* bridleways */ .preset-icon .icon.tag-route-horse, -.preset-icon .icon.iD-highway-bridleway { +.preset-icon .icon.tag-highway-bridleway { color: #e06d5f; fill: #fff; } -path.line.stroke.tag-highway-bridleway { +path.line.stroke.tag-highway-bridleway, +.preset-icon-container path.casing.tag-highway-bridleway { stroke: #e06d5f; } +.preset-icon-container path.stroke.tag-highway-bridleway { + stroke: #fff; +} + +/* racetracks */ +.preset-icon .icon.tag-leisure-track { + color: rgb(229, 184, 43); +} +path.line.stroke.tag-leisure-track, +.preset-icon-container path.casing.tag-highway.tag-leisure-track { + stroke: rgb(229, 184, 43); +} +.preset-icon-container path.line.stroke.tag-highway.tag-leisure-track { + stroke: #fff; +} -.preset-icon .icon.iD-highway-steps { +/* steps */ +.preset-icon .icon.tag-highway-steps { color: #81d25c; fill: #fff; } path.line.stroke.tag-highway-steps { - stroke: #81d25c; stroke-linecap: butt; stroke-dasharray: 3, 3; } @@ -1412,6 +1450,47 @@ path.line.casing.tag-highway-steps.tag-unpaved { stroke-linecap: round; stroke-dasharray: none; } +path.line.stroke.tag-highway-steps, +.preset-icon-container path.line.casing.tag-highway-steps { + stroke: #81d25c; +} +.preset-icon-container path.line.stroke.tag-highway-steps { + stroke: #fff; +} + + +/* crossings */ +path.line.stroke.tag-highway.tag-crossing-unmarked { + stroke-dasharray: 6, 4; +} +.low-zoom path.line.stroke.tag-highway.tag-crossing-unmarked { + stroke-dasharray: 3, 2; +} +path.line.stroke.tag-highway.tag-crossing-marked { + stroke-dasharray: 6, 3; +} +.low-zoom path.line.stroke.tag-highway.tag-crossing-marked { + stroke-dasharray: 3, 1.5; +} +path.line.stroke.tag-highway-footway.tag-crossing-marked { + stroke: #4c4444; +} +.preset-icon .icon.tag-highway-footway.tag-crossing-marked { + color: #4c4444; +} +path.line.stroke.tag-highway-footway.tag-crossing-unmarked { + stroke: #776a6a; +} +.preset-icon .icon.tag-highway-footway.tag-crossing-unmarked { + color: #776a6a; +} +path.line.stroke.tag-highway-cycleway.tag-crossing-marked { + stroke: #446077; +} +.preset-icon .icon.tag-highway-cycleway.tag-crossing-marked { + color: #446077; +} + /* highway midpoints */ g.midpoint.tag-highway-corridor .fill, @@ -1511,7 +1590,9 @@ path.line.stroke.tag-aeroway-runway { stroke-width: 2; stroke-dasharray: 12, 24; } - +.preset-icon-container path.line.stroke.tag-aeroway-runway { + stroke-dasharray: 0, 14, 8, 14; +} /* railways */ /* defaults */ @@ -1547,7 +1628,16 @@ path.line.stroke.tag-railway { stroke-width: 2; stroke-dasharray: 6,6; } +.preset-icon-container path.line.stroke.tag-railway:not(.tag-status) { + stroke-dasharray: 6; +} +path.line.casing.tag-railway.tag-railway-platform { + stroke-width: 0; +} +path.line.stroke.tag-railway.tag-railway-platform { + stroke-dasharray: none; +} /* styles */ path.line.casing.tag-railway { @@ -1573,10 +1663,6 @@ path.line.stroke.tag-railway-abandoned { } -.preset-icon .icon.tag-railway-subway { - color: #222; - fill: #bbb; -} path.line.casing.tag-railway-subway { stroke: #222; } @@ -1587,26 +1673,15 @@ path.line.stroke.tag-railway-subway { /* defaults */ .preset-icon .icon.tag-waterway.other-line { - color: #77d3de; - fill: #77d3de; + color: #7dd; + fill: #7dd; } -.preset-icon .icon.iD-category-water, -.preset-icon .icon.tag-type-waterway, -.preset-icon .icon.tag-waterway { - color: #77d3de; +.preset-icon .icon.tag-type-waterway:not(.tag-waterway-dam), +.preset-icon .icon.tag-waterway:not(.tag-waterway-dam) { + color: #7dd; fill: #fff; } -path.fill.tag-waterway { - stroke: rgba(119, 211, 222, 0.3); - fill: rgba(119, 211, 222, 0.3); -} -path.line.casing.tag-waterway { - stroke: #3d6c71; -} -path.line.stroke.tag-waterway { - stroke: #77d3de; -} /* areas */ path.area.stroke.tag-waterway-dock, @@ -1628,15 +1703,15 @@ path.area.fill.tag-waterway-fuel { } /* lines */ -path.fill.tag-waterway { +path.line.fill.tag-waterway:not(.tag-waterway-dam) { stroke: rgba(119, 211, 222, 0.3); fill: rgba(119, 211, 222, 0.3); } -path.line.casing.tag-waterway { - stroke: #3d6c71; +path.line.casing.tag-waterway:not(.tag-waterway-dam) { + stroke: #444; } -path.line.stroke.tag-waterway { - stroke: #77d3de; +path.line.stroke.tag-waterway:not(.tag-waterway-dam) { + stroke: #7dd; } @@ -1686,10 +1761,67 @@ path.line.stroke.tag-waterway-river { /* ditch */ .preset-icon .icon.tag-waterway-ditch { - color: #8eabf3; + color: #39a; } path.line.stroke.tag-waterway-ditch { - stroke: #8eabf3; + stroke: #39a; +} + +/* narrow width miscellanous things */ +path.line.shadow.tag-aerialway, +path.line.shadow.tag-attraction-summer_toboggan, +path.line.shadow.tag-attraction-water_slide, +path.line.shadow.tag-golf-cartpath, +path.line.shadow.tag-man_made-pipeline, +path.line.shadow.tag-natural-tree_row, +path.line.shadow.tag-piste { + stroke-width: 16; +} +path.line.casing.tag-aerialway, +path.line.casing.tag-attraction-summer_toboggan, +path.line.casing.tag-attraction-water_slide, +path.line.casing.tag-golf-cartpath, +path.line.casing.tag-man_made-pipeline, +path.line.casing.tag-natural-tree_row, +path.line.casing.tag-piste { + stroke-width: 7; +} +path.line.stroke.tag-aerialway, +path.line.stroke.tag-attraction-summer_toboggan, +path.line.stroke.tag-attraction-water_slide, +path.line.stroke.tag-golf-cartpath, +path.line.stroke.tag-man_made-pipeline, +path.line.stroke.tag-natural-tree_row, +path.line.stroke.tag-piste { + stroke-width: 5; +} + +.low-zoom path.line.shadow.tag-aerialway, +.low-zoom path.line.shadow.tag-attraction-summer_toboggan, +.low-zoom path.line.shadow.tag-attraction-water_slide, +.low-zoom path.line.shadow.tag-golf-cartpath, +.low-zoom path.line.shadow.tag-man_made-pipeline, +.low-zoom path.line.shadow.tag-natural-tree_row, +.low-zoom path.line.shadow.tag-piste { + stroke-width: 12; +} +.low-zoom path.line.casing.tag-aerialway, +.low-zoom path.line.casing.tag-attraction-summer_toboggan, +.low-zoom path.line.casing.tag-attraction-water_slide, +.low-zoom path.line.casing.tag-golf-cartpath, +.low-zoom path.line.casing.tag-man_made-pipeline, +.low-zoom path.line.casing.tag-natural-tree_row, +.low-zoom path.line.casing.tag-piste { + stroke-width: 5; +} +.low-zoom path.line.stroke.tag-aerialway, +.low-zoom path.line.stroke.tag-attraction-summer_toboggan, +.low-zoom path.line.stroke.tag-attraction-water_slide, +.low-zoom path.line.stroke.tag-golf-cartpath, +.low-zoom path.line.stroke.tag-man_made-pipeline, +.low-zoom path.line.stroke.tag-natural-tree_row, +.low-zoom path.line.stroke.tag-piste { + stroke-width: 3; } @@ -1709,13 +1841,64 @@ path.line.stroke.tag-route-ferry { .low-zoom path.line.shadow.tag-route-ferry { stroke-width: 12; } -.low-zoom path.line.stroke.tag-route-ferry { +.low-zoom path.line.stroke.tag-route-ferry, +.preset-icon-container path.line.stroke.tag-route-ferry { stroke-width: 2; stroke-dasharray: 6,4; } path.line.stroke.tag-route-ferry { stroke: #58a9ed; } +path.line.casing.tag-route-ferry { + stroke: none; +} + + +/* aerialways */ +path.line.stroke.tag-aerialway { + stroke: #c55; +} +path.line.casing.tag-aerialway { + stroke: #444; +} + + +/* pistes */ +path.line.stroke.tag-piste { + stroke: #a9d; +} +path.line.casing.tag-piste { + stroke: #444; +} + + +/* Attractions */ +path.line.stroke.tag-attraction-summer_toboggan { + stroke: #9e9e9e; +} +path.line.casing.tag-attraction-summer_toboggan { + stroke: #666; +} + +path.line.stroke.tag-attraction-water_slide { + stroke: #aae0cb; +} +path.line.casing.tag-attraction-water_slide { + stroke: #3d6c71; +} + + +/* golf cartpaths (like service roads) */ +.preset-icon .icon.tag-golf-cartpath { + color: #dca; + fill: #666; +} +path.line.stroke.tag-golf-cartpath { + stroke: #dca; +} +path.line.casing.tag-golf-cartpath { + stroke: #666; +} /* power and pipeline */ @@ -1725,6 +1908,7 @@ path.line.stroke.tag-route-ferry { fill: #939393; } + /* power */ path.line.stroke.tag-power { stroke: #939393; @@ -1734,20 +1918,23 @@ path.line.casing.tag-power { stroke: none; } + /* pipeline */ path.line.stroke.tag-man_made-pipeline { stroke: #cbd0d8; stroke-linecap: butt; - stroke-width: 3; stroke-dasharray: 80, 1.25; } path.line.casing.tag-man_made-pipeline { stroke: #666; - stroke-width: 4.5; } .low-zoom path.line.stroke.tag-man_made-pipeline { stroke-dasharray: 40, 1; } +.preset-icon-container path.line.stroke.tag-man_made-pipeline { + stroke-dasharray: 19, 1; +} + /* boundaries */ path.line.stroke.tag-boundary { @@ -1767,45 +1954,52 @@ path.line.casing.tag-boundary-national_park { } -/* Tree Rows */ -path.line.shadow.tag-natural-tree_row { - stroke-width: 16; -} -path.line.casing.tag-natural-tree_row { - stroke-width: 7; -} -path.line.stroke.tag-natural-tree_row { - stroke-width: 5; -} -.low-zoom path.line.shadow.tag-natural-tree_row { - stroke-width: 12; -} -.low-zoom path.line.casing.tag-natural-tree_row { - stroke-width: 5; -} -.low-zoom path.line.stroke.tag-natural-tree_row { - stroke-width: 3; -} - - /* barriers and similar */ -path.line.stroke.tag-barrier:not(.tag-barrier-hedge) { +path.line.stroke.tag-barrier:not(.tag-barrier-hedge):not(.tag-waterway) { stroke: #ddd; } -path.line.stroke.tag-barrier, -path.stroke.tag-man_made-groyne, -path.stroke.tag-man_made-breakwater { +.preset-icon-container path.line.stroke.tag-barrier:not(.tag-barrier-hedge) { + stroke: rgb(170, 170, 170); +} +path.line.casing.tag-natural, +path.line.casing.tag-barrier:not(.tag-waterway), +path.line.casing.tag-man_made-groyne, +path.line.casing.tag-man_made-breakwater { + stroke: none; +} +path.line.stroke.tag-barrier:not(.tag-waterway), +path.line.stroke.tag-man_made-groyne, +path.line.stroke.tag-man_made-breakwater { stroke-width: 3px; stroke-linecap: round; stroke-dasharray: 15, 5, 1, 5; } -.low-zoom path.line.stroke.tag-barrier, -.low-zoom path.stroke.tag-man_made-groyne, -.low-zoom path.stroke.tag-man_made-breakwater { +.low-zoom path.line.stroke.tag-barrier:not(.tag-waterway), +.low-zoom path.line.stroke.tag-man_made-groyne, +.low-zoom path.line.stroke.tag-man_made-breakwater { stroke-width: 2px; stroke-linecap: butt; stroke-dasharray: 8, 2, 2, 2; } +.preset-icon-container path.line.stroke.tag-barrier, +.preset-icon-container path.line.stroke.tag-man_made-groyne, +.preset-icon-container path.line.stroke.tag-man_made-breakwater { + stroke-dasharray: 1, 4, 6, 4; +} +path.line.stroke.tag-barrier.tag-barrier-wall, +path.line.stroke.tag-barrier.tag-barrier-retaining_wall, +path.line.stroke.tag-barrier.tag-barrier-city_wall { + stroke-linecap: butt; + stroke-dasharray: 16, 3, 9, 3; +} +.low-zoom path.line.stroke.tag-barrier.tag-barrier-wall, +.low-zoom path.line.stroke.tag-barrier.tag-barrier-retaining_wall, +.low-zoom path.line.stroke.tag-barrier.tag-barrier-city_wall, +.preset-icon-container path.line.stroke.tag-barrier.tag-barrier-wall, +.preset-icon-container path.line.stroke.tag-barrier.tag-barrier-retaining_wall, +.preset-icon-container path.line.stroke.tag-barrier.tag-barrier-city_wall { + stroke-dasharray: 8, 1, 4, 1; +} /* bridges */ @@ -1957,32 +2151,38 @@ path.line.casing.tag-status { } /* Road Closed Status */ -.preset-icon .icon.iD-highway-construction { +.preset-icon .icon.tag-highway.tag-status-construction { color: #fc6c14; fill: #fff; } -path.line.shadow.tag-status.tag-status-construction { +path.line.shadow.tag-highway.tag-status.tag-status-construction { stroke-width: 20; } -path.line.casing.tag-status.tag-status-construction { - stroke: #fff; +path.line.casing.tag-highway.tag-status.tag-status-construction { stroke-width: 10; stroke-linecap: butt; stroke-dasharray: none } -path.line.stroke.tag-status.tag-status-construction { - stroke: #fc6c14; +path.line.stroke.tag-highway.tag-status.tag-status-construction { stroke-width: 8; stroke-linecap: butt; stroke-dasharray: 10, 10; } -.low-zoom path.line.shadow.tag-status.tag-status-construction { +path.line.casing.tag-highway.tag-status.tag-status-construction, +.preset-icon-container path.line.stroke.tag-highway.tag-status.tag-status-construction { + stroke: #fff; +} +path.line.stroke.tag-highway.tag-status.tag-status-construction, +.preset-icon-container path.line.casing.tag-highway.tag-status.tag-status-construction { + stroke: #fc6c14; +} +.low-zoom path.line.shadow.tag-highway.tag-status.tag-status-construction { stroke-width: 16; } -.low-zoom path.line.casing.tag-status.tag-status-construction { +.low-zoom path.line.casing.tag-highway.tag-status.tag-status-construction { stroke-width: 7; } -.low-zoom path.line.stroke.tag-status.tag-status-construction { +.low-zoom path.line.stroke.tag-highway.tag-status.tag-status-construction { stroke-width: 5; stroke-dasharray: 8, 8; } @@ -1996,182 +2196,35 @@ path.fill.tag-building { stroke: rgba(224, 110, 95, 0.3); fill: rgba(224, 110, 95, 0.3); } -.preset-icon-fill-area.tag-parking-multi-storey, -.preset-icon-fill-area.tag-building { - border-color: rgb(224, 110, 95); - background-color: rgba(224, 110, 95, 0.3); +/* Cursors */ + +.nope, +.nope * { + cursor: not-allowed !important; } +.map-in-map, +#map { + cursor: auto; /* Opera */ + cursor: url(<%= asset_path("iD/img/cursor-grab.png") %>) 9 9, auto; /* FF */ +} -/* "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; +.mode-browse .point, +.mode-select .point { + cursor: pointer; /* Opera */ + cursor: url(<%= asset_path("iD/img/cursor-select-point.png") %>), pointer; /* FF */ } -.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; +.mode-select .vertex, +.mode-browse .vertex { + cursor: pointer; /* Opera */ + cursor: url(<%= asset_path("iD/img/cursor-select-vertex.png") %>), pointer; /* FF */ } -path.line.shadow.tag-public_transport-platform, -path.line.shadow.tag-railway-platform, -path.line.shadow.tag-man_made-pier, -path.line.shadow.tag-footway.tag-footway-crossing, -path.line.shadow.tag-crossing { - stroke-width: 16; -} -path.line.casing.tag-public_transport-platform, -path.line.casing.tag-railway-platform, -path.line.casing.tag-man_made-pier, -path.line.casing.tag-footway.tag-footway-crossing, -path.line.casing.tag-crossing { - stroke: #dca; - stroke-width: 5; - stroke-linecap: round; - stroke-dasharray: none; -} -path.line.stroke.tag-public_transport-platform, -path.line.stroke.tag-railway-platform, -path.line.stroke.tag-man_made-pier, -path.line.stroke.tag-footway.tag-footway-crossing, -path.line.stroke.tag-crossing { - stroke: #988; - stroke-width: 3; - stroke-linecap: butt; - stroke-dasharray: 6, 6; -} - -.low-zoom path.line.shadow.tag-public_transport-platform, -.low-zoom path.line.shadow.tag-railway-platform, -.low-zoom path.line.shadow.tag-man_made-pier, -.low-zoom path.line.shadow.tag-footway.tag-footway-crossing, -.low-zoom path.line.shadow.tag-crossing { - stroke-width: 12; -} -.low-zoom path.line.casing.tag-public_transport-platform, -.low-zoom path.line.casing.tag-railway-platform, -.low-zoom path.line.casing.tag-man_made-pier, -.low-zoom path.line.casing.tag-footway.tag-footway-crossing, -.low-zoom path.line.casing.tag-crossing { - stroke-width: 3; -} -.low-zoom path.line.stroke.tag-public_transport-platform, -.low-zoom path.line.stroke.tag-railway-platform, -.low-zoom path.line.stroke.tag-man_made-pier, -.low-zoom path.line.stroke.tag-footway.tag-footway-crossing, -.low-zoom path.line.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.line.casing.tag-crossing.tag-crossing-marked, -path.line.casing.tag-crossing.tag-crossing-zebra { - stroke: #dca; -} -path.line.stroke.tag-crossing.tag-crossing-marked, -path.line.stroke.tag-crossing.tag-crossing-zebra { - stroke: #444; - stroke-dasharray: 6, 4; -} -.low-zoom path.line.stroke.tag-crossing.tag-crossing-marked, -.low-zoom path.line.stroke.tag-crossing.tag-crossing-zebra { - stroke-dasharray: 3, 2; -} - -/* Attractions */ -path.line.shadow.tag-attraction-summer_toboggan, -path.line.shadow.tag-attraction-water_slide { - stroke-width: 16; -} -path.line.casing.tag-attraction-summer_toboggan, -path.line.casing.tag-attraction-water_slide { - stroke-width: 7; -} -path.line.stroke.tag-attraction-summer_toboggan, -path.line.stroke.tag-attraction-water_slide { - stroke-width: 5; -} -.low-zoom path.line.shadow.tag-attraction-summer_toboggan, -.low-zoom path.line.shadow.tag-attraction-water_slide { - stroke-width: 12; -} -.low-zoom path.line.casing.tag-attraction-summer_toboggan, -.low-zoom path.line.casing.tag-attraction-water_slide { - stroke-width: 5; -} -.low-zoom path.line.stroke.tag-attraction-summer_toboggan, -.low-zoom path.line.stroke.tag-attraction-water_slide { - stroke-width: 3; -} -path.line.stroke.tag-attraction-summer_toboggan { - stroke: #9e9e9e; -} -path.line.casing.tag-attraction-summer_toboggan { - stroke: #666; -} - -path.line.stroke.tag-attraction-water_slide { - stroke: #aae0cb; -} -path.line.casing.tag-attraction-water_slide { - stroke: #3d6c71; -} -/* Cursors */ - -.nope, -.nope * { - cursor: not-allowed !important; -} - -.map-in-map, -#map { - cursor: auto; /* Opera */ - cursor: url(<%= asset_path("iD/img/cursor-grab.png") %>) 9 9, auto; /* FF */ -} - -.mode-browse .point, -.mode-select .point { - cursor: pointer; /* Opera */ - cursor: url(<%= asset_path("iD/img/cursor-select-point.png") %>), pointer; /* FF */ -} - -.mode-select .vertex, -.mode-browse .vertex { - cursor: pointer; /* Opera */ - cursor: url(<%= asset_path("iD/img/cursor-select-vertex.png") %>), pointer; /* FF */ -} - -.mode-browse .line, -.mode-select .line { - cursor: pointer; /* Opera */ - cursor: url(<%= asset_path("iD/img/cursor-select-line.png") %>), pointer; /* FF */ +.mode-browse .line, +.mode-select .line { + cursor: pointer; /* Opera */ + cursor: url(<%= asset_path("iD/img/cursor-select-line.png") %>), pointer; /* FF */ } .mode-select .area, @@ -2199,6 +2252,7 @@ path.line.casing.tag-attraction-water_slide { cursor: url(<%= asset_path("iD/img/cursor-select-remove.png") %>), pointer; /* FF */ } +.mode-add-preset #map, .mode-draw-line #map, .mode-draw-area #map, .mode-add-line #map, @@ -2242,27 +2296,30 @@ path.line.casing.tag-attraction-water_slide { } .mode-browse .note, -.mode-browse .kr_error, +.mode-browse .qa_error, .mode-select .note, -.mode-select .kr_error, +.mode-select .qa_error, .turn rect, .turn circle { cursor: pointer; } - /* photo viewer div */ #photoviewer { - position: absolute; - bottom: 40px; - left: 10px; + position: relative; + flex-shrink: 0; + margin-bottom: 10px; width: 330px; height: 250px; padding: 5px; background-color: #fff; } +[dir='ltr'] #photoviewer { + margin-left: 10px; + margin-right: 2px; +} [dir='rtl'] #photoviewer { - left: auto; - right: 10px; + margin-right: 10px; + margin-left: 2px; } @media screen and (min-width: 1600px) { @@ -2353,7 +2410,7 @@ path.line.casing.tag-attraction-water_slide { cursor: pointer; } -.viewfield-group.selected * { +.viewfield-group.currentView * { fill: #ffee00 !important; } .viewfield-group.hovered * { @@ -2377,7 +2434,7 @@ path.line.casing.tag-attraction-water_slide { stroke-opacity: 0.9; fill-opacity: 0.9; } -.viewfield-group.highlighted.selected circle { +.viewfield-group.highlighted.currentView circle { stroke: #222; stroke-width: 2; stroke-opacity: 1; @@ -2397,12 +2454,12 @@ path.line.casing.tag-attraction-water_slide { stroke-width: 1; fill-opacity: 0.8; } -.viewfield-group.highlighted.selected .viewfield { +.viewfield-group.highlighted.currentView .viewfield { stroke-width: 1; fill-opacity: 0.9; } -.viewfield-group.selected .viewfield-scale { +.viewfield-group.currentView .viewfield-scale { transform: scale(2,2); } @@ -2412,7 +2469,7 @@ path.line.casing.tag-attraction-water_slide { stroke-opacity: 0.4; } .sequence.highlighted, -.sequence.selected { +.sequence.currentView { stroke-width: 4; stroke-opacity: 1; } @@ -2432,44 +2489,48 @@ path.line.casing.tag-attraction-water_slide { /* Mapillary Image Layer */ -.layer-mapillary-images { +.layer-mapillary { pointer-events: none; } -.layer-mapillary-images .viewfield-group * { +.layer-mapillary .viewfield-group * { fill: #55ff22; } -.layer-mapillary-images .sequence { +.layer-mapillary .sequence { stroke: #55ff22; } -/* Mapillary Sign Layer */ -.layer-mapillary-signs { +/* Mapillary Traffic Signs and Map Features Layers */ +.layer-mapillary-signs, +.layer-mapillary-map-features { pointer-events: none; } -.layer-mapillary-signs .icon-sign { +.layer-mapillary-signs .icon-sign, +.layer-mapillary-map-features .icon-map-feature { outline: 2px solid transparent; pointer-events: visible; cursor: pointer; } -.layer-mapillary-signs .icon-sign:hover { +.layer-mapillary-signs .icon-sign:hover, +.layer-mapillary-map-features .icon-map-feature:hover { outline: 5px solid #eebb00; background-color: #eebb00; } -.layer-mapillary-signs .icon-sign.selected { +.layer-mapillary-signs .icon-sign.currentView, +.layer-mapillary-map-features .icon-map-feature.currentView { outline: 5px solid #ffee00; background-color: #ffee00; } /* OpenStreetCam Image Layer */ -.layer-openstreetcam-images { +.layer-openstreetcam { pointer-events: none; } -.layer-openstreetcam-images .viewfield-group * { +.layer-openstreetcam .viewfield-group * { fill: #20c4ff; } -.layer-openstreetcam-images .sequence { +.layer-openstreetcam .sequence { stroke: #20c4ff; } @@ -2605,8 +2666,9 @@ label.streetside-hires { /* OSM Notes and KeepRight Layers */ -.kr_error-header-icon .kr_error-fill, -.layer-keepRight .kr_error .kr_error-fill { +.error-header-icon .qa_error-fill, +.layer-keepRight .qa_error .qa_error-fill, +.layer-improveOSM .qa_error .qa_error-fill { stroke: #333; stroke-width: 1.3px; /* NOTE: likely a better way to scale the icon stroke */ } @@ -2645,80 +2707,116 @@ label.streetside-hires { height: 15px; } +/* adjustment for error icon */ + +.error-header-icon .preset-icon-28 { + top: auto; + left: auto; +} + +.error-header-icon { + display: flex; + align-items: center; + justify-content: center; +} /* Keep Right Errors ------------------------------------------------------- */ -.kr_error_type_20, /* multiple nodes on same spot */ -.kr_error_type_40, /* impossible oneways */ -.kr_error_type_210, /* self intersecting ways */ -.kr_error_type_270, /* unusual motorway connection */ -.kr_error_type_310, /* roundabout issues */ -.kr_error_type_320, /* improper _link */ -.kr_error_type_350 { /* improper bridge tag */ +.keepRight.error_type-20, /* multiple nodes on same spot */ +.keepRight.error_type-40, /* impossible oneways */ +.keepRight.error_type-210, /* self intersecting ways */ +.keepRight.error_type-270, /* unusual motorway connection */ +.keepRight.error_type-310, /* roundabout issues */ +.keepRight.error_type-320, /* improper _link */ +.keepRight.error_type-350 { /* improper bridge tag */ color: #ff9; } -.kr_error_type_50 { /* almost junctions */ +.keepRight.error_type-50 { /* almost junctions */ color: #88f; } -.kr_error_type_60, /* deprecated tags */ -.kr_error_type_70, /* tagging issues */ -.kr_error_type_90, /* motorway without ref */ -.kr_error_type_100, /* place of worship without religion */ -.kr_error_type_110, /* poi without name */ -.kr_error_type_150, /* railway crossing without tag */ -.kr_error_type_220, /* misspelled tag */ -.kr_error_type_380 { /* non-physical sport tag */ +.keepRight.error_type-60, /* deprecated tags */ +.keepRight.error_type-70, /* tagging issues */ +.keepRight.error_type-90, /* motorway without ref */ +.keepRight.error_type-100, /* place of worship without religion */ +.keepRight.error_type-110, /* poi without name */ +.keepRight.error_type-150, /* railway crossing without tag */ +.keepRight.error_type-220, /* misspelled tag */ +.keepRight.error_type-380 { /* non-physical sport tag */ color: #5d0; } -.kr_error_type_130 { /* disconnected ways */ +.keepRight.error_type-130 { /* disconnected ways */ color: #fa3; } -.kr_error_type_170 { /* FIXME tag */ +.keepRight.error_type-170 { /* FIXME tag */ color: #ff0; } -.kr_error_type_190 { /* intersection without junction */ +.keepRight.error_type-190 { /* intersection without junction */ color: #f33; } -.kr_error_type_200 { /* overlapping ways */ +.keepRight.error_type-200 { /* overlapping ways */ color: #fdbf6f; } -.kr_error_type_160, /* railway layer conflict */ -.kr_error_type_230 { /* layer conflict */ +.keepRight.error_type-160, /* railway layer conflict */ +.keepRight.error_type-230 { /* layer conflict */ color: #b60; } -.kr_error_type_280 { /* boundary issues */ +.keepRight.error_type-280 { /* boundary issues */ color: #5f47a0; } -.kr_error_type_180, /* relation without type */ -.kr_error_type_290 { /* turn restriction issues */ +.keepRight.error_type-180, /* relation without type */ +.keepRight.error_type-290 { /* turn restriction issues */ color: #ace; } -.kr_error_type_300, /* missing maxspeed */ -.kr_error_type_390 { /* missing tracktype */ +.keepRight.error_type-300, /* missing maxspeed */ +.keepRight.error_type-390 { /* missing tracktype */ color: #090; } -.kr_error_type_360, /* language unknown */ -.kr_error_type_370, /* doubled places */ -.kr_error_type_410 { /* website issues */ +.keepRight.error_type-360, /* language unknown */ +.keepRight.error_type-370, /* doubled places */ +.keepRight.error_type-410 { /* website issues */ color: #f9b; } -.kr_error_type_120, /* way without nodes */ -.kr_error_type_400 { /* geometry / turn angles */ +.keepRight.error_type-120, /* way without nodes */ +.keepRight.error_type-400 { /* geometry / turn angles */ color: #c35; } +/* ImproveOSM Errors +------------------------------------------------------- */ + +.improveOSM.error_type-ow { /* missing one way */ + color: #1E90FF; +} + +.improveOSM.error_type-mr-road { /* missing road */ + color: #B452CD; +} +.improveOSM.error_type-mr-path { /* missing path */ + color: #A0522D; +} +.improveOSM.error_type-mr-parking { /* missing parking */ + color: #EEEE00; +} +.improveOSM.error_type-mr-both { /* missing road+parking */ + color: #FFA500; +} + +.improveOSM.error_type-tr { /* missing turn restriction */ + color: #EC1C24; +} + /* Custom Map Data (geojson, gpx, kml, vector tile) */ .layer-mapdata { @@ -2779,7 +2877,6 @@ label.streetside-hires { stroke-width: 5px; stroke-miterlimit: 1; } - /* Fill Styles */ .low-zoom.fill-wireframe path.stroke, @@ -2822,6 +2919,12 @@ label.streetside-hires { stroke-width: 60px; pointer-events: none; } +.fill-partial path.area.fill.tag-building_part { + stroke-width: 40px; +} +.fill-partial path.area.fill.tag-indoor { + stroke-width: 20px; +} .mode-browse .fill-partial path.area.fill, .mode-select .fill-partial path.area.fill { pointer-events: visibleStroke; @@ -3055,7 +3158,6 @@ table.tags, table.tags td, table.tags th { /* Grid ------------------------------------------------------- */ .col6 { float: left; width: 50.0000%; max-width: 600px; } -.col8 { float: left; width: 66.6666%; } .col12 { float: left; width: 100.0000%; } @@ -3088,10 +3190,12 @@ table.tags, table.tags td, table.tags th { .ar { right: 0; } input.hide, +textarea.hide, div.hide, form.hide, button.hide, a.hide, +ul.hide, li.hide { display: none; } @@ -3136,29 +3240,29 @@ button.disabled { cursor: not-allowed; } -.joined button { +.joined > * { border-radius: 0; border-right: 1px solid rgba(0,0,0,.5); } -[dir='rtl'] .joined button { +[dir='rtl'] .joined > * { border-left: 1px solid rgba(0,0,0,.5); border-right: none; } -.fillL .joined button { +.fillL .joined > * { border-right: 1px solid #fff; } -.joined button:first-child { +.joined > *:first-child { border-radius: 4px 0 0 4px; } -[dir='rtl'] .joined button:first-child { +[dir='rtl'] .joined > *:first-child { border-radius: 0 4px 4px 0; } -.joined button:last-child { +.joined > *:last-child { border-right-width: 0; border-radius: 0 4px 4px 0; } -[dir='rtl'] .joined button:last-child { +[dir='rtl'] .joined > *.bar-button:last-child { border-radius: 4px 0 0 4px; } @@ -3180,6 +3284,8 @@ button.secondary-action:hover { background: #cccccc; } +button.action.disabled, +button.action.disabled:hover, button[disabled].action, button[disabled].action:hover { background: #cccccc; @@ -3237,6 +3343,23 @@ button[disabled].action:hover { border-radius: 3px; } +.icon-annotation { + color: #333; +} + +.notification-badge { + display: block; + position: absolute; + width: 10px; + height: 10px; + right: 7px; + top: 9px; +} + +.notification-badge.hide { + display: none; +} + /* Toolbar / Persistent UI Elements ------------------------------------------------------- */ @@ -3245,84 +3368,80 @@ button[disabled].action:hover { flex-flow: row nowrap; justify-content: space-between; position: absolute; - padding: 10px; + padding: 10px 5px 0px 5px; left: 0; top: 0; right: 0; - height: 60px; - z-index: 9; + z-index: 101; } - -.tool-group { +#bar .toolbar-item { + display: flex; + flex: 0 1 auto; + flex-flow: column wrap; + justify-content: center; + position: relative; +} +#bar .toolbar-item .item-content { display: flex; flex: 0 1 auto; flex-flow: row nowrap; - width: 100%; + justify-content: center; + position: relative; + height: 40px; + width: auto; + margin: 0 5px; } -.tool-group.leading-area { - flex-shrink: 2; - justify-content: flex-start; +#bar .toolbar-item .item-label { + text-align: center; + font-size: 11px; + white-space: nowrap; + margin: 1px 2px 2px 2px; } -.tool-group.center-area { - justify-content: center; +#bar .toolbar-item.spacer { + width: 100%; + flex-grow: 2; } -.tool-group.trailing-area { +#bar .toolbar-item:first-child { justify-content: flex-start; } - -.tool-group > div { - display: flex; - margin: 0 5px; +#bar .toolbar-item:last-child { + justify-content: flex-end; } -.tool-group button { - flex: 1 1 auto; +#bar .toolbar-item:empty:not(.spacer) { + display: none; +} +button.bar-button { + flex: 0 0 auto; flex-flow: row nowrap; align-items: center; padding: 0 10px; min-width: 30px; white-space: nowrap; + display: flex; } -.tool-group button .icon { +button.bar-button .icon { flex: 0 0 20px; } -.tool-group button .label { +button.bar-button .label { flex: 0 1 auto; padding: 0 5px; } -button.save .count { - display: inline-block; - border: 0px solid #ccc; - border-left-width: 1px; - padding: 0px 0px 0px 8px; - min-width: 32px; - text-align: center; -} -[dir='rtl'] button.save .count { - border-left-width: 0px; - border-right-width: 1px; - padding: 0px 8px 0px 0px; -} -button.save.disabled .count { - border: 0px solid rgba(0,0,0,0.25); - border-left-width: 1px; +button.bar-button.dragging { + opacity: 0.75; + z-index: 200; } -[dir='rtl'] button.save.disabled .count { - border-left-width: 0px; - border-right-width: 1px; - padding: 0px 8px 0px 0px; +button.bar-button.dragging .tooltip { + display: none; } -#bar.narrow button.save .count { - padding: 0px; +button.bar-button.dragging.removing { + cursor: url(<%= asset_path("iD/img/cursor-select-remove.png") %>), pointer; } -button.save .label { - margin-right: 3px; - margin-left: 0; -} -[dir='rtl'] button.save .label { - margin-left: 3px; - margin-right: 0; +button.save .count { + display: inline-block; + min-width: 32px; + text-align: center; } .help-wrap svg.icon.pre-text.add-note, @@ -3349,15 +3468,15 @@ button.add-note svg.icon { .spinner { opacity: .5; - display: flex; - flex-shrink: 2; - justify-content: flex-end; + position: absolute; + right: 4px; + bottom: 26px; } .spinner img { - height: 40px; - width: 40px; - border-radius: 4px; - background: black; + height: 20px; + width: 20px; + background: transparent; + border-radius: 100%; } [dir='rtl'] .spinner img { -moz-transform: scaleX(-1); @@ -3369,11 +3488,8 @@ button.add-note svg.icon { } -#bar.narrow .tool-group { - width: unset; -} #bar.narrow .spinner, -#bar.narrow button .label { +#bar.narrow button.bar-button .label { display: none; } #bar.narrow button .count { @@ -3381,51 +3497,274 @@ button.add-note svg.icon { border-right-width: 0; } +[dir='ltr'] .undo-redo button:first-of-type { + margin-right: 1px; +} +[dir='rtl'] .undo-redo button:first-of-type { + margin-left: 1px; +} -/* Header for modals / panes +/* Add a feature search bar ------------------------------------------------------- */ -.header { - border-bottom: 1px solid #ccc; - height: 60px; + +.search-add { + width: 200%; + justify-content: center; position: relative; + min-width: 150px; + max-width: 325px; } - -.header h3 { - text-align: center; - margin-bottom: 0; - white-space: nowrap; - text-overflow: ellipsis; - overflow: hidden; - padding: 20px; +.search-add .search-wrap { + position: relative; + width: 100%; } - -.header button, -.modal > button { - border-radius: 0; - width: 40px; - text-align: center; - overflow: hidden; +[dir='ltr'] .search-add .search-wrap { + border-radius: 20px 4px 4px 20px; } - -.header button { +[dir='rtl'] .search-add .search-wrap { + border-radius: 4px 20px 20px 4px; +} +.search-add .search-wrap.focused .tooltip { + display: none; +} +.search-add .search-wrap:last-child { + border-radius: 20px; +} +.search-add input[type='search'] { position: relative; + width: 100%; height: 100%; + border: none; + font-size: 14px; + text-indent: 25px; + padding: 5px 10px; + border-radius: inherit; } - -.field-help-title button.close, -.sidebar-component .header button.data-editor-close, -.sidebar-component .header button.note-editor-close, -.sidebar-component .header button.keepRight-editor-close, -.entity-editor-pane .header button.preset-close, -.preset-list-pane .header button.preset-choose { - position: absolute; - right: 0; - top: 0; +.search-add input[type='search'][disabled] { + opacity: 0.25; + cursor: not-allowed; } -[dir='rtl'] .field-help-title button.close, +.search-add .search-icon { + color: #333; + display: block; + position: absolute; + left: 10px; + top: 10px; + pointer-events: none; +} +[dir='rtl'] .search-add .search-icon { + left: auto; + right: 10px; +} +.search-add .popover { + border: none; + border-radius: 6px; + position: absolute; + max-height: 600px; + top: 44px; + width: 200%; + max-width: 325px; + margin: auto; + left: auto; + right: auto; + z-index: 300; +} +.search-add .popover .popover-content { + overflow-y: auto; + height: 100%; + max-height: 60vh; +} +.search-add .popover, +.search-add .popover .popover-content { + /* ensure corners are rounded in Chrome */ + -webkit-mask-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAA5JREFUeNpiYGBgAAgwAAAEAAGbA+oJAAAAAElFTkSuQmCC); +} +.search-add .popover .popover-footer { + padding: 5px 10px 5px 10px; + background: #f6f6f6; + border-top: 1px solid #DCDCDC; + display: flex; +} +.search-add .popover .popover-footer .message { + color: #666666; + flex-grow: 1; +} +.search-add .popover .popover-footer button.filter { + height: 20px; + background: transparent; + color: #666; +} +.search-add .popover .popover-footer button.filter.active { + color: #7092ff; +} +.search-add .popover .popover-footer button.filter:hover { + color: #333; +} +.search-add .popover .popover-footer button.filter.active:hover { + color: #597be7; +} +.search-add .popover::-webkit-scrollbar { + /* don't overlap rounded corners */ + background: transparent; +} +.search-add .popover .list { + height: 100%; +} +.search-add .list-item > .row { + display: flex; + position: relative; + padding: 2px; +} +.search-add .list-item:not(:last-of-type) .row, +.search-add .subsection.subitems .list-item .row, +.search-add .subsection > .tag-reference-body { + border-bottom: 1px solid #DCDCDC; +} +.search-add .list-item .label { + font-weight: bold; + font-size: 12px; + padding-left: 2px; + top: 0; + bottom: 0; + position: relative; + display: flex; + align-items: center; + line-height: 1.3em; + width: 100%; +} +.search-add .list-item .label .namepart:nth-child(2) { + font-weight: normal; +} +.search-add .list-item.disabled .preset-icon-container, +.search-add .list-item.disabled .label { + opacity: 0.55; +} +[dir='ltr'] .search-add .list-item .label .icon.inline { + margin-left: 0; +} +[dir='rtl'] .search-add .list-item .label .icon.inline { + margin-right: 0; +} +.search-add .list-item .row > *:not(button) { + pointer-events: none; +} +.search-add .list-item button.choose { + position: absolute; + border-radius: 0; + height: 100%; + width: 100%; + top: 0; + left: 0; +} +.search-add .list-item button.choose:hover, +.search-add .list-item button.choose:focus { + background: #fff; +} +.search-add .list-item.focused:not(.disabled) button.choose { + background: #e8ebff; +} +.search-add .list-item button.choose.disabled { + background-color: #ececec; +} +.search-add .subsection .list-item button.choose { + opacity: 0.85; +} +.search-add .subsection .tag-reference-body { + background: rgba(255, 255, 255, 0.85); + padding: 10px; +} +.search-add .list-item button.accessory { + position: relative; + flex: 0 0 auto; + color: #808080; + background: transparent; + padding-right: 3px; + padding-left: 3px; +} +.search-add .list-item button.accessory:hover { + color: #666; +} +.search-add .list-item button.tag-reference-open path { + fill: #000; +} +.search-add .subsection { + background-color: #CBCBCB; +} +[dir='ltr'] .search-add .subitems { + padding-left: 6px; +} +[dir='rtl'] .search-add .subitems { + padding-right: 6px; +} + +/* Add a preset mode buttons +------------------------------------------------------- */ + +button.bar-button.add-preset { + border-radius: 4px; +} +[dir='ltr'] button.bar-button.add-preset { + margin-left: 1px; +} +[dir='rtl'] button.bar-button.add-preset { + margin-right: 1px; +} +[dir='ltr'] button.bar-button.add-preset.first-recent { + margin-left: 10px; +} +[dir='rtl'] button.bar-button.add-preset.first-recent { + margin-right: 10px; +} +button.bar-button.add-preset { + padding: 0; +} +button.add-preset.disabled .preset-icon-container { + opacity: 0.5; +} +/* Header for modals / panes +------------------------------------------------------- */ +.header { + border-bottom: 1px solid #ccc; + height: 60px; + position: relative; +} + +.header h3 { + text-align: center; + margin-bottom: 0; + white-space: nowrap; + text-overflow: ellipsis; + overflow: hidden; + padding: 20px; +} + +.header button, +.modal > button { + border-radius: 0; + width: 40px; + text-align: center; + overflow: hidden; +} + +.header button { + position: relative; + height: 100%; +} + +.field-help-title button.close, +.sidebar-component .header button.data-editor-close, +.sidebar-component .header button.note-editor-close, +.sidebar-component .header button.error-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.data-editor-close, [dir='rtl'] .sidebar-component .header button.note-editor-close, -[dir='rtl'] .sidebar-component .header button.keepRight-editor-close, +[dir='rtl'] .sidebar-component .header button.error-editor-close, [dir='rtl'] .entity-editor-pane .header button.preset-close, [dir='rtl'] .preset-list-pane .header button.preset-choose { left: 0; @@ -3743,127 +4082,148 @@ a.hide-toggle { border-bottom: 1px solid #ccc; } +.preset-list-item { + margin-bottom: 10px; +} + .preset-list-button-wrap { position: relative; - margin-bottom: 10px; - height: 60px; + height: 62px; + display: flex; + border: 1px solid #ccc; + border-radius: 4px; } .preset-list-button { width: 100%; height: 100%; position: relative; - border: 1px solid #ccc; + display: flex; } .preset-list.filtered .preset-list-item:first-child .preset-list-button { background: #ececec; } -.preset-icon-fill-area { - cursor: inherit; - height: 40px; - width: 40px; - margin: auto; - position: absolute; - left: 10px; - top: 10px; +.preset-icon-container { + position: relative; + width: 60px; + height: 60px; + text-align: center; + display: flex; + align-items: center; + justify-content: center; } - -.preset-icon-fill-vertex { - height: 40px; +.preset-icon-container.small { width: 40px; - margin: auto; - position: absolute; - left: 10px; - top: 10px; - border: 1.5px solid #333; - border-radius: 20px; - background-color: #efefef; - backface-visibility: hidden; + height: 40px; + flex: 0 0 auto; +} +.preset-icon-container img.image-icon { + width: 50px; + height: 50px; + object-fit: contain; + border-radius: 2px; } -[dir='rtl'] .preset-icon-fill-vertex, -[dir='rtl'] .preset-icon-fill-area { - left: auto; - right: 10px; +.preset-icon-point-border path { + stroke: #333; + stroke-width: 1.2; + fill: transparent; } -.preset-icon-frame { - position: absolute; - top: 7px; - left: 7px; +.preset-icon-line { margin: auto; + position: absolute; + left: 0; + right: 0; + top: 0; + width: 100%; + height: 100%; } -[dir='rtl'] .preset-icon-frame { - left: auto; - right: 7px; +.preset-icon-container path { + cursor: inherit; } - -.preset-icon-frame .icon { - width: 46px; - height: 46px; +.preset-icon-container circle.vertex { + fill: #fff; + stroke: rgba(0, 0, 0, 0.25); } - -.preset-icon-60 { - position: absolute; - top: 0px; - left: 0px; - margin: auto; +.preset-icon-fill circle.midpoint { + fill: transparent; + stroke: rgba(0, 0, 0, 0.25); } - -.preset-icon-60 .icon { - width: 60px; - height: 60px; +/* use a consistent stroke width */ +.preset-icon-container path.line.stroke { + stroke-width: 2 !important; +} +.preset-icon-container path.line.casing { + stroke-width: 4 !important; } -.preset-icon-44 { - position: absolute; - top: 9px; - left: 8px; +.preset-icon-fill { margin: auto; + position: absolute; + width: 100%; + height: 100%; + left: 0; + top: 0; } - -.preset-icon-44 .icon { - width: 44px; - height: 44px; +.preset-icon-container svg, +.preset-icon-container svg > * { + cursor: inherit !important; } - -.preset-icon-28 { - position: absolute; - top: 16px; - left: 16px; - margin: auto; +.preset-icon-fill path.area.stroke { + fill: transparent; } -.preset-icon-28 .icon { - width: 28px; - height: 28px; +.preset-icon-fill-vertex circle { + stroke-width: 1.5px; + stroke: #333; + fill: #efefef; + backface-visibility: hidden; } -.preset-icon-24 { +.preset-icon { + width: 100%; + height:100%; + position: absolute; + z-index: 1; +} +.preset-icon .icon { position: absolute; - top: 18px; - left: 18px; margin: auto; + left: 0; + right: 0; + width: 100%; + height: 100%; + transform: scale(0.48); } - -.preset-icon-24 .icon { - width: 24px; - height: 24px; +.preset-icon-container.small .preset-icon.point-geom .icon { + transform: translateY(-7%) scale(0.27); } - -[dir='rtl'] .preset-list-button-wrap .preset-icon { - left: auto; - right: auto; +.preset-icon-container.small .preset-icon.point-geom.preset-icon-iD .icon { + transform: translateY(-9%) scale(0.5); } - -[dir='rtl'] .preset-list-button-wrap .preset-icon-28 { - right: 16px; +.preset-icon.framed .icon { + transform: scale(0.4); } - -[dir='rtl'] .preset-list-button-wrap .preset-icon-24 { - right: 18px; +.preset-icon.framed.line-geom .icon, +.preset-icon.framed.route-geom .icon { + top: 20%; + transform: translateY(-30%) scale(0.4); +} +.preset-icon-iD .icon { + transform: scale(1); +} +.preset-icon-iD.framed .icon { + transform: scale(0.74); +} +.preset-icon-iD.framed.line-geom .icon, +.preset-icon-iD.framed.route-geom .icon { + transform: translateY(-30%) scale(0.74); +} +.preset-icon-container.fallback .preset-icon .icon { + transform: scale(0.5) !important; } .preset-list-button .label { @@ -3879,7 +4239,6 @@ a.hide-toggle { padding: 5px 10px; left: 60px; border-left: 1px solid rgba(0, 0, 0, .1); - border-radius: 0 3px 3px 0; } [dir='rtl'] .preset-list-button .label { text-align: right; @@ -3887,7 +4246,12 @@ a.hide-toggle { right: 60px; border-left: none; border-right: 1px solid rgba(0, 0, 0, .1); - border-radius: 3px 0 0 3px; +} +[dir='ltr'] .category .preset-list-button .label { + border-radius: 0px 4px 4px 0px; +} +[dir='rtl'] .category .preset-list-button .label { + border-radius: 4px 0px 0px 4px; } .preset-list-button .label-inner { @@ -3898,49 +4262,52 @@ a.hide-toggle { white-space: nowrap; text-overflow: ellipsis; overflow: hidden; - padding-right: 30px; -} -[dir='rtl'] .preset-list-button .label-inner .namepart { - padding-right: 0; - padding-left: 30px; } .preset-list-button:hover .label, -.preset-list-button:focus .label { +.preset-list-button:focus .label, +.preset-list-button.disabled, +.preset-list-button.disabled .label { background-color: #ececec; } +.preset-list-item button.preset-favorite-button, .preset-list-item button.tag-reference-button { height: 100%; - border: 1px solid #ccc; - border-radius: 0 3px 3px 0; - position: absolute; - top: 0; - right: 0; width: 32px; + flex: 0 0 auto; background: #f6f6f6; } +[dir='ltr'] .preset-list-item button.preset-favorite-button, +[dir='ltr'] .preset-list-item button.tag-reference-button { + border-left: 1px solid #ccc; +} +[dir='rtl'] .preset-list-item button.preset-favorite-button, [dir='rtl'] .preset-list-item button.tag-reference-button { - left: 0; - right: auto; - border-radius: 3px 0 0 3px; + border-right: 1px solid #ccc; +} +[dir='ltr'] .preset-list-item button:last-child { + border-radius: 0 4px 4px 0; +} +[dir='rtl'] .preset-list-item button:last-child { + border-radius: 4px 0 0 4px; } +.preset-list-item button.preset-favorite-button:hover, .preset-list-item button.tag-reference-button:hover { background: #f1f1f1; } +.preset-list-item button.preset-favorite-button .icon, .preset-list-item button.tag-reference-button .icon { opacity: .5; } -img.tag-reference-wiki-image { - float: right; - width: 33.3333%; - width: -webkit-calc(33.3333% - 10px); - width: calc(33.3333% - 10px); - border-radius: 4px; - max-height: 200px; - margin: 10px 5px 15px 20px; +button.preset-favorite-button .icon { + fill-opacity: 0; + stroke-width: 1; +} +button.preset-favorite-button.active .icon { + fill-opacity: inherit; } @@ -3966,23 +4333,25 @@ img.tag-reference-wiki-image { } .subgrid .preset-list { - padding: 10px 10px 0 10px; + padding: 10px; margin-top: 0; border: 0; border-radius: 8px; width: -webkit-calc(100% + 20px); margin-left: -10px; } +.subgrid .preset-list > *:last-child { + margin-bottom: 0; +} .subgrid .arrow { border: solid rgba(0, 0, 0, 0); border-width: 10px; - border-bottom-color: #f1f1f1; + border-bottom-color: #ececec; width: 0; height: 0; margin-left: 50%; margin-left: -webkit-calc(50% - 10px); - margin-top: -10px; } @@ -3999,7 +4368,7 @@ img.tag-reference-wiki-image { } .data-editor .quick-links, -.keepRight-editor .quick-links, +.error-editor .quick-links, .note-editor .quick-links { padding: 5px 0 0 0; } @@ -4007,29 +4376,34 @@ img.tag-reference-wiki-image { /* Entity/Preset Editor ------------------------------------------------------- */ +.entity-issues, .preset-editor { overflow: hidden; padding: 10px 0px 5px 0px; } +.entity-issues a.hide-toggle, .preset-editor a.hide-toggle { margin: 0 20px 5px 20px; } +.entity-issues .disclosure-wrap-entity_issues, .preset-editor .form-fields-container { padding: 10px; margin: 0 10px 10px 10px; border-radius: 8px; + background: #ececec; } +.entity-issues .disclosure-wrap-entity_issues:empty, .preset-editor .form-fields-container:empty { display: none; } -.entity-editor-pane .preset-list-item .preset-list-button-wrap { +.entity-editor-pane .preset-list-item { margin-bottom: 0; } /* The parts of a field: - `.form-field` is a `div` wraps the entire thing - - `.form-field-label` is a `label` that wraps the top part, it contains; + - `.field-label` is a `label` that wraps the top part, it contains; - `span` classed `label-text` - 0..n buttons for "remove", "modified", "tag reference" - `.form-field-input-wrap` is a `label` or `div` that wraps the bottom part, it contains; @@ -4039,7 +4413,7 @@ img.tag-reference-wiki-image { - `.tag-reference-body` at the bottom (usually hidden) .------------------. - - | Name | i | <- .form-field-label | + | Name | i | <- .field-label | +------------------+ | | Starbucks | + | <- .form-field-input-wrap > .form-field '------------------' | @@ -4064,7 +4438,7 @@ img.tag-reference-wiki-image { } /* A `label` element that wraps the top section */ -.form-field-label { +.field-label { display: flex; flex-flow: row nowrap; flex: 1 1 100%; @@ -4077,15 +4451,24 @@ img.tag-reference-wiki-image { border-radius: 4px 4px 0 0; overflow: hidden; } -.form-field-label .label-text { +.field-label .label-text { flex: 1 1 auto; padding: 5px 0 5px 10px; } -[dir='rtl'] .form-field-label .label-text { +[dir='rtl'] .field-label .label-text { padding: 5px 10px 5px 0; } -.form-field-label button { +.label-text .label-textannotation svg.icon { + margin: 0 8px; + color: #333; + opacity: 0.5; + width: 14px; + height: 14px; + vertical-align: text-top; +} + +.field-label button { flex: 0 0 32px; border-left: 1px solid #ccc; width: 32px; @@ -4093,23 +4476,25 @@ img.tag-reference-wiki-image { border-radius: 0; background: #f6f6f6; } -[dir='rtl'] .form-field-label button { +[dir='rtl'] .field-label button { border-left: none; border-right: 1px solid #ccc; } -.form-field-label button:hover { +.field-label button:hover { background: #f1f1f1; } -.form-field-label .icon { +.field-label .icon { opacity: .5; } -.form-field-label .modified-icon, -.form-field-label .remove-icon { +.field-label .modified-icon, +.field-label .remove-icon, +.field-label .remove-icon-multilingual { display: none; } -.modified .form-field-label .modified-icon, -.present .form-field-label .remove-icon { +.modified:not(.locked) .field-label .modified-icon, +.present:not(.locked) .field-label .remove-icon, +.present:not(.locked) .field-label .remove-icon-multilingual { display: inline-block; } @@ -4117,7 +4502,8 @@ img.tag-reference-wiki-image { .form-field-input-wrap { display: flex; flex-flow: row nowrap; - flex: 1 1 100%; + width: 100%; + flex: 1 1 auto; min-height: 30px; border-top: 0; border-radius: 0 0 4px 4px; @@ -4142,11 +4528,12 @@ img.tag-reference-wiki-image { .form-field-input-wrap > textarea { height: 65px; border-radius: 0 0 4px 4px; + overflow: auto; } /* Buttons inside fields */ .form-field-button { - flex: 0 0 32px; + flex: 0 0 auto; height: 30px; width: 32px; position: relative; @@ -4190,7 +4577,7 @@ img.tag-reference-wiki-image { /* Field - lists with labeled input items ------------------------------------------------------- */ -.form-field ul.labeled-inputs { +.form-field ul.rows { flex: 1 1 auto; border: 1px solid #ccc; border-top: 0; @@ -4198,32 +4585,36 @@ img.tag-reference-wiki-image { overflow: hidden; width: 100%; } -.form-field ul.labeled-inputs li { +.form-field ul.rows li { border-top: 1px solid #ccc; - display: flex; - flex-flow: row nowrap; } -.form-field ul.labeled-inputs li:first-child { +.form-field ul.rows li:first-child { border-top: 0; } -.form-field ul.labeled-inputs li > span, -.form-field ul.labeled-inputs li > div { +.form-field ul.rows li { + display: flex; + flex-flow: row nowrap; +} +.form-field ul.rows li.labeled-input > span, +.form-field ul.rows li.labeled-input > div { flex: 1 1 auto; width: 100%; border-radius: 0; } -.form-field ul.labeled-inputs li input { +.form-field ul.rows li input { border-radius: 0; + border-width: 0; width: 100%; } -.form-field ul.labeled-inputs li input, -.form-field ul.labeled-inputs li button { +.form-field ul.rows li button { border-width: 0; +} +[dir='ltr'] .form-field ul.rows li.labeled-input input, +[dir='ltr'] .form-field ul.rows li button { border-left-width: 1px; } -[dir='rtl'] .form-field ul.labeled-inputs li input, -[dir='rtl'] .form-field ul.labeled-inputs li button { - border-left-width: 0; +[dir='rtl'] .form-field ul.rows li.labeled-input input, +[dir='rtl'] .form-field ul.rows li button { border-right-width: 1px; } @@ -4238,7 +4629,7 @@ img.tag-reference-wiki-image { border-top: 0px; border-radius: 0 0 4px 4px; } -.structure-extras-wrap > ul.labeled-inputs { +.structure-extras-wrap > ul.rows { border: 1px solid #ccc; border-radius: 4px; } @@ -4260,35 +4651,58 @@ img.tag-reference-wiki-image { } .form-field-input-multicombo ul.chiplist { - padding: 5px 7px 5px 7px; + padding: 5px 8px 5px 8px; background: #fff; display: block; border-radius: 0 0 4px 4px; + width: 100%; +} + +.form-field-input-multicombo li { + display: inline-flex; + flex-flow: row nowrap; + align-items: center; + margin-bottom: 3px; + margin-top: 3px; + border-radius: 4px; +} +[dir='ltr'] .form-field-input-multicombo li { + margin-right: 6px; +} +[dir='rtl'] .form-field-input-multicombo li { + margin-left: 6px; } .form-field-input-multicombo li.chips { background-color: #eff2f7; border: 1px solid #ccd5e3; line-height: 25px; + max-width: 100%; +} +[dir='ltr'] .form-field-input-multicombo li.chips { padding: 2px 0px 2px 5px; } -.form-field-input-multicombo li { - display: inline-flex; - flex-flow: row nowrap; - align-items: center; - margin: 3px; - border-radius: 4px; +[dir='rtl'] .form-field-input-multicombo li.chips { + padding: 2px 5px 2px 0px; +} + +.form-field-input-multicombo li.chips span { + display: block; + flex: 1 1 auto; + overflow: hidden; + word-wrap: break-word; } .form-field-input-multicombo a { font-family: Arial, Helvetica, sans-serif !important; font-size: 16px !important; - line-height: 22px; - float: right; padding: 0px 5px 0px 5px; margin: 0; cursor: pointer; color: #a6b4ce; + display: block; + text-align: center; + flex: 0 0 auto; } .form-field-input-multicombo .input-wrap { @@ -4306,11 +4720,8 @@ img.tag-reference-wiki-image { border-radius: 4px !important; } -.form-field-input-multicombo .full-line-chips li { - display: block; -} -.form-field-input-multicombo .full-line-chips li:not(:last-child) { - margin-bottom: 6px; +.form-field-input-multicombo .full-line-chips li.chips { + width: 100%; } .form-field-input-multicombo .full-line-chips .input-wrap { width: auto; @@ -4613,10 +5024,12 @@ img.tag-reference-wiki-image { [dir='rtl'] .wiki-title-container > input.wiki-title { border-radius: 0 0 4px 0; } -.wiki-title-container > button.wiki-link { +.wiki-title-container > button.wiki-link, +.form-field-wikidata ul.rows li:last-child button.form-field-button:last-child { border-radius: 0 0 4px 0; } -[dir='rtl'] .wiki-title-container > button.wiki-link { +[dir='rtl'] .wiki-title-container > button.wiki-link, +[dir='rtl'] .form-field-wikidata ul.rows li:last-child button.form-field-button:last-child { border-radius: 0 0 0 4px; } @@ -4726,7 +5139,7 @@ img.tag-reference-wiki-image { .form-field-comment:not(.present) #preset-input-comment { border-color: rgb(230, 100, 100); } -.form-field-comment:not(.present) .form-field-label { +.form-field-comment:not(.present) .field-label { border-color: rgb(230, 100, 100); background: rgba(230, 100, 100, 0.2); } @@ -4773,11 +5186,10 @@ div.combobox { display: inline-block; position: relative; height: 30px; - width: 30px; + width: 30px !important; margin-left: -30px; vertical-align: top; cursor: pointer; - pointer-events: none; } [dir='rtl'] .combobox-caret { margin-left: 0; @@ -4795,14 +5207,6 @@ div.combobox { border-right: 5px solid transparent; } -/* Remove the field's bottom border radius when combobox is open */ -/* For some reason this stops the combobox from overlapping the bottom of the field */ -.combobox + * textarea:focus, -.combobox + * input:focus { - border-bottom-left-radius: 0 !important; - border-bottom-right-radius: 0 !important; -} - /* Field Help ------------------------------------------------------- */ @@ -4941,8 +5345,56 @@ div.combobox { /* Raw Tag Editor ------------------------------------------------------- */ +.raw-tag-options { + display: flex; + flex-flow: row nowrap; + flex-direction: row-reverse; + margin-top: -25px; + padding: 0 3px; +} +button.raw-tag-option { + flex: 0 0 20px; + height: 20px; + width: 20px; + background: #aaa; + color: #eee; + margin: 0 3px; +} +button.raw-tag-option:focus, +button.raw-tag-option:hover, +button.raw-tag-option.active { + color: #fff; + background: #597be7; +} +button.raw-tag-option.selected { + color: #fff; + background: #7092ff; +} +button.raw-tag-option svg.icon { + width: 14px; + height: 14px; + vertical-align: text-bottom; +} +[dir='ltr'] button.raw-tag-option-list { + -moz-transform: scaleX(-1); + -o-transform: scaleX(-1); + -webkit-transform: scaleX(-1); + transform: scaleX(-1); + filter: FlipH; + -ms-filter: "FlipH"; +} + + +.tag-text { + width: 100%; + height: 100%; + font-family: monospace; + white-space: pre; +} + +.tag-text, .tag-list { - padding-top: 10px; + margin-top: 10px; } .tag-row { width: 100%; @@ -4959,6 +5411,7 @@ div.combobox { flex: 1 1 50%; } +.tag-text.readonly, .tag-row.readonly, .tag-row.readonly input.key, .tag-row.readonly input.value, @@ -5066,16 +5519,29 @@ div.combobox { flex: 1 1 auto; width: 100%; overflow: hidden; + display: none; + padding-top: 10px; } -.tag-reference-body .tag-reference-description { - margin: 10px 5px 0 5px; +.tag-reference-body.expanded { + padding-bottom: 10px; + display: inline-block; } -.tag-reference-body a { +.tag-reference-description { + +} +.tag-reference-link { display: block; } -.tag-reference-body .tag-reference-description:last-child, -.tag-reference-body a:last-child { - margin-bottom: 15px; + +img.tag-reference-wiki-image { + float: right; + width: 33.3333%; + border-radius: 4px; + margin: 0 0 0 5px; +} +[dir='rtl'] img.tag-reference-wiki-image { + float: left; + margin: 0 5px 0 0; } .preset-list .tag-reference-body { @@ -5099,10 +5565,18 @@ div.combobox { /* Raw Member / Membership Editor ------------------------------------------------------- */ -.raw-member-editor .member-list li:first-child, -.raw-membership-editor .member-list li:first-child { + +.raw-member-editor .member-list, +.raw-membership-editor .member-list { padding-top: 10px; } +.raw-member-editor .member-list li, +.raw-membership-editor .member-list li { + position: relative; + border-radius: 4px; + margin: 0; + padding-bottom: 10px; +} .raw-member-editor .member-row .member-entity-name, .raw-membership-editor .member-row .member-entity-name { font-weight: normal; @@ -5137,6 +5611,17 @@ div.combobox { border: 0; } +.raw-member-editor .member-row.dragging { + opacity: 0.75; + z-index: 3000; + /* + -webkit-box-shadow: 0px 0px 5px 0px rgba(0,0,0,0.3); + -moz-box-shadow: 0px 0px 5px 0px rgba(0,0,0,0.3); + box-shadow: 0px 0px 5px 0px rgba(0,0,0,0.3); + */ +} +.raw-member-editor .member-row.dragging + /* preserve extra space at bottom of inspector to allow for dropdown options - #5280 */ .raw-membership-editor.inspector-inner { margin-bottom: 150px; @@ -5183,138 +5668,10 @@ input.key-trap { } -/* Inspector (hover styles) -------------------------------------------------------- */ -.inspector-hover .form-field-input-wrap .label, -.inspector-hover .form-field-input-multicombo .chiplist, -.inspector-hover .form-field-button, -.inspector-hover .structure-extras-wrap, -.inspector-hover .comments-container .comment, -.inspector-hover button, -.inspector-hover input, -.inspector-hover textarea, -.inspector-hover label { - background: #ececec; -} -.inspector-hover .preset-list-button, -.inspector-hover .tag-row input { - background: #f6f6f6; -} - -.inspector-hover a, -.inspector-hover .form-field-input-multicombo .chips, -.inspector-hover .form-field-input-check span { - color: #666; -} - -.inspector-hover .form-field-input-multicombo .chips { - background: #eee; - border: 1px solid #ccc; -} - -/* no scrollbars */ -.inspector-hover div { - overflow-x: hidden; - overflow-y: hidden; -} - -/* hide and remove from layout */ -.inspector-hidden, -.inspector-hover .preset-list-button-wrap .tag-reference-button, -.inspector-hover label input[type="checkbox"], -.inspector-hover label input[type="radio"], -.inspector-hover .form-field-input-multicombo .input-wrap, -.inspector-hover .form-field-input-radio label, -.inspector-hover .form-field-input-radio label span, -.inspector-hover .form-field-input-radio label.remove .icon, -.inspector-hover .inspector-inner .add-row { - display: none; -} - -/* hide but preserve in layout */ -.inspector-hover .combobox-caret, -.inspector-hover .header button, -.inspector-hover .quick-links, -.inspector-hover .form-field-input-multicombo .chips .remove, -.inspector-hover .hide-toggle:before, -.inspector-hover .more-fields, -.inspector-hover .form-field-label button, -.inspector-hover .tag-row button, -.inspector-hover .footer * { - opacity: 0; -} - -/* Styles for raw tag inspector on hover */ -.inspector-hover .tag-row .key-wrap, -.inspector-hover .tag-row .value-wrap { - height: 31px; -} - -.inspector-hover .tag-row:first-child input.value { - border-top-right-radius: 4px; -} -[dir='rtl'] .inspector-hover .tag-row:first-child input.value { - border-top-right-radius: 0; - border-top-left-radius: 4px; -} - -.inspector-hover .tag-row:last-child input.value { - border-bottom-right-radius: 4px; -} -[dir='rtl'] .inspector-hover .tag-row:last-child input.value { - border-bottom-right-radius: 0; - border-bottom-left-radius: 4px; -} - -.inspector-hover .tag-row:last-child input.key { - border-bottom-left-radius: 4px; -} -[dir='rtl'] .inspector-hover .tag-row:last-child input.key { - border-bottom-left-radius: 0; - border-bottom-right-radius: 4px; -} - -.inspector-hover .more-fields { - max-height: 0; - margin-bottom: -10px; -} - -/* Unstyle button fields */ -.inspector-hover .form-field-input-radio label.active, -.inspector-hover .entity-editor-pane a.hide-toggle { - opacity: 1; - background-color: transparent; - color: #666; - padding-left: 0; - border-width: 0; -} -.inspector-hover .form-field-input-radio button.active { - padding-left: 10px; -} - -/* Show placeholder on hover for radio buttons */ -.inspector-hover .form-field-input-radio { - border: 1px solid #ccc; - border-top: 0; - border-radius: 0 0 4px 4px; -} -.inspector-hover .form-field-input-radio .placeholder { - opacity: 1; - color: #666; - padding: 5px 10px; - line-height: 20px; - width: 100%; - border: 0; -} -.inspector-hover .form-field-input-radio .structure-extras-wrap { - border: 0; -} - - /* OSM Note / KeepRight Editors ------------------------------------------------------- */ .note-header, -.kr_error-header { +.error-header { background-color: #f6f6f6; border-radius: 5px; border: 1px solid #ccc; @@ -5324,7 +5681,7 @@ input.key-trap { } .note-header-icon, -.kr_error-header-icon { +.error-header-icon { background-color: #fff; padding: 10px; flex: 0 0 62px; @@ -5335,20 +5692,30 @@ input.key-trap { border-radius: 5px 0 0 5px; } [dir='rtl'] .note-header-icon, -[dir='rtl'] .kr_error-header-icon { +[dir='rtl'] .error-header-icon { border-right: unset; border-left: 1px solid #ccc; border-radius: 0 5px 5px 0; } .note-header-icon .icon-wrap, -.kr_error-header-icon .icon-wrap { +.error-header-icon .icon-wrap { position: absolute; top: 0px; } +.preset-icon-28 { + position: absolute; + top: 16px; + left: 16px; + margin: auto; +} +.preset-icon-28 .icon { + width: 28px; + height: 28px; +} .note-header-label, -.kr_error-header-label { +.error-header-label { background-color: #f6f6f6; padding: 0 15px; flex: 1 1 100%; @@ -5357,7 +5724,7 @@ input.key-trap { border-radius: 0 5px 5px 0; } [dir='rtl'] .note-header-label, -[dir='rtl'] .kr_error-header-label { +[dir='rtl'] .error-header-label { border-radius: 5px 0 0 5px; } @@ -5424,24 +5791,40 @@ input.key-trap { } .note-save, -.keepRight-save { +.error-save { padding-top: 20px; } -.kr_error-details, -.kr_error-comment-container { + +.error-details { padding: 10px; } +.error-details-container { + background: #ececec; + padding: 10px; + margin-top: 20px; + border-radius: 4px; + border: 1px solid #ccc; +} +.error-details-description { + margin-bottom: 10px; +} +.error-details-description-text::first-letter { + text-transform: capitalize; +} +[dir='rtl'] .error-details-description-text::first-letter { + text-transform: none; /* #5877 */ +} -.keepRight-save .new-comment-input, -.note-save .new-comment-input { +.note-save .new-comment-input, +.error-save .new-comment-input { width: 100%; height: 100px; max-height: 300px; min-height: 100px; } -.keepRight-save .detail-section, -.note-save .detail-section { +.note-save .detail-section, +.error-save .detail-section { margin: 10px 0; } @@ -5449,21 +5832,6 @@ input.key-trap { float: right; } -.kr_error-details-container { - background: #ececec; - padding: 10px; - margin-top: 20px; - border-radius: 4px; - border: 1px solid #ccc; -} - -.kr_error-details-description { - margin-bottom: 10px; -} -.kr_error-details-description-text::first-letter { - text-transform: capitalize; -} - /* Custom Data Editor ------------------------------------------------------- */ @@ -5509,8 +5877,8 @@ input.key-trap { border-radius: 5px 0 0 5px; } -/* tag editor - no buttons */ -.data-editor.raw-tag-editor button { +/* custom data editor - no info/delete buttons */ +.data-editor.raw-tag-editor .tag-row button { display: none; } .data-editor.raw-tag-editor .tag-row .key-wrap, @@ -5523,7 +5891,7 @@ input.key-trap { ------------------------------------------------------- */ .map-controls { right: 0; - top: 132px; + top: 141px; width: 40px; position: fixed; z-index: 100; @@ -5534,12 +5902,14 @@ input.key-trap { } .map-control > button { + position: relative; width: 40px; background: rgba(0,0,0,.5); border-radius: 0; } -.map-control > button:hover { +.map-control > button:not(.disabled):hover, +.map-control > button:not(.disabled):focus { background: rgba(0, 0, 0, .8); } @@ -5548,6 +5918,10 @@ input.key-trap { background: #7092ff; } +.map-control > button.disabled .icon { + color: rgba(255, 255, 255, 0.5); +} + /* Fullscreen Button (disabled) ------------------------------------------------------- */ @@ -5635,11 +6009,12 @@ div.full-screen > button:hover { border-radius: 4px; } -.layer-list li { - position: relative; +.layer-list > li { height: 30px; background-color: #fff; color: #7092ff; + position: relative; + display: flex; } .layer-list:empty { @@ -5670,9 +6045,8 @@ div.full-screen > button:hover { } .layer-list li.best > div.best { - display: inline-block; padding: 5px; - float: right; + flex: 0 0 auto; } [dir='rtl'] .list-item-data-browse svg { @@ -5686,9 +6060,16 @@ div.full-screen > button:hover { } .layer-list label { - display: block; padding: 5px 10px; cursor: pointer; + flex: 1 1 auto; +} + +[dir='ltr'] .layer-list .indented label { + padding-left: 24px; +} +[dir='rtl'] .layer-list .indented label { + padding-right: 24px; } .layer-list label > span { @@ -5698,40 +6079,382 @@ div.full-screen > button:hover { text-overflow: ellipsis; } -.map-data-control .layer-list button, -.background-control .layer-list button { - float: right; +.map-data-pane .layer-list button, +.background-pane .layer-list button { height: 100%; - width: 10%; border-left: 1px solid #ccc; border-radius: 0; + padding-left: 4px; + padding-right: 4px; } -[dir='rtl'] .map-data-control .layer-list button, -[dir='rtl'] .background-control .layer-list button { - float: left; +[dir='rtl'] .map-data-pane .layer-list button, +[dir='rtl'] .background-pane .layer-list button { border-left: none; border-right: 1px solid #ccc; } -.map-data-control .layer-list button .icon, -.background-control .layer-list button .icon { +.map-data-pane .layer-list button .icon, +.background-pane .layer-list button .icon { opacity: 0.5; } - -.map-data-control .layer-list button:first-of-type, -.background-control .layer-list button:first-of-type { - border-radius: 0 3px 3px 0; + +.map-data-pane .layer-list button:last-of-type, +.background-pane .layer-list button:last-of-type { + border-radius: 0 3px 3px 0; +} +[dir='rtl'] .map-data-pane .layer-list button:last-of-type, +[dir='rtl'] .background-pane .layer-list button:last-of-type { + border-radius: 3px 0 0 3px; +} + +.map-data-pane .vectortile-container .vectortile-header { + padding-bottom: 5px; +} +.map-data-pane .vectortile-container .vectortile-footer { + padding-bottom: 10px; +} + + +/* Issues +------------------------------------------------------- */ +.issue { + overflow: hidden; +} +.issue .issue-label, +.issue-label .issue-text { + width: 100%; + display: flex; + flex-flow: row nowrap; + cursor: pointer; +} + +.issue-text .issue-icon { + flex: 0 0 auto; + padding: 5px 7px; +} +.issue-text .issue-message { + flex: 1 1 auto; + padding: 5px 0; +} +.issue-label .issue-autofix { + flex: 0 0 auto; + padding: 5px 8px; +} +.issue-label .issue-info-button { + height: unset; + width: 32px; + flex: 0 0 auto; + border-left: 1px solid #ccc; + background-color: rgba(0,0,0,0); +} +[dir='rtl'] .issue-label .issue-info-button { + border-left: 0; + border-right: 1px solid #ccc; +} +.issue-container .issue-label .issue-info-button .icon { + opacity: 0.5; +} +.issue-container.active .issue-label .issue-info-button .icon { + opacity: 0.7; +} +.issue-label .issue-info-button:last-child { + border-radius: 0 4px 4px 0; +} +[dir='rtl'] .issue-label .issue-info-button:last-child { + border-radius: 4px 0 0 4px; +} + +button.autofix.action { + flex: 0 0 20px; + height: 20px; + width: 20px; + background: #7092ff; + color: #fff; +} +button.autofix.action:focus, +button.autofix.action:hover, +button.autofix.action.active { + background: #597be7; +} + +/* fix all */ +.autofix-all { + display: flex; + flex-flow: row nowrap; + flex-direction: row-reverse; + margin-top: -25px; + padding-bottom: 5px; +} +.autofix-all-link-text { + padding: 0; +} +.autofix-all-link-icon svg { + margin: 0 9px; + background: currentColor; + border-radius: 4px; +} +.autofix-all-link-icon svg use { + color: #fff; +} + +/* warning styles */ +.warnings-list, +.warnings-list *, +.issue-container.active .issue.severity-warning, +.issue-container.active .issue.severity-warning * { + border-color: #fb2; +} + +.warnings-list .issue.severity-warning .issue-label, +.issue.severity-warning .issue-fix-list, +.mode-save .warning-section { + background: #ffc; +} + +.issue-container.active .issue.severity-warning .issue-label { + background: #ffa; +} + +.warnings-list .issue.severity-warning .issue-label:hover, +.issue.severity-warning .issue-fix-item.actionable:hover { + background: #ff8; +} + +.issue.severity-warning .issue-icon { + color: #f90; +} + +.issue.severity-warning .issue-fix-item.actionable, +.issue-container.active .issue.severity-warning .issue-info-button { + color: #b15500; + fill: #b15500; + /*color: #7092ff;*/ + /*fill: #7092ff;*/ +} +.issue.severity-warning .issue-fix-item.actionable:hover, +.issue-container.active .issue.severity-warning .issue-info-button:hover { + color: #7f3d00; + fill: #7f3d00; + /*color: #597be7;*/ + /*fill: #597be7;*/ +} + +.notification-badge.warning { + color: #ffdf5c; +} + + +/* error styles */ +.errors-list, +.errors-list *, +.issue-container.active .issue.severity-error, +.issue-container.active .issue.severity-error * { + border-color: #f77; +} + +.errors-list .issue.severity-error .issue-label, +.issue.severity-error .issue-fix-list, +.mode-save .error-section { + background: #ffd6d6; +} + +.issue-container.active .issue.severity-error .issue-label { + background: #ffc6c6; +} + +.errors-list .issue.severity-error .issue-label:hover, +.issue.severity-error .issue-fix-item.actionable:hover { + background: #ffb6b6; +} + +.issue.severity-error .issue-icon { + color: #dd1400; +} + +.issue.severity-error .issue-fix-item.actionable, +.issue-container.active .issue.severity-error .issue-info-button { + color: #b91201; + fill: #b91201; + /*color: #7092ff;*/ + /*fill: #7092ff;*/ +} +.issue.severity-error .issue-fix-item.actionable:hover, +.issue-container.active .issue.severity-error .issue-info-button:hover { + color: #840c00; + fill: #840c00; + /*color: #597be7;*/ + /*fill: #597be7;*/ +} + +.notification-badge.error { + color: #ff0c05; +} + + +/* Issues Pane */ +.issues-options-container { + display: table; +} +.issues-option { + display: table-row; +} +.issues-option-title { + display: table-cell; + font-weight: bold; + padding-right: 10px; +} +[dir='rtl'] .issues-option-title { + padding-right: 0; + padding-left: 10px; +} +.issues-option label { + display: table-cell; + padding: 0 10px; +} + +.layer-list.issues-list li.issue { + border-color: inherit; /* override .layer-list styles */ + color: inherit; + height: unset; +} + +.layer-list.issue-rules-list, +.layer-list.issues-list, +.layer-list.layer-feature-list { + margin-bottom: 0; +} +.section-footer { + display: flex; + flex-flow: row nowrap; + flex-direction: row-reverse; + height: 30px; +} +.section-footer a { + padding: 5px; +} + +.issues-none .box { + border-radius: 4px; + border: 1px solid #72d979; + background: #c6ffca; + padding: 5px !important; + display: flex; +} +.issues-none .icon { + color: #05ac10; +} + +input.square-degrees-input { + padding: 2px !important; /* important needed for rtl */ + height: unset; + text-align: center; + background: rgba(0,0,0,0); + color: currentColor; +} + + +/* Entity Issues List */ +.entity-issues .issue-container .issue { + border-radius: 4px; + border: 1px solid #ccc; + background: #f6f6f6; +} +.entity-issues .issue-container:not(.active) .issue-text:hover, +.entity-issues .issue-container:not(.active) .issue-info-button:hover { + background: #f1f1f1; +} +.entity-issues .issue .issue-label .issue-text { + padding-right: 10px; +} +[dir='rtl'] .entity-issues .issue .issue-label .issue-text { + padding-right: unset; + padding-left: 10px; +} + +.entity-issues .issue-container.active .issue-label .issue-text { + font-weight: bold; +} +.entity-issues .issue-container:not(:last-of-type) { + margin-bottom: 5px; +} +.entity-issues .issue-container.active:not(:first-of-type) { + margin-top: 10px; +} +.entity-issues .issue-container.active:not(:last-of-type) { + margin-bottom: 10px; +} + +/* fixes */ +.entity-issues .issue-fix-list { + border-top: 1px solid; + border-color: inherit; +} +.entity-issues .issue-container.active .issue-fix-list:empty { + display: none; +} + +li.issue-fix-item { + padding: 2px 10px 2px 20px; +} +[dir='rtl'] li.issue-fix-item { + padding: 2px 20px 2px 10px; +} +li.issue-fix-item:first-of-type { + padding-top: 5px; +} +li.issue-fix-item:last-of-type { + padding-bottom: 5px; +} + +li.issue-fix-item .fix-message { + padding: 0 10px; +} + +li.issue-fix-item.actionable { + cursor: pointer; +} +li.issue-fix-item:not(.actionable) .fix-icon { + color: #555; + fill: #555; +} + +.issue-container:not(.active) ul.issue-fix-list { + display: none; +} + +.issue-info { + flex: 1 1 auto; + width: 100%; + overflow: hidden; + display: none; + padding: 10px 0; +} +.issue-info.expanded { + display: inline-block; +} + +.issue-info .issue-reference { + margin-bottom: 10px; +} +.issue-info .tagDiff-table { + min-width: 60%; + width: unset; + border: 1px solid #ccc; } -[dir='rtl'] .map-data-control .layer-list button:first-of-type, -[dir='rtl'] .background-control .layer-list button:first-of-type { - border-radius: 3px 0 0 3px; +.issue-info .tagDiff-row { + border: 1px solid #ccc; } - -.map-data-control .vectortile-container .vectortile-header { - padding-bottom: 5px; +.issue-info .tagDiff-cell { + padding: 2px 10px; + font-family: monospace; + font-size: 10px; + border: 1px solid #ccc; } -.map-data-control .vectortile-container .vectortile-footer { - padding-bottom: 10px; +.issue-info .tagDiff-cell-add { + background: #dfd; +} +.issue-info .tagDiff-cell-remove { + background: #fdd; } @@ -5771,7 +6494,7 @@ div.full-screen > button:hover { /* Background - Adjust Alignment ------------------------------------------------------- */ -.background-control .nudge-container { +.background-pane .nudge-container { border: 1px solid #ccc; border-radius: 4px; padding: 10px; @@ -5872,25 +6595,25 @@ div.full-screen > button:hover { cursor: move; } -.background-control .nudge.right::after { +.background-pane .nudge.right::after { border-top: 5px solid transparent; border-bottom: 5px solid transparent; border-left: 5px solid #222; } -.background-control .nudge.left::after { +.background-pane .nudge.left::after { border-top: 5px solid transparent; border-bottom: 5px solid transparent; border-right: 5px solid #222; } -.background-control .nudge.top::after { +.background-pane .nudge.top::after { border-right: 5px solid transparent; border-left: 5px solid transparent; border-bottom: 5px solid #222; } -.background-control .nudge.bottom::after { +.background-pane .nudge.bottom::after { border-right: 5px solid transparent; border-left: 5px solid transparent; border-top: 5px solid #222; @@ -5899,25 +6622,23 @@ div.full-screen > button:hover { /* Side Panes - Background / Map Data / Help ------------------------------------------------------- */ +.map-panes { + flex: 0 1 auto; + position: relative; + height: 100%; +} .map-pane { - position: fixed; - top: 60px; - bottom: 30px; - right: 0; - width: 33.3333%; - max-width: 400px; - padding-bottom: 50px; + position: relative; + top: 0; + width: 400px; + height: 100%; + padding-bottom: 60px; overflow: hidden; - z-index: -1; -} -[dir='rtl'] .map-pane { - left: 0; - right: auto !important; + z-index: 10; } .map-pane.help-wrap { - width: 50.0000%; - max-width: 600px; + width: 600px; } .pane-heading { @@ -5925,26 +6646,28 @@ div.full-screen > button:hover { flex-flow: row nowrap; justify-content: space-between; border-bottom: 1px solid #ccc; + height: 60px; } .pane-heading h2 { - margin: 15px 20px; + margin: 14px 20px; } .pane-heading button { width: 40px; - height: 61px; + height: 100%; border-radius: 0; } .pane-content { height: 100%; - padding: 10px 50px 20px 20px; + padding: 10px 40px 20px 20px; overflow-x: hidden; overflow-y: scroll; + position: relative; } [dir='rtl'] .pane-content { - padding: 10px 20px 20px 50px; + padding: 10px 20px 20px 40px; } .pane-content > div { @@ -6054,6 +6777,155 @@ div.full-screen > button:hover { } +/* Inspector (hover styles) +------------------------------------------------------- */ +.inspector-hover .entity-issues .issue-container .issue .issue-label, +.inspector-hover .form-field-input-wrap .label, +.inspector-hover .form-field-input-multicombo .chiplist, +.inspector-hover .form-field-button, +.inspector-hover .structure-extras-wrap, +.inspector-hover .comments-container .comment, +.inspector-hover button, +.inspector-hover input, +.inspector-hover textarea, +.inspector-hover label { + background: #ececec; +} +.inspector-hover .preset-list-button, +.inspector-hover .tag-row input { + background: #f6f6f6; +} + +.inspector-hover a, +.inspector-hover .form-field-input-multicombo .chips, +.inspector-hover .form-field-input-check span, +.inspector-hover .entity-issues .issue .icon { + color: #666; +} + +.inspector-hover .form-field-input-multicombo .chips { + background: #eee; + border: 1px solid #ccc; +} + +/* no scrollbars */ +.inspector-hover div { + overflow-x: hidden; + overflow-y: hidden; +} + +/* hide and remove from layout */ +.inspector-hidden, +.inspector-hover .preset-list-button-wrap .preset-favorite-button, +.inspector-hover .preset-list-button-wrap .tag-reference-button, +.inspector-hover label input[type="checkbox"], +.inspector-hover label input[type="radio"], +.inspector-hover .form-field-input-multicombo .input-wrap, +.inspector-hover .form-field-input-radio label, +.inspector-hover .form-field-input-radio label span, +.inspector-hover .form-field-input-radio label.remove .icon, +.inspector-hover .inspector-inner .add-row, +.inspector-hover .entity-issues .issue-container .issue-fix-list, +.inspector-hover .entity-issues .issue-container .issue-info-button { + display: none; +} + +/* hide but preserve in layout */ +.inspector-hover .combobox-caret, +.inspector-hover .header button, +.inspector-hover .quick-links, +.inspector-hover .form-field-input-multicombo .chips .remove, +.inspector-hover .hide-toggle:before, +.inspector-hover .more-fields, +.inspector-hover .field-label button, +.inspector-hover .tag-row button, +.inspector-hover .footer * { + opacity: 0; +} + +/* Unstyle the active entity issue on hover */ +.inspector-hover .entity-issues .issue-container.active { + margin-top: 1px; + margin-bottom: 1px; +} +.inspector-hover .entity-issues .issue-container * { + border-color: #ccc !important; +} +.inspector-hover .entity-issues .issue-container.active .issue-label { + border-bottom: 0; +} +.inspector-hover .entity-issues .issue-container.active .issue-label .issue-text { + font-weight: normal; +} + + +/* Styles for raw tag inspector on hover */ +.inspector-hover .tag-row .key-wrap, +.inspector-hover .tag-row .value-wrap { + height: 31px; +} + +.inspector-hover .tag-row:first-child input.value { + border-top-right-radius: 4px; +} +[dir='rtl'] .inspector-hover .tag-row:first-child input.value { + border-top-right-radius: 0; + border-top-left-radius: 4px; +} + +.inspector-hover .tag-row:last-child input.value { + border-bottom-right-radius: 4px; +} +[dir='rtl'] .inspector-hover .tag-row:last-child input.value { + border-bottom-right-radius: 0; + border-bottom-left-radius: 4px; +} + +.inspector-hover .tag-row:last-child input.key { + border-bottom-left-radius: 4px; +} +[dir='rtl'] .inspector-hover .tag-row:last-child input.key { + border-bottom-left-radius: 0; + border-bottom-right-radius: 4px; +} + +.inspector-hover .more-fields { + max-height: 0; + margin-bottom: -10px; +} + +/* Unstyle button fields */ +.inspector-hover .form-field-input-radio label.active, +.inspector-hover .entity-editor-pane a.hide-toggle { + opacity: 1; + background-color: transparent; + color: #666; + padding-left: 0; + border-width: 0; +} +.inspector-hover .form-field-input-radio button.active { + padding-left: 10px; +} + +/* Show placeholder on hover for radio buttons */ +.inspector-hover .form-field-input-radio { + border: 1px solid #ccc; + border-top: 0; + border-radius: 0 0 4px 4px; +} +.inspector-hover .form-field-input-radio .placeholder { + opacity: 1; + color: #666; + padding: 5px 10px; + line-height: 20px; + width: 100%; + border: 0; +} +.inspector-hover .form-field-input-radio .structure-extras-wrap { + border: 0; +} + + /* Raster Background Tiles ------------------------------------------------------- */ img.tile { @@ -6148,7 +7020,7 @@ img.tile-debug { .map-in-map { position: absolute; overflow: hidden; - top: 60px; + top: 10px; width: 200px; height: 150px; z-index: 5; @@ -6156,6 +7028,12 @@ img.tile-debug { border: #aaa 1px solid; box-shadow: 0 0 2em black; } +[dir='ltr'] .map-in-map { + left: 10px; +} +[dir='rtl'] .map-in-map { + right: 10px; +} .map-in-map-tiles { transform-origin: 0 0; @@ -6240,40 +7118,55 @@ img.tile-debug { } +.over-map { + position: absolute; + left: 0; + right: 0; + top: 71px; + bottom: 30px; + pointer-events: none; + display: flex; + flex-direction: row-reverse; + align-items: flex-end; +} +.over-map > * { + pointer-events: auto; +} + /* Information Panels ------------------------------------------------------- */ .info-panels { display: flex; flex-flow: row-reverse wrap-reverse; - position: absolute; + width: 100%; z-index: 1; - right: 0; - bottom: 30px; -ms-user-select: element; + pointer-events: none; } -.info-panels h1, -.info-panels h2, -.info-panels h3, -.info-panels h4, -.info-panels h5 { +.panel-container h1, +.panel-container h2, +.panel-container h3, +.panel-container h4, +.panel-container h5 { display: inline-block; margin-bottom: 0; } -.info-panels h1, -.info-panels h2, -.info-panels h3 { +.panel-container h1, +.panel-container h2, +.panel-container h3 { color: #ff8; } .panel-container { flex: 0 0 auto; - margin: 2px 0 0 2px; + margin: 0 2px 2px 0; border-radius: 4px; border: 1px solid rgba(0, 0, 0, 0.75); padding-bottom: 10px; width: 250px; + pointer-events: auto; } .panel-container .panel-title { @@ -6334,12 +7227,9 @@ img.tile-debug { margin-left: auto; margin-right: 8px; } - -.panel-content-history .view-history-on-osm { - display: block; - margin-top: 10px; +.panel-content-history h4 { + padding-bottom: 0; } - .panel-content-location .location-info { margin-top: 10px; } @@ -6569,6 +7459,9 @@ img.tile-debug { margin-right: 5px; padding: 5px 5px 5px 0; } +#about-list li:empty { + display: none; +} #about-list li:last-child { border-left: 0; @@ -6579,20 +7472,45 @@ img.tile-debug { border-right: none; } -.source-switch a { - padding: 2px 4px 4px 4px; +#about-list a.chip { + padding: 2px 4px 3px 4px; border-radius: 2px; + color: #eee; +} +#about-list a.chip .icon { + width: 14px; + height: 14px; + margin-top: 3px; +} +[dir='ltr'] #about-list a.chip .icon, +[dir='ltr'] #about-list a.chip span { + margin-right: 3px; +} +[dir='rtl'] #about-list a.chip .icon, +[dir='rtl'] #about-list a.chip span { + margin-left: 3px; } -.source-switch a.live { + +.source-switch a.chip.live { background: #d32232; color: #fff; } -.feature-warning a { +.feature-warning a.chip { background: #1e90ff; - padding: 2px 4px 4px 4px; - border-radius: 2px; - color: #eee; +} + +.issues-info a.chip.resolved-count { + background: #15911E; +} +.issues-info a.chip.warnings-count { + background: #DF8500; +} +[dir='ltr'] .issues-info a.chip:not(:last-child) { + margin-right: 5px; +} +[dir='rtl'] .issues-info a.chip:not(:last-child) { + margin-left: 5px; } .user-list a:not(:last-child):after { @@ -6648,7 +7566,7 @@ img.tile-debug { vertical-align: baseline; width: 11px; height: 11px; - fill: #fff; + color: #fff; } /* For text (e.g. upcoming events) */ @@ -6682,6 +7600,9 @@ img.tile-debug { right: 0; margin: auto; z-index: 50; + width: 50%; + min-width: 200px; + max-width: 600px; } .modal .loader { @@ -6692,7 +7613,7 @@ img.tile-debug { } .shaded { - z-index: 49; + z-index: 5000; position: absolute; top: 0; bottom: 0; @@ -6747,7 +7668,9 @@ img.tile-debug { .loading-modal { text-align: center; } - +.modal-actions { + display: flex; +} .modal-actions button { font-weight: normal; color: #7092ff; @@ -6755,7 +7678,7 @@ img.tile-debug { border-radius: 0; height: 160px; text-align: center; - display: inline-block; + width: 100%; } .modal-actions button:hover { background-color: #ececec; @@ -6931,11 +7854,11 @@ img.tile-debug { .modal-shortcuts .shortcut-tab { display: flex; flex-flow: row wrap; + justify-content: center; } .modal-shortcuts .shortcut-column { - flex: 1 1 50%; - width: 50%; + width: auto; } .modal-shortcuts .shortcut-tab-tools .shortcut-column { @@ -6955,6 +7878,7 @@ img.tile-debug { padding: 0 10px; color: #767676; text-align: right; + white-space: nowrap; } [dir='rtl'] .modal-shortcuts .shortcut-keys { text-align: left; @@ -7071,14 +7995,6 @@ svg.mouseclick use.right { margin-bottom: 10px; } -.mode-save .warning-section { - background: #ffb; -} - -.mode-save .error-section { - background: #ffa5a5; -} - .mode-save .warning-section .changeset-list button { border-left: 1px solid #ccc; } @@ -7168,7 +8084,7 @@ svg.mouseclick use.right { ------------------------------------------------------- */ .notice { position: absolute; - top: 45px; + top: 15px; left: 0; right: 0; text-align: center; @@ -7182,7 +8098,8 @@ svg.mouseclick use.right { border-radius: 8px; } -.notice .zoom-to:hover { +.notice .zoom-to:hover, +.notice .zoom-to:focus { background: rgba(0,0,0,0.6); } @@ -7207,9 +8124,12 @@ svg.mouseclick use.right { font-size: 12px; white-space: initial; } +.tooltip:not(.curtain-tooltip) { + pointer-events: none; +} .tooltip.in { opacity: 0.9; - z-index: 1030; + z-index: 5000; height: auto; display: block; } @@ -7350,22 +8270,29 @@ svg.mouseclick use.right { } /* dark tooltips for sidebar / panels */ +.tooltip.dark.top .tooltip-arrow, .map-pane .tooltip.top .tooltip-arrow, #sidebar .tooltip.top .tooltip-arrow { border-top-color: #000; } +.tooltip.dark.bottom .tooltip-arrow, .map-pane .tooltip.bottom .tooltip-arrow, #sidebar .tooltip.bottom .tooltip-arrow { border-bottom-color: #000; } +.tooltip.dark.left .tooltip-arrow, .map-pane .tooltip.left .tooltip-arrow, #sidebar .tooltip.left .tooltip-arrow { border-left-color: #000; } +.tooltip.dark.right .tooltip-arrow, .map-pane .tooltip.right .tooltip-arrow, #sidebar .tooltip.right .tooltip-arrow { border-right-color: #000; } +.tooltip.dark .tooltip-inner, +.tooltip.dark .tooltip-heading, +.tooltip.dark .keyhint-wrap, .map-pane .tooltip-inner, .map-pane .tooltip-heading, .map-pane .keyhint-wrap, @@ -7392,13 +8319,34 @@ svg.mouseclick use.right { } /* Move over tooltips that are near the edge of screen */ -button.sidebar-toggle .tooltip .tooltip-arrow { - left: 36px; +[dir='ltr'] .sidebar-toggle .tooltip { + left: 0 !important; +} +[dir='rtl'] .sidebar-toggle .tooltip { + right: 0 !important; +} +[dir='ltr'] .sidebar-toggle .tooltip .tooltip-arrow { + left: 20px; +} +[dir='rtl'] .sidebar-toggle .tooltip .tooltip-arrow { + right: 20px; +} +[dir='ltr'] .save .tooltip { + left: auto !important; + right: 0 !important; +} +[dir='rtl'] .save .tooltip { + right: auto !important; + left: 0 !important; } -[dir='rtl'] button.sidebar-toggle .tooltip .tooltip-arrow { +[dir='ltr'] .save .tooltip .tooltip-arrow { left: auto; right: 36px; } +[dir='rtl'] .save .tooltip .tooltip-arrow { + right: auto; + left: 36px; +} li:first-of-type .badge .tooltip, li.hide + li.version .badge .tooltip { @@ -7633,8 +8581,8 @@ li.hide + li.version .badge .tooltip .tooltip-arrow { padding: 10px 20px 0 20px; } -[dir='rtl'] .curtain-tooltip .tooltip-inner .button-section button.col8 { - float: right; +.curtain-tooltip .tooltip-inner .button-section button { + width: 66.6666%; } .curtain-tooltip .tooltip-inner .instruction:only-child { @@ -7706,3 +8654,12 @@ li.hide + li.version .badge .tooltip .tooltip-arrow { width: 100px; color: #7092ff; } + + +.list-item-photos.list-item-mapillary-map-features .request-data-link { + float: right; + margin-top: -20px; +} +[dir='rtl'] .list-item-photos.list-item-mapillary-map-features .request-data-link { + float: left; +}