X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/5ffdceeb4d5e66ce3029f372e84554d28673e690..b8a59201bc584a6f8e23e0a1b7f93fc32379f825:/vendor/assets/iD/iD.css.erb diff --git a/vendor/assets/iD/iD.css.erb b/vendor/assets/iD/iD.css.erb index 3a0c420fa..f0a144132 100644 --- a/vendor/assets/iD/iD.css.erb +++ b/vendor/assets/iD/iD.css.erb @@ -161,37 +161,15 @@ input::-moz-focus-inner { .cf:after { clear: both; } -/* tiles */ -img.tile { - position:absolute; - transform-origin:0 0; - -ms-transform-origin:0 0; - -webkit-transform-origin:0 0; - -moz-transform-origin:0 0; - -o-transform-origin:0 0; - - opacity: 0; - - -webkit-transition: opacity 200ms linear; - transition: opacity 200ms linear; - -moz-transition: opacity 200ms linear; -} - -img.tile-loaded { - opacity: 1; -} -img.tile-removing { - opacity: 0; -} use { pointer-events: none; } /* base styles */ -.layer path:not(.oneway) { fill: none; } /* IE needs :not(.oneway) */ +.layer-osm path:not(.oneway) { fill: none; } /* IE needs :not(.oneway) */ /* the above fill: none rule affects paths in shadow dom only in Firefox */ -.layer use.icon path { fill: #333; } /* FF svg Maki icons */ -.layer .turn use path { fill: #000; } /* FF turn restriction icons */ +.layer-osm use.icon path { fill: #333; } /* FF svg Maki icons */ +.layer-osm .turn use path { fill: #000; } /* FF turn restriction icons */ #turn-only-shape2, #turn-only-u-shape2 { fill: #7092FF; } /* FF turn-only, turn-only-u */ #turn-no-shape2, #turn-no-u-shape2 { fill: #E06D5F; } /* FF turn-no, turn-no-u */ #turn-yes-shape2, #turn-yes-u-shape2 { fill: #8CD05F; } /* FF turn-yes, turn-yes-u */ @@ -402,17 +380,23 @@ path.fill.tag-leisure-park { background-color: rgba(140, 208, 95, 0.3); } +path.stroke.tag-amenity-swimming_pool, +path.stroke.tag-leisure-swimming_pool, path.stroke.tag-natural-water, path.stroke.tag-landuse-basin, path.stroke.tag-landuse-reservoir { stroke: rgb(119, 211, 222); } +path.fill.tag-amenity-swimming_pool, +path.fill.tag-leisure-swimming_pool, path.fill.tag-landuse-basin, path.fill.tag-landuse-reservoir, 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-swimming_pool, +.preset-icon-fill-area.tag-leisure-swimming_pool, .preset-icon-fill-area.tag-landuse-basin, .preset-icon-fill-area.tag-landuse-reservoir, .preset-icon-fill-area.tag-natural-water { @@ -810,19 +794,6 @@ path.casing.tag-tertiary { stroke:#7f7f3f; } -.preset-icon .icon.highway-unclassified { - color: #eaeaea; - fill: #444; -} -path.stroke.tag-highway-unclassified, -path.stroke.tag-unclassified { - stroke:#eaeaea; -} -path.casing.tag-highway-unclassified, -path.casing.tag-unclassified { - stroke:#444; -} - .preset-icon .icon.highway-residential { color: #fff; fill: #444; @@ -836,6 +807,20 @@ path.casing.tag-residential { stroke:#444; } +.preset-icon .icon.highway-unclassified { + color: #dcd9b9; + fill: #444; +} +path.stroke.tag-highway-unclassified, +path.stroke.tag-unclassified { + stroke:#dcd9b9; +} +path.casing.tag-highway-unclassified, +path.casing.tag-unclassified { + stroke:#444; +} + + /* narrow highways */ path.stroke.tag-highway-living_street, path.stroke.tag-highway-service, @@ -1073,6 +1058,7 @@ path.stroke.tag-highway-cycleway { stroke: #58a9ed; } +.preset-icon .icon.tag-route-horse, .preset-icon .icon.highway-bridleway { color: #e06d5f; fill: #fff; @@ -1417,7 +1403,7 @@ path.shadow.tag-cutting { /* Surface - unpaved */ path.casing.tag-unpaved { - stroke: #eaeaea; + stroke: #ccc; stroke-linecap: butt; stroke-dasharray: 4, 3; } @@ -1649,7 +1635,7 @@ g.turn circle { } /* GPX Paths */ -div.layer-gpx { +.layer-gpx { pointer-events: none; } @@ -1663,43 +1649,84 @@ text.gpx { fill: #FF26D4; } -/* Mapillary Layer */ +/* Mapillary Image Layer */ -.layer-mapillary { +.layer-mapillary-images { pointer-events: none; } -.layer-mapillary g { +.layer-mapillary-images .viewfield-group { pointer-events: visible; cursor: pointer; /* Opera */ cursor: url(<%= asset_path("iD/img/cursor-select-mapillary.png") %>) 6 1, pointer; /* FF */ } -.layer-mapillary g * { +.layer-mapillary-images .viewfield-group * { stroke-width: 1; stroke: #444; fill: #ffc600; + z-index: 50; } -.layer-mapillary g:hover * { +.layer-mapillary-images .viewfield-group:hover * { stroke-width: 1; stroke: #333; fill: #ff9900; + z-index: 60; } -.layer-mapillary g.selected * { +.layer-mapillary-images .viewfield-group.selected * { stroke-width: 2; stroke: #222; fill: #ff5800; + z-index: 60; } -.layer-mapillary g:hover path.viewfield, -.layer-mapillary g.selected path.viewfield, -.layer-mapillary g path.viewfield { +.layer-mapillary-images .viewfield-group:hover path.viewfield, +.layer-mapillary-images .viewfield-group.selected path.viewfield, +.layer-mapillary-images .viewfield-group path.viewfield { stroke-width: 0; fill-opacity: 0.6; } +/* Mapillary Sign Layer */ + +.layer-mapillary-signs { + pointer-events: none; +} + +.layer-mapillary-signs .icon-sign body { + min-width: 20px; + height: 28px; + width: 28px; + border: 2px solid transparent; + pointer-events: visible; + cursor: pointer; /* Opera */ + cursor: url(<%= asset_path("iD/img/cursor-select-mapillary.png") %>) 6 1, pointer; /* FF */ + z-index: 70; +} + +.layer-mapillary-signs .icon-sign:hover body { + border: 2px solid rgba(255,198,0,0.8); + z-index: 80; + } + +.layer-mapillary-signs .icon-sign.selected body { + border: 2px solid rgba(255,0,0,0.8); + z-index: 80; + } + +.layer-mapillary-signs .icon-sign .t { + font-size: 28px; + z-index: 70; + position: absolute; +} + +.layer-mapillary-signs .icon-sign:hover .t, +.layer-mapillary-signs .icon-sign.selected .t { + z-index: 80; +} + /* Modes */ .mode-draw-line .vertex.active, @@ -1920,6 +1947,7 @@ input[type=url], input[type=tel], input[type=email] { background-color: white; + color: #333; border:1px solid #ccc; padding:5px 10px; height:30px; @@ -2056,7 +2084,10 @@ ul li { list-style: none;} .fl { float: left;} .fr { float: right;} +.al { left: 0; } +.ar { right: 0; } +input.hide, div.hide, form.hide, button.hide, @@ -2124,7 +2155,7 @@ button:hover { button[disabled], button.disabled { background-color: rgba(255,255,255,.25); - color: rgba(0,0,0,.5); + color: rgba(0,0,0,.4); cursor: auto; } @@ -2219,7 +2250,9 @@ button.save.has-count .count { display: block; position: absolute; top: 5px; - background: rgba(255, 255, 255, .5); + background: #fff; + border-color: #fff; + opacity: 0.5; color: #333; padding: 10px; height: 30px; @@ -2240,7 +2273,9 @@ button.save.has-count .count::before { bottom: 0; border-top: 6px solid transparent; border-bottom: 6px solid transparent; - border-right: 6px solid rgba(255,255,255,.5); + border-right-width: 6px; + border-right-style: solid; + border-right-color: inherit; } /* Icons */ @@ -2414,47 +2449,8 @@ button.save.has-count .count::before { 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; @@ -2609,6 +2605,18 @@ button.save.has-count .count::before { height: 60px; } +.preset-icon-44 { + position: absolute; + top: 9px; + left: 8px; + margin: auto; +} + +.preset-icon-44 .icon { + width: 44px; + height: 44px; +} + .preset-icon-32 { position: absolute; top: 14px; @@ -2707,6 +2715,11 @@ button.save.has-count .count::before { .inspector-preset { overflow: hidden; + padding-bottom: 10px; +} + +.inspector-preset a.hide-toggle { + margin: 0 20px 10px 20px; } .inspector-preset .preset-form { @@ -2715,25 +2728,10 @@ button.save.has-count .count::before { border-radius: 8px; } -.entity-editor-pane .preset-list-item::after { - content: ""; - position: absolute; - height: 0; - width: 0; - bottom: 0; - left: 0; - right: 0; - margin: auto; - border: solid rgba(0, 0, 0, 0); - border-width: 10px; - border-bottom-color: #ececec; -} - .entity-editor-pane .preset-list-item .preset-list-button-wrap { margin-bottom: 0; } - .form-field { margin-bottom: 10px; width: 100%; @@ -2777,7 +2775,7 @@ button.save.has-count .count::before { } .form-label button { - border-left: 1px solid #CCC; + border-left: 1px solid #ccc; width: 10%; height: 100%; border-radius: 0; @@ -2800,7 +2798,7 @@ button.save.has-count .count::before { .form-field > input, .form-field > textarea, .form-field .preset-input-wrap { - border: 1px solid #CCC; + border: 1px solid #ccc; min-height: 30px; border-top: 0; border-radius: 0 0 4px 4px; @@ -2812,23 +2810,30 @@ button.save.has-count .count::before { } .inspector-border { - border-bottom: 1px solid #CCC + border-bottom: 1px solid #ccc } /* Preset form (hover mode) */ .inspector-hover .checkselect label:last-of-type, .inspector-hover .preset-input-wrap .label, +.inspector-hover .form-field-multicombo, .inspector-hover input, .inspector-hover label { background: #ececec; } .inspector-hover a, +.inspector-hover .form-field-multicombo .chips, .inspector-hover .checkselect label:last-of-type { color: #666; } +.inspector-hover .form-field-multicombo .chips { + background: #eee; + border: 1px solid #ccc; +} + /* hide and remove from layout */ .inspector-hidden, .inspector-hover label input[type="checkbox"], @@ -2837,6 +2842,7 @@ button.save.has-count .count::before { .inspector-hover .toggle-list label span, .inspector-hover .inspector-inner .add-tag, .inspector-hover .inspector-inner .add-relation, +.inspector-hover .form-field-multicombo .combobox-input, .inspector-hover .toggle-list label.remove .icon { height: 0; width: 0; @@ -2852,6 +2858,7 @@ button.save.has-count .count::before { .inspector-hover .combobox-caret, .inspector-hover .entity-editor-pane .header button, .inspector-hover .spin-control, +.inspector-hover .form-field-multicombo .chips .remove, .inspector-hover .hide-toggle:before, .inspector-hover .more-fields, .inspector-hover .form-label-button-wrap, @@ -2952,6 +2959,63 @@ button.save.has-count .count::before { border-bottom-right-radius: 4px; } +/* preset form multicombo */ + +.form-field-multicombo { + border: 1px solid #cfcfcf; + border-top: 0px; + padding: 5px 0 5px 10px; + background: #fff; + display: block; + border-radius: 0 0 4px 4px; + overflow: hidden; +} + +.form-field-multicombo:focus { + border-bottom: 0px; +} + +.form-field-multicombo.active { + border-bottom-left-radius: 0px; + border-bottom-right-radius: 0px; +} + +.form-field-multicombo li { + background-color: #eff2f7; + border: 1px solid #ccd5e3; + border-radius: 4px; + line-height: 25px; + display: inline-block; + padding: 2px 5px; + margin: 3px; + height: 30px; +} + +.form-field-multicombo a { + font-family: Arial, Helvetica, sans-serif !important; + font-size: 16px !important; + line-height: 24px; + float: right; + margin: 1px 0 0 5px; + padding: 0; + cursor: pointer; + color: #a6b4ce; +} + +.form-field-multicombo input { + border: 1px solid #ddd; + width: 100px; + margin: 3px; +} + +.form-field-multicombo .combobox-caret { + margin: 3px 3px 3px -30px; +} + +.form-field-multicombo input:focus { + border-radius: 4px !important; +} + /* preset form cycleway */ .form-field-cycleway .preset-input-wrap li { @@ -3512,7 +3576,6 @@ div.full-screen > button:hover { /* Background / Map Data Settings */ - .map-data-control button { border-radius: 0; } @@ -3526,12 +3589,8 @@ div.full-screen > button:hover { position: relative; } -.nudge-container { - border: 1px solid #CCC; -} - -.background-control .adjustments button:last-child { - border: 0; +.imagery-faq { + margin-bottom: 10px; } .map-data-control .hide-toggle, @@ -3552,6 +3611,10 @@ div.full-screen > button:hover { color: #7092FF; } +.layer-list:empty { + display: none; +} + .layer-list > li:first-child { border-radius: 3px 3px 0 0; } @@ -3572,10 +3635,23 @@ div.full-screen > button:hover { background-color: #ececec; } -.layer-list li.active { +.layer-list li.active, +.layer-list li.switch { background: #E8EBFF; } +.layer-list li.best > div.best { + display: inline-block; + padding: 5px; + float: right; +} + +/* make sure tooltip fits in map-control panel */ +/* if too wide, placement will be wrong the first time it displays */ +.layer-list li.best .tooltip-inner { + max-width: 160px; +} + .layer-list label { display: block; padding: 5px 10px; @@ -3631,15 +3707,41 @@ div.full-screen > button:hover { border-left: 4px solid transparent; } -.background-control .nudge-container button { - float: left; - display: block; - width:20%; - border-right: 1px solid #CCC; - position: relative; +/* Adjust Alignment controls */ + +.background-control .nudge-container { + border: 1px solid #ccc; + border-radius: 4px; + padding: 10px; +} + +.nudge-container .nudge-instructions { + padding-bottom: 15px; +} + +.nudge-container .nudge-outer-rect { + background-color: #eee; + border: 1px solid #ccc; + border-radius: 2px; + padding: 20px 0; + width: 70%; + display: flex; + justify-content: center; + align-items: center; + margin: 0 auto; + margin-top: 20px; + cursor: move; +} + +.nudge-container .nudge-inner-rect { + background-color: #fff; + border: 1px solid #ccc; + border-radius: 2px; + width: 65%; + min-height: 20px; } -.background-control .nudge::after { +.nudge-container .nudge::after { content: ''; display: block; position: absolute; @@ -3649,13 +3751,72 @@ div.full-screen > button:hover { width: 0; } -.background-control .nudge.left::after { +.nudge-container input { + width: 100%; + height: 20px; + text-align: center; + border: 0; +} + +.nudge-container input.error { + border: 1px solid #FF7878; + border-radius: 2px; + background: #ffb; +} + +.nudge-container input:focus { + background-color: transparent; +} + +.nudge-container button { + float: left; + display: block; + width: 20%; + position: relative; + background-color: transparent; +} + +.nudge-container button.right { + top: -50px; + right: -85%; +} + +.nudge-container button.left { + top: -50px; + right: 45%; +} + +.nudge-container button.top { + left: 20%; + top: -104px; +} + +.nudge-container button.bottom { + left: -20%; +} + +.nudge-container button.nudge-reset { + right: -10px; +} + +.nudge-surface { + position: absolute; + z-index: 5000; + left: 0; + top: 0; + width: 100%; + height: 100%; + background-color: transparent; + cursor: move; +} + +.background-control .nudge.right::after { border-top: 5px solid transparent; border-bottom: 5px solid transparent; border-left: 5px solid #222; } -.background-control .nudge.right::after { +.background-control .nudge.left::after { border-top: 5px solid transparent; border-bottom: 5px solid transparent; border-right: 5px solid #222; @@ -3786,7 +3947,7 @@ div.full-screen > button:hover { float:right; margin-left: 20px; margin-bottom: 20px; - padding-left: 5px + padding-left: 5px; } .help-wrap .toc li a, @@ -3849,6 +4010,64 @@ div.full-screen > button:hover { border-radius: 4px; } + +/* Tiles +------------------------------------------------------- */ + +img.tile { + position:absolute; + transform-origin:0 0; + -ms-transform-origin:0 0; + -webkit-transform-origin:0 0; + -moz-transform-origin:0 0; + -o-transform-origin:0 0; + + -moz-user-select: none; + -webkit-user-select: none; + -ms-user-select: none; + user-select: none; + + opacity: 0; + + -webkit-transition: opacity 200ms linear; + transition: opacity 200ms linear; + -moz-transition: opacity 200ms linear; +} + +.tile-label-debug { + background: rgba(0, 0, 0, 0.7); + color: #fff; + position: absolute; + text-align: center; + width: 128px; + border-radius: 3px; + z-index: 2; + + transform-origin:0 0; + -ms-transform-origin:0 0; + -webkit-transform-origin:0 0; + -moz-transform-origin:0 0; + -o-transform-origin:0 0; + + -moz-user-select: none; + -webkit-user-select: none; + -ms-user-select: none; + user-select: none; +} + +img.tile-debug { + border: 1px solid red; +} + +img.tile-loaded { + opacity: 1; +} + +img.tile-removing { + opacity: 0; +} + + /* Map ------------------------------------------------------- */ @@ -3865,13 +4084,14 @@ div.full-screen > button:hover { -webkit-transform-origin:0 0; -moz-transform-origin:0 0; -o-transform-origin:0 0; + -moz-user-select: none; -webkit-user-select: none; -ms-user-select: none; user-select: none; } -#supersurface, .layer-layer { +#supersurface, .layer { position: absolute; top: 0; left: 0; @@ -3881,7 +4101,6 @@ div.full-screen > button:hover { /* Map-In-Map ------------------------------------------------------- */ - .map-in-map { position: absolute; overflow: hidden; @@ -3900,14 +4119,15 @@ div.full-screen > button:hover { -webkit-transform-origin:0 0; -moz-transform-origin:0 0; -o-transform-origin:0 0; + -moz-user-select: none; -webkit-user-select: none; -ms-user-select: none; user-select: none; } -.map-in-map-svg, -.map-in-map-gpx { +.map-in-map-viewport, +.map-in-map-data { top: 0; left: 0; overflow: hidden; @@ -3915,11 +4135,11 @@ div.full-screen > button:hover { width: 100%; } -.map-in-map-svg { +.map-in-map-viewport { position: absolute; } -.map-in-map-gpx { +.map-in-map-data { position: relative; z-index: 10; } @@ -3935,6 +4155,45 @@ div.full-screen > button:hover { stroke-width: 5; } + +/* Debug +------------------------------------------------------- */ +.debug { + stroke: currentColor; + fill: none; + stroke-width: 2; +} +.map-in-map-data .debug { + stroke-width: 1; +} + +.red { color: rgba(255, 0, 0, 0.75); } +.green { color: rgba(0, 255, 0, 0.75); } +.blue { color: rgba(0, 0, 255, 0.75); } +.yellow { color: rgba(255, 255, 0, 0.75); } +.cyan { color: rgba(0, 255, 255, 0.75); } +.magenta { color: rgba(255, 0, 255, 0.75); } +.orange { color: rgba(255, 153, 0, 0.75); } +.pink { color: rgba(255, 0, 153, 0.75); } +.purple { color: rgba(153, 0, 255, 0.75); } + +.debug-legend { + position: absolute; + top: 70px; + right: 80px; + padding: 5px; + border-radius: 4px; + pointer-events: none; +} + +.debug-legend-item { + padding-right: 5px; +} +.debug-legend-item:before { + content: "\25A0"; + padding: 0 5px; +} + /* Info Box ------------------------------------------------------- */ .infobox { @@ -3947,7 +4206,7 @@ div.full-screen > button:hover { border-bottom: 1px solid black; } -.infobox .selection-heading { +.infobox .infobox-heading { display: block; border-radius: 4px 0 0 0; padding: 5px 10px; @@ -4028,6 +4287,10 @@ div.full-screen > button:hover { max-height: 30px; float: left; clear: left; + -moz-user-select: none; + -webkit-user-select: none; + -ms-user-select: none; + user-select: none; } #info-block { @@ -4040,6 +4303,10 @@ div.full-screen > button:hover { width: 100%; } +#scale:hover { + cursor: pointer; +} + #scale text { font: 12px sans-serif; stroke: none; @@ -4168,7 +4435,8 @@ div.full-screen > button:hover { vertical-align: middle; } -.save-section .buttons .action { +.save-section .buttons .action, +.save-section .buttons .secondary-action { display: inline-block; margin: 0 20px 0 0; text-align: center; @@ -4231,9 +4499,11 @@ div.full-screen > button:hover { ------------------------------------------------------- */ .save-success p { - padding: 15px; + padding: 15px 15px 0 15px; +} +.save-success a.details { + padding-left: 15px; } - .save-success .button { padding-top: 15px; } @@ -4656,8 +4926,8 @@ div.full-screen > button:hover { color: rgba(40,40,40,.5); } -.lasso-box { - fill-opacity:0.1; +.lasso-path { + fill-opacity:0.3; stroke: #fff; stroke-width: 1; stroke-opacity: 1; @@ -4812,3 +5082,44 @@ div.full-screen > button:hover { background: rgba(0, 0, 0, 0) url(<%= asset_path("iD/img/iD-sprite.svg") %>) no-repeat -300px -460px; margin: auto; } + +/* Mapillary +------------------------------------------------------- */ +.mapillary-wrap { + position: absolute; + bottom: 30px; + width: 330px; + height: 250px; + padding: 5px; + background-color: #fff; +} + +.mapillary-wrap.hidden { + visibility: hidden; +} + +.mapillary-wrap .uil-ripple-css { + top: -9px; + left: -15px; +} + +.mapillary-wrap .uil-ripple-css div { + top: 38px; +} + +.mapillary-wrap button.thumb-hide { + border-radius: 0; + padding: 5px; + position: absolute; + right: 0; + top: 0; + z-index: 500; +} + +.mly-wrapper { + visibility: hidden; +} + +.mly-wrapper.active { + visibility: visible; +}