X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/542c45db01c64d783bab242c88f8b9714ba65795..407b7d717d3fca9c70504e7755b4428d68870fff:/vendor/assets/iD/iD.css.erb diff --git a/vendor/assets/iD/iD.css.erb b/vendor/assets/iD/iD.css.erb index 10f74a6e6..a1348383c 100644 --- a/vendor/assets/iD/iD.css.erb +++ b/vendor/assets/iD/iD.css.erb @@ -253,10 +253,22 @@ g.vertex.shared .stroke { } g.midpoint .fill { - fill: #ddd; - stroke: black; - stroke-opacity: .5; - opacity: .5; + fill: #eee; + stroke: #444; + stroke-opacity: .6; + opacity: .7; +} + +g.midpoint.tag-highway-pedestrian .fill, +g.midpoint.tag-highway-steps .fill, +g.midpoint.tag-highway-path .fill, +g.midpoint.tag-highway-footway .fill, +g.midpoint.tag-highway-cycleway .fill, +g.midpoint.tag-highway-bridleway .fill { + fill: #fff; + stroke: #333; + stroke-opacity: .8; + opacity: .8; } g.vertex .shadow, @@ -361,26 +373,27 @@ path.fill.tag-natural-water { background-color: rgba(119, 211, 222, 0.3); } -path.stroke.tag-amenity-school { - stroke: rgb(255, 255, 148); -} -path.fill.tag-amenity-school { - fill: rgba(255, 255, 148, 0.2); -} -.preset-icon-fill-area.tag-amenity-school { - border-color: rgb(255, 255, 148); - background-color: rgba(255, 255, 148, 0.2); -} - +path.stroke.tag-amenity-childcare, +path.stroke.tag-amenity-kindergarten, +path.stroke.tag-amenity-school, +path.stroke.tag-amenity-college, path.stroke.tag-amenity-university { stroke: rgb(255, 255, 148); } +path.fill.tag-amenity-childcare, +path.fill.tag-amenity-kindergarten, +path.fill.tag-amenity-school, +path.fill.tag-amenity-college, path.fill.tag-amenity-university { - fill: rgba(255, 255, 148, 0.1); + fill: rgba(255, 255, 148, 0.15); } +.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(255, 255, 148); - background-color: rgba(255, 255, 148, 0.1); + background-color: rgba(255, 255, 148, 0.15); } path.stroke.tag-landuse, @@ -412,40 +425,51 @@ path.fill.tag-leisure-park { background-color: rgba(140, 208, 95, 0.2); } +path.fill.tag-landuse-residential, +path.fill.tag-landuse-retail, +path.fill.tag-landuse-commercial, +path.fill.tag-landuse-industrial { + fill: none; + stroke-width: 60px; +} + path.stroke.tag-landuse-residential { - stroke: rgb(224, 110, 95); + stroke: rgb(196, 189, 25); } path.fill.tag-landuse-residential { - fill: rgba(224, 110, 95, 0.1); + stroke: rgba(196, 189, 25, 0.3); } .preset-icon-fill-area.tag-landuse-residential { - border-color: rgb(224, 110, 95); - background-color: rgba(224, 110, 95, 0.1); + border-color: rgb(196, 189, 25); + background: none; + box-shadow: inset 0 0 0 5px rgba(196, 189, 25, 0.3); } path.stroke.tag-landuse-retail, path.stroke.tag-landuse-commercial { - stroke: rgb(234, 176, 86); + stroke: rgb(214, 136, 26); } path.fill.tag-landuse-retail, path.fill.tag-landuse-commercial { - fill: rgba(234, 176, 86, 0.1); + stroke: rgba(214, 136, 26, 0.3); } .preset-icon-fill-area.tag-landuse-retail, .preset-icon-fill-area.tag-landuse-commercial { - border-color: rgb(234, 176, 86); - background-color: rgba(234, 176, 86, 0.1); + border-color: rgb(214, 136, 26); + background: none; + box-shadow: inset 0 0 0 5px rgba(214, 136, 26, 0.3); } path.stroke.tag-landuse-industrial { stroke: rgb(228, 164, 245); } path.fill.tag-landuse-industrial { - fill: rgba(228, 164, 245, 0.1); + stroke: rgba(228, 164, 245, 0.3); } .preset-icon-fill-area.tag-landuse-industrial { border-color: rgb(228, 164, 245); - background-color: rgba(228, 164, 245, 0.1); + background: none; + box-shadow: inset 0 0 0 5px rgba(228, 164, 245, 0.3); } path.stroke.tag-landuse-basin, @@ -485,22 +509,22 @@ path.fill.tag-landuse-landfill { } path.stroke.tag-landuse-construction { - stroke: rgb(224, 110, 95); + stroke: rgb(196, 189, 25); } .pattern-color-construction { - fill: rgba(224, 110, 95, 0.2); + fill: rgba(196, 189, 25, 0.2); } .preset-icon-fill-area.tag-landuse-construction { - border-color: rgb(224, 110, 95); - background-color: rgba(224, 110, 95, 0.2); + border-color: rgb(196, 189, 25); + background-color: rgba(196, 189, 25, 0.2); } path.stroke.tag-landuse-military { - stroke: rgb(224, 110, 95); + stroke: rgb(214, 136, 26); } .preset-icon-fill-area.tag-landuse-military { - border-color: rgb(224, 110, 95); - background-color: rgba(224, 110, 95, 0.2); + border-color: rgb(214, 136, 26); + background-color: rgba(214, 136, 26, 0.2); } path.stroke.tag-natural-wetland { @@ -1279,6 +1303,36 @@ text.gpx { fill:#FF26D4; } +/* Mapillary Layer */ + +.layer-mapillary { + pointer-events: none; +} + +.layer-mapillary g { + pointer-events: visible; + cursor: pointer; /* Opera */ + cursor: url(<%= asset_path("iD/img/cursor-select-mapillary.png") %>) 6 1, pointer; /* FF */ +} + +.layer-mapillary g * { + stroke-width: 2; + stroke: #ffc600; + fill: #ffc600; +} + +.layer-mapillary g:hover * { + stroke-width: 2; + stroke: #ff9900; + fill: #ff9900; +} + +.layer-mapillary g.selected * { + stroke-width: 4; + stroke: #ff5800; + fill: #ff5800; +} + /* Modes */ .mode-draw-line .vertex.active, @@ -1644,6 +1698,7 @@ a.hide { right: -100%; } + .pane { position:absolute; width:50%; @@ -2020,6 +2075,48 @@ a:hover .icon.out-link { background-position: -500px -14px;} bottom: 0; } +.mapillary-image { + position: absolute; + right: 0; + bottom: 30px; + width: 330px; + height: 250px; + padding: 5px; + background-color: #fff; +} + +.mapillary-image a { + display: block; + position: absolute; + height: auto; + background-color: rgba(0,0,0,.5); + bottom: 0; + right: 0; + padding: 5px 10px; +} + +.mapillary-image img { + width: 100%; + height: auto; + display: block; +} + +.mapillary-image.hidden { + visibility: hidden; +} + +.mapillary-image.temp button { + display: none; +} + +.mapillary-image button { + border-radius: 0; + padding: 5px; + position: absolute; + right: 0; + top: 0; +} + .feature-list-pane .inspector-body { top: 120px; }