X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/714d3d9e2dec7f5449053fb3b536fd850d368aa2..724d92d5f1992a2327982144e66697516ab82d8b:/vendor/assets/iD/iD.css.erb diff --git a/vendor/assets/iD/iD.css.erb b/vendor/assets/iD/iD.css.erb index 34dd9e070..ed2a14b2f 100644 --- a/vendor/assets/iD/iD.css.erb +++ b/vendor/assets/iD/iD.css.erb @@ -305,7 +305,7 @@ g.vertex.selected .shadow { /* lines */ -.preset-icon .icon.other-line { +.preset-icon .icon.iD-other-line { color: #fff; fill: #777; } @@ -802,8 +802,8 @@ path.stroke.tag-highway { stroke-width: 5; } -.preset-icon .icon.highway-motorway, -.preset-icon .icon.highway-motorway-link { +.preset-icon .icon.iD-highway-motorway, +.preset-icon .icon.iD-highway-motorway-link { color: #CF2081; fill: #70372f; } @@ -818,8 +818,8 @@ path.casing.tag-motorway { stroke:#70372f; } -.preset-icon .icon.highway-trunk, -.preset-icon .icon.highway-trunk-link { +.preset-icon .icon.iD-highway-trunk, +.preset-icon .icon.iD-highway-trunk-link { color: #DD2F22; fill: #70372f; } @@ -834,8 +834,8 @@ path.casing.tag-trunk { stroke:#70372f; } -.preset-icon .icon.highway-primary, -.preset-icon .icon.highway-primary-link { +.preset-icon .icon.iD-highway-primary, +.preset-icon .icon.iD-highway-primary-link { color: #F99806; fill: #70372f; } @@ -850,8 +850,8 @@ path.casing.tag-primary { stroke:#70372f; } -.preset-icon .icon.highway-secondary, -.preset-icon .icon.highway-secondary-link { +.preset-icon .icon.iD-highway-secondary, +.preset-icon .icon.iD-highway-secondary-link { color: #F3F312; fill: #70372f; } @@ -866,8 +866,8 @@ path.casing.tag-secondary { stroke:#70372f; } -.preset-icon .icon.highway-tertiary, -.preset-icon .icon.highway-tertiary-link { +.preset-icon .icon.iD-highway-tertiary, +.preset-icon .icon.iD-highway-tertiary-link { color: #FFF9B3; fill: #70372f; } @@ -882,8 +882,8 @@ path.casing.tag-tertiary { stroke:#70372f; } -.legacy-carto .preset-icon .icon.highway-motorway, -.legacy-carto .preset-icon .icon.highway-motorway-link { +.legacy-carto .preset-icon .icon.iD-highway-motorway, +.legacy-carto .preset-icon .icon.iD-highway-motorway-link { color: #58a9ed; fill: #2c5476; } @@ -898,8 +898,8 @@ path.casing.tag-tertiary { stroke:#2c5476; } -.legacy-carto .preset-icon .icon.highway-trunk, -.legacy-carto .preset-icon .icon.highway-trunk-link { +.legacy-carto .preset-icon .icon.iD-highway-trunk, +.legacy-carto .preset-icon .icon.iD-highway-trunk-link { color: #8cd05f; fill: #46682f; } @@ -914,8 +914,8 @@ path.casing.tag-tertiary { stroke:#46682f; } -.legacy-carto .preset-icon .icon.highway-primary, -.legacy-carto .preset-icon .icon.highway-primary-link { +.legacy-carto .preset-icon .icon.iD-highway-primary, +.legacy-carto .preset-icon .icon.iD-highway-primary-link { color: #e06d5f; fill: #70372f; } @@ -930,8 +930,8 @@ path.casing.tag-tertiary { stroke:#70372f; } -.legacy-carto .preset-icon .icon.highway-secondary, -.legacy-carto .preset-icon .icon.highway-secondary-link { +.legacy-carto .preset-icon .icon.iD-highway-secondary, +.legacy-carto .preset-icon .icon.iD-highway-secondary-link { color: #eab056; fill: #75582b; } @@ -946,8 +946,8 @@ path.casing.tag-tertiary { stroke:#75582b; } -.legacy-carto .preset-icon .icon.highway-tertiary, -.legacy-carto .preset-icon .icon.highway-tertiary-link { +.legacy-carto .preset-icon .icon.iD-highway-tertiary, +.legacy-carto .preset-icon .icon.iD-highway-tertiary-link { color: #ffff7e; fill: #7f7f3f; } @@ -962,7 +962,7 @@ path.casing.tag-tertiary { stroke:#7f7f3f; } -.preset-icon .icon.highway-residential { +.preset-icon .icon.iD-highway-residential { color: #fff; fill: #444; } @@ -975,7 +975,7 @@ path.casing.tag-residential { stroke:#444; } -.preset-icon .icon.highway-unclassified { +.preset-icon .icon.iD-highway-unclassified { color: #dcd9b9; fill: #444; } @@ -1158,7 +1158,7 @@ path.stroke.tag-steps { } -.preset-icon .icon.highway-living-street { +.preset-icon .icon.iD-highway-living-street { color: #bbb; fill: #ddd; } @@ -1171,8 +1171,8 @@ path.casing.tag-living_street { stroke: #fff; } -.preset-icon .icon.highway-footway.tag-highway-corridor, -.preset-icon .icon.highway-footway.tag-highway-pedestrian { +.preset-icon .icon.iD-highway-footway.tag-highway-corridor, +.preset-icon .icon.iD-highway-footway.tag-highway-pedestrian { color: #8cd05f; fill: #fff; } @@ -1202,7 +1202,7 @@ path.casing.tag-pedestrian.tag-unpaved { stroke-dasharray: none; } -.preset-icon .icon.highway-road { +.preset-icon .icon.iD-highway-road { color: #9e9e9e; fill: #666; } @@ -1215,7 +1215,7 @@ path.casing.tag-road { stroke:#666; } -.preset-icon .icon.highway-service { +.preset-icon .icon.iD-highway-service { color: #fff; fill: #666; } @@ -1230,8 +1230,8 @@ path.casing.tag-service { /* special service roads and bus guideways */ /* with `service=* tag` (e.g. parking_aisle, alley, drive-through */ -.preset-icon .icon.highway-bus_guideway, -.preset-icon .icon.highway-service.tag-service { +.preset-icon .icon.iD-highway-bus_guideway, +.preset-icon .icon.iD-highway-service.tag-service { color: #dcd9b9; fill: #666; } @@ -1246,7 +1246,7 @@ path.casing.tag-service.tag-service { stroke: #666; } -.preset-icon .icon.highway-track { +.preset-icon .icon.iD-highway-track { color: #eaeaea; fill: #c5b59f; } @@ -1291,8 +1291,8 @@ path.casing.tag-highway-bridleway.tag-unpaved { stroke-dasharray: none; } -.preset-icon .icon.category-path, -.preset-icon .icon.highway-path { +.preset-icon .icon.iD-category-path, +.preset-icon .icon.iD-highway-path { color: #746f6f; fill: #c5b59f; } @@ -1302,7 +1302,7 @@ path.stroke.tag-highway-path { .preset-icon .icon.tag-route-foot, .preset-icon .icon.tag-route-hiking, -.preset-icon .icon.highway-footway { +.preset-icon .icon.iD-highway-footway { color: #ae8681; fill: #fff; } @@ -1310,7 +1310,7 @@ path.stroke.tag-highway-footway { stroke: #ae8681; } -.preset-icon .icon.highway-footway.tag-crossing { +.preset-icon .icon.iD-highway-footway.tag-crossing { color: #444; } path.stroke.tag-highway-footway.tag-crossing { @@ -1322,7 +1322,7 @@ path.stroke.tag-highway-footway.tag-crossing { } .preset-icon .icon.tag-route-bicycle, -.preset-icon .icon.highway-cycleway { +.preset-icon .icon.iD-highway-cycleway { color: #58a9ed; fill: #fff; } @@ -1331,7 +1331,7 @@ path.stroke.tag-highway-cycleway { } .preset-icon .icon.tag-route-horse, -.preset-icon .icon.highway-bridleway { +.preset-icon .icon.iD-highway-bridleway { color: #e06d5f; fill: #fff; } @@ -1339,7 +1339,7 @@ path.stroke.tag-highway-bridleway { stroke: #e06d5f; } -.preset-icon .icon.highway-steps { +.preset-icon .icon.iD-highway-steps { color: #81d25c; fill: #fff; } @@ -1551,7 +1551,7 @@ path.stroke.tag-railway-subway { /* railway platforms - like sidewalks */ -.preset-icon .icon.highway-footway.tag-railway-platform { +.preset-icon .icon.iD-highway-footway.tag-railway-platform { color: #ae8681; fill: #dcd9b9; } @@ -1595,7 +1595,7 @@ g.midpoint.tag-railway-platform .fill { color: #77d3de; fill: #77d3de; } -.preset-icon .icon.category-water, +.preset-icon .icon.iD-category-water, .preset-icon .icon.tag-route-ferry, .preset-icon .icon.tag-type-waterway, .preset-icon .icon.tag-waterway { @@ -1904,20 +1904,56 @@ path.casing.tag-status { /* Buildings */ -path.stroke.tag-building, -path.stroke.tag-amenity-shelter { +path.stroke.tag-building { stroke: rgb(224, 110, 95); } -path.fill.tag-building, -path.fill.tag-amenity-shelter { +path.fill.tag-building { stroke: rgba(224, 110, 95, 0.3); fill: rgba(224, 110, 95, 0.3); } -.preset-icon-fill-area.tag-building, -.preset-icon-fill-area.tag-amenity-shelter { +.preset-icon-fill-area.tag-building { border-color: rgb(224, 110, 95); background-color: rgba(224, 110, 95, 0.3); } + +/* piers */ +.preset-icon .icon.tag-man_made-pier { + color: #ae8681; + fill: #dcd9b9; +} + +.preset-icon-fill-area.tag-man_made-pier { + border-color: #ae8681; + background-color: #dcd9b9; +} + +path.shadow.tag-man_made-pier { + stroke-width: 16; +} +path.casing.tag-man_made-pier { + stroke: #dcd9b9; + stroke-width: 5; + stroke-linecap: round; + stroke-dasharray: none; +} +path.stroke.tag-man_made-pier { + stroke: #ae8681; + stroke-width: 3; + stroke-linecap: butt; + stroke-dasharray: 6, 6; +} + +.low-zoom path.shadow.tag-man_made-pier { + stroke-width: 12; +} +.low-zoom path.casing.tag-man_made-pier { + stroke-width: 3; +} +.low-zoom path.stroke.tag-man_made-pier { + stroke-width: 1; + stroke-linecap: butt; + stroke-dasharray: 3, 3; +} /* Cursors */ .nope, @@ -1983,20 +2019,20 @@ path.fill.tag-amenity-shelter { cursor: url(<%= asset_path("iD/img/cursor-draw.png") %>) 9 9, crosshair; /* FF */ } -.mode-draw-line .way.hover, -.mode-draw-area .way.hover, -.mode-add-line .way.hover, -.mode-add-area .way.hover, -.mode-drag-node .way.hover { +.mode-draw-line .way.target, +.mode-draw-area .way.target, +.mode-add-line .way.target, +.mode-add-area .way.target, +.mode-drag-node .way.target { cursor: crosshair; /* Opera */ cursor: url(<%= asset_path("iD/img/cursor-draw-connect-line.png") %>) 9 9, crosshair; /* FF */ } -.mode-draw-line .vertex.hover, -.mode-draw-area .vertex.hover, -.mode-add-line .vertex.hover, -.mode-add-area .vertex.hover, -.mode-drag-node .vertex.hover { +.mode-draw-line .vertex.target, +.mode-draw-area .vertex.target, +.mode-add-line .vertex.target, +.mode-add-area .vertex.target, +.mode-drag-node .vertex.target { cursor: crosshair; /* Opera */ cursor: url(<%= asset_path("iD/img/cursor-draw-connect-vertex.png") %>) 9 9, crosshair; /* FF */ } @@ -2045,12 +2081,13 @@ path.fill.tag-amenity-shelter { } .photo-wrapper .photo-attribution { - width: 100%; - font-size: 10px; - text-align: right; position: absolute; bottom: 0; right: 0; + width: 100%; + font-size: 10px; + text-align: right; + line-height: 1.1em; padding: 4px 2px; z-index: 10; } @@ -2133,6 +2170,19 @@ path.fill.tag-amenity-shelter { } +/* Streetside Image Layer */ +.layer-streetside-images { + pointer-events: none; +} +.layer-streetside-images .viewfield-group * { + fill: #0fffc4; +} +.layer-streetside-images .sequence { + stroke: #0fffc4; + stroke-opacity: 0.85; /* bump opacity - only one per road */ +} + + /* Mapillary Image Layer */ .layer-mapillary-images { pointer-events: none; @@ -2149,25 +2199,18 @@ path.fill.tag-amenity-shelter { .layer-mapillary-signs { pointer-events: none; } -.layer-mapillary-signs .icon-sign .icon-sign-body { - min-width: 20px; - height: 24px; - width: 24px; +.layer-mapillary-signs .icon-sign { outline: 2px solid transparent; pointer-events: visible; cursor: pointer; - z-index: 30; - overflow: visible; } -.layer-mapillary-signs .icon-sign:hover .icon-sign-body { +.layer-mapillary-signs .icon-sign:hover { outline: 5px solid #eebb00; background-color: #eebb00; - z-index: 70; } -.layer-mapillary-signs .icon-sign.selected .icon-sign-body { +.layer-mapillary-signs .icon-sign.selected { outline: 5px solid #ffee00; background-color: #ffee00; - z-index: 40; } @@ -2176,10 +2219,44 @@ path.fill.tag-amenity-shelter { pointer-events: none; } .layer-openstreetcam-images .viewfield-group * { - fill: #77ddff; + fill: #20c4ff; } .layer-openstreetcam-images .sequence { - stroke: #77ddff; + stroke: #20c4ff; +} + + +/* Streetside Viewer (pannellum) */ +.ms-wrapper .photo-attribution .image_link { + display: block; +} +.ms-wrapper .photo-attribution a:active, +.ms-wrapper .photo-attribution a:hover { + color: #0fffc4; +} + +.ms-wrapper .pnlm-compass.pnlm-control { + width: 26px; + height: 26px; + left: 4px; + top: 60px; + background-size: contain; + background-repeat: no-repeat no-repeat; +} + +label.streetside-hires { + float: left; + padding: 0 10px; + cursor: pointer; +} +.streetside-hires span { + margin-top: 2px; +} +.streetside-hires input[type="checkbox"] { + float: left; + width: 12px; + height: 12px; + margin: 0 5px; } @@ -2205,6 +2282,7 @@ path.fill.tag-amenity-shelter { z-index: 9; } + /* OpenStreetCam viewer */ .osc-wrapper { position: relative; @@ -2216,7 +2294,7 @@ path.fill.tag-amenity-shelter { .osc-wrapper .photo-attribution a:active, .osc-wrapper .photo-attribution a:hover { - color: #77ddff; + color: #20c4ff; } .osc-controls-wrap { @@ -3299,13 +3377,11 @@ a.hide-toggle { position: absolute; top: 7px; left: 7px; - height: 42px; - width: 42px; margin: auto; } [dir='rtl'] .preset-icon-frame { - left: auto; - right: 7px; + left: auto; + right: 7px; } .preset-icon-frame .icon {