X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/085cb8fe046046d93b4675bb3ea8f3b73a1325a5..4a9846b078c6a82d312cd6f3b9cac536dec1c00a:/vendor/assets/iD/iD.css.erb diff --git a/vendor/assets/iD/iD.css.erb b/vendor/assets/iD/iD.css.erb index 75ea2d0ac..ebe73d6a2 100644 --- a/vendor/assets/iD/iD.css.erb +++ b/vendor/assets/iD/iD.css.erb @@ -189,6 +189,11 @@ input::-moz-focus-inner { pointer-events: none; } +.lasso #map { + pointer-events: visibleStroke; +} + + /* `.target` objects are interactive */ /* They can be picked up, clicked, hovered, or things can connect to them */ .node.target { @@ -405,7 +410,7 @@ text.point { } -/* Turns */ +/* Turn Restrictions */ g.turn rect, g.turn circle { @@ -418,9 +423,33 @@ g.turn circle { pointer-events: none; } -.lasso #map { - pointer-events: visibleStroke; +/* Turn restriction paths and vertices */ +.surface.tr .way.target, +.surface.tr path.shadow.selected, +.surface.tr path.shadow.related { + stroke-width: 25px; +} + +.surface.tr path.shadow.selected, +.surface.tr path.shadow.related, +.surface.tr g.vertex.selected .shadow, +.surface.tr g.vertex.related .shadow { + stroke-opacity: 0.7; + stroke: #777; +} +.surface.tr path.shadow.related.allow, +.surface.tr g.vertex.related.allow .shadow { + stroke: #5b3; +} +.surface.tr path.shadow.related.restrict, +.surface.tr g.vertex.related.restrict .shadow { + stroke: #d53; } +.surface.tr path.shadow.related.only, +.surface.tr g.vertex.related.only .shadow { + stroke: #68f; +} + /* GPX Paths */ @@ -1696,6 +1725,28 @@ path.casing.tag-boundary-national_park { } +/* Tree Rows */ +path.shadow.tag-natural-tree_row { + stroke-width: 16; +} +path.casing.tag-natural-tree_row { + stroke-width: 7; +} +path.stroke.tag-natural-tree_row { + stroke-width: 5; +} + +.low-zoom path.shadow.tag-natural-tree_row { + stroke-width: 12; +} +.low-zoom path.casing.tag-natural-tree_row { + stroke-width: 5; +} +.low-zoom path.stroke.tag-natural-tree_row { + stroke-width: 3; +} + + /* barriers */ path.stroke.tag-barrier { stroke: #ddd; @@ -1932,20 +1983,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 */ } @@ -2415,6 +2466,17 @@ h4, h5 { outline-style: none; } +::placeholder { /* Chrome, Firefox, Opera, Safari 10.1+ */ + color: #aaa; + opacity: 1; /* Firefox */ +} +:-ms-input-placeholder { /* Internet Explorer 10-11 */ + color: #aaa; +} +::-ms-input-placeholder { /* Microsoft Edge */ + color: #aaa; +} + p { font-size: 12px; margin:0; @@ -2664,7 +2726,7 @@ li.hide { button { text-align: center; - line-height:20px; + line-height: 20px; border:0; background: white; font-weight: bold; @@ -2908,16 +2970,12 @@ button.save.has-count .count::before { } .header h3 { - text-align: left; + text-align: center; margin-bottom: 0; white-space: nowrap; text-overflow: ellipsis; overflow: hidden; - padding: 20px 20px 20px 40px; -} -[dir='rtl'] .header h3 { - text-align: right; - padding: 20px 40px 20px 20px; + padding: 20px; } .header button, @@ -2933,12 +2991,14 @@ button.save.has-count .count::before { height: 100%; } +.field-help-title button.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'] .entity-editor-pane .header button.preset-close, [dir='rtl'] .preset-list-pane .header button.preset-choose { left: 0; @@ -3518,6 +3578,7 @@ a.hide-toggle { border-top: 0; border-radius: 0 0 4px 4px; overflow: hidden; + position: relative; } .form-field textarea { @@ -3941,11 +4002,13 @@ input[type=number] { content: none; } +#preset-input-maxspeed_advisory, #preset-input-maxspeed { border-right: none; border-radius: 0 0 0 4px; width: 80%; } +[dir='rtl'] #preset-input-maxspeed_advisory, [dir='rtl'] #preset-input-maxspeed { border-right: 1px solid #ccc; border-radius: 0 0 4px 0; @@ -4021,7 +4084,7 @@ input[type=number] { content: ""; display: block; position: absolute; - background:#ccc; + background: #ccc; height: 11px; width: 1px; left: 0; @@ -4086,9 +4149,52 @@ input[type=number] { /* Restrictions editor */ -.form-field-restrictions .preset-input-wrap { +.form-field-restrictions .restriction-controls-container { + background-color: #fff; + border-top: 1px solid #ccc; + width: 100%; + padding: 5px; +} + +.restriction-controls-container .restriction-controls { + display: table; + -moz-user-select: none; + -webkit-user-select: none; + -ms-user-select: none; + user-select: none; +} + +.restriction-controls .restriction-control { + display: table-row; + padding: 5px 10px; + height: 25px; +} + +.restriction-control input, +.restriction-control span { + display: table-cell; + text-align: start; + padding: 0px 5px; +} + +.restriction-control span.restriction-control-label { + text-align: end; +} + +.restriction-control input { + width: 60px; + padding: 0; + margin: 0px 5px; + vertical-align: middle; +} + +.form-field-restrictions .restriction-container { position: relative; - height: 300px; + height: 370px; +} +/* zero width space, so container takes up space */ +.form-field-restrictions .restriction-container:after { + content: '\200b'; } .form-field-restrictions svg.surface { @@ -4096,7 +4202,7 @@ input[type=number] { height: 100%; } -.form-field-restrictions .restriction-help { +.restriction-container .restriction-help { z-index: 1; position: absolute; top: 0; @@ -4104,8 +4210,32 @@ input[type=number] { right: 0; padding: 2px 6px; background-color: rgba(255, 255, 255, .8); - color: #999; + color: #888; text-align: center; + pointer-events: none; + + -moz-user-select: none; + -webkit-user-select: none; + -ms-user-select: none; + user-select: none; +} + +.restriction-help span { + margin: 2px; +} + +.restriction-help .qualifier { + color: #666; + font-weight: bold; +} +.restriction-help .qualifier.allow { + color: #8b5; +} +.restriction-help .qualifier.restrict { + color: #d53; +} +.restriction-help .qualifier.only { + color: #78f; } /* Changeset editor while comment text is empty */ @@ -4135,10 +4265,10 @@ input[type=number] { div.combobox { z-index: 9999; display: none; - box-shadow: 0 0 10px 0 rgba(0,0,0,.1); + box-shadow: 0 4px 10px 1px rgba(0,0,0,.2); margin-top: -1px; background: white; - max-height: 120px; + max-height: 245px; overflow-y: auto; overflow-x: hidden; border: 1px solid #ccc; @@ -4148,7 +4278,7 @@ div.combobox { .combobox a { display: block; padding: 5px 10px; - border-top:1px solid #ccc; + border-top: 1px solid #ccc; text-overflow: ellipsis; white-space: nowrap; overflow: hidden; @@ -4161,6 +4291,7 @@ div.combobox { .combobox a:first-child { border-top: 0; + padding: 4px 10px; } .combobox-caret { @@ -4177,7 +4308,7 @@ div.combobox { } .combobox-caret::after { - content:""; + content: ""; height: 0; width: 0; position: absolute; left: 0; right: 0; bottom: 0; top: 0; @@ -4187,6 +4318,107 @@ div.combobox { border-right: 5px solid transparent; } +/* Field Help */ + +.field-help-body { + display: block; + position: absolute; + top: 0; + left: 20px; + right: 20px; + margin: 5px; + padding: 8px; + border: 1px solid #ccc; + border-top: 0; + border-radius: 0 0 4px 4px; + z-index: 20; + background: rgba(255,255,255,0.95); + box-shadow: 0 0 30px 5px rgba(0,0,0,.4); +} + +.field-help-title h2 { + padding: 10px; + margin-bottom: 0px; + font-size: 17px; +} +.field-help-title button { + width: 45px; + height: 55px; + border-radius: 0; +} + +.field-help-nav { + font-size: 13px; + font-weight: bold; + margin-bottom: 10px; +} +.field-help-nav-item { + display: inline-block; + padding: 5px 10px; + cursor: pointer; + color: #666; +} +.field-help-nav-item.active { + color: #7092ff; +} +.field-help-nav-item:hover { + color: #597be7; + background-color: #efefef; +} + +.field-help-content { + padding: 10px; + overflow-y: auto; + overflow-x: hidden; +} +.field-help-content h3 { + font-size: 12px; + margin-bottom: 5px; +} +.field-help-content p { + margin-bottom: 15px; +} +.field-help-content ul li { + list-style: inside; + margin-bottom: 5px; +} + +.field-help-content .field-help-image { + width: 100%; + margin-bottom: 15px; +} + +.field-help-content svg.turn { + width: 40px; + height: 20px; +} +.field-help-content svg.shadow { + opacity: 0.7; + width: 60px; + height: 20px; +} +.field-help-content svg.from { + color: #777; +} +.field-help-content svg.allow { + color: #5b3; +} +.field-help-content svg.restrict { + color: #d53; +} +.field-help-content svg.only { + color: #68f; +} + +.field-help-content p.from_shadow, +.field-help-content p.allow_shadow, +.field-help-content p.restrict_shadow, +.field-help-content p.allow_turn, +.field-help-content p.restrict_turn { + margin-bottom: 5px; +} + + /* Raw Tag Editor */ .tag-list { @@ -4466,7 +4698,7 @@ div.full-screen > button:hover { .map-controls { right: 0; - top: 70px; + top: 132px; width: 40px; position: fixed; z-index: 100; @@ -4492,27 +4724,46 @@ div.full-screen > button:hover { } /* Zoomer */ - -.zoombuttons button.zoom-in { +.zoombuttons > button.zoom-in { border-radius: 4px 0 0 0; } -[dir='rtl'] .zoombuttons button.zoom-in { +[dir='rtl'] .zoombuttons > button.zoom-in { border-radius: 0 4px 0 0; } -/* Background / Map Data Settings */ +/* Geolocator */ +.geolocate-control { + margin-bottom: 10px; +} +.geolocate-control > button { + border-radius: 0 0 0 4px; +} +[dir='rtl'] .geolocate-control > button { + border-radius: 0 0 4px 0; +} + +/* Pane Buttons */ +.help-control > button { + border-radius: 0 0 0 4px; +} +[dir='rtl'] .help-control > button { + border-radius: 0 0 4px 0; +} .map-data-control button { border-radius: 0; } -.background-control button { +.background-control > button { border-radius: 4px 0 0 0; } -[dir='rtl'] .background-control button { +[dir='rtl'] .background-control > button { border-radius: 0 4px 0 0; } + +/* Background / Map Data Settings */ + .map-data-control, .background-control { position: relative; @@ -4786,52 +5037,61 @@ div.full-screen > button:hover { border-radius: 3px 0 0 3px; } -.map-data-control .map-overlay, -.background-control .map-overlay, -.help-control .map-overlay { - z-index: -1; -} +/* Side panes */ -/* Geolocator */ - -.geolocate-control { - margin-bottom: 10px; -} - -.geolocate-control button { - border-radius: 0 0 0 4px; -} -[dir='rtl'] .geolocate-control button { - border-radius: 0 0 4px 0; +/*.map-data-control .map-pane, +.background-control .map-pane, +.help-control .map-pane { } - -.map-overlay.content { +*/ +.map-pane { position: fixed; top: 60px; bottom: 30px; - padding: 20px 50px 20px 20px; right: 0; - overflow: auto; + padding-bottom: 50px; + overflow: hidden; + z-index: -1; } -[dir='rtl'] .map-overlay.content { - padding: 20px 20px 20px 50px; +[dir='rtl'] .map-pane { left: 0; right: auto !important; } -.map-overlay.content > div { - padding-bottom: 15px; +.pane-heading { + display: flex; + flex-flow: row nowrap; + justify-content: space-between; + border-bottom: 1px solid #ccc; } -/* Help */ +.pane-heading h2 { + margin: 15px 20px; +} -.help-control button { - border-radius: 0 0 0 4px; +.pane-heading button { + width: 40px; + height: 61px; + border-radius: 0; } -[dir='rtl'] .help-control button { - border-radius: 0 0 4px 0; + +.pane-content { + height: 100%; + padding: 10px 50px 20px 20px; + overflow-x: hidden; + overflow-y: scroll; +} +[dir='rtl'] .pane-content { + padding: 10px 20px 20px 50px; } +.pane-content > div { + padding-bottom: 15px; +} + +/* Help */ + + .help-wrap p { font-size: 15px; margin-bottom: 20px; @@ -4877,7 +5137,7 @@ div.full-screen > button:hover { } .help-wrap .toc li a:hover, -.help-wrap .nav a:hover { +.help-wrap .nav a:hover { background: #ececec; } @@ -4908,6 +5168,7 @@ div.full-screen > button:hover { .help-wrap .nav { position: relative; + padding-bottom: 30px; } .help-wrap .nav a { @@ -5092,7 +5353,7 @@ img.tile-debug { .nocolor { color: rgba(0, 0, 0, 0); } .red { color: rgba(255, 0, 0, 0.75); } .green { color: rgba(0, 255, 0, 0.75); } -.blue { color: rgba(0, 0, 255, 0.75); } +.blue { color: rgba(176, 176, 255, 0.75); } .yellow { color: rgba(255, 255, 0, 0.75); } .cyan { color: rgba(0, 255, 255, 0.75); } .magenta { color: rgba(255, 0, 255, 0.75); } @@ -5502,6 +5763,9 @@ img.tile-debug { color: #ccf; } +/* Notification Badges */ + +/* For an icon (e.g. new version) */ .badge { display: inline-block; background: #d32232; @@ -5528,6 +5792,24 @@ img.tile-debug { fill: white; } +/* For text (e.g. upcoming events) */ +.badge-text { + display: inline-block; + color: white; + text-align: center; + width: 16px; + height: 16px; + font-size: 10px; + font-weight: bold; + margin-left: 5px; + background: #f00; + border-radius: 9px; +} +[dir='rtl'] .badge-text { + margin-left: 0; + margin-right: 5px; +} + /* Modals ------------------------------------------------------- */ @@ -5601,8 +5883,7 @@ img.tile-debug { text-align: center; } -.modal-actions button, -.save-success a.button { +.modal-actions button { font-weight: normal; color: #7092ff; border-bottom: 1px solid #ccc; @@ -5611,12 +5892,16 @@ img.tile-debug { text-align: center; display: inline-block; } - -.modal-actions button:hover -.save-success a.button:hover { +.modal-actions button:hover { background-color: #ececec; } +.logo-small { + height: 40px; + width: 40px; + margin: auto; +} + .logo { height: 100px; width: 100%; @@ -5638,34 +5923,103 @@ img.tile-debug { color: #7092ff; } .modal-actions .logo-reset { - color: #E06C5E; + color: #e06c5e; } /* Success Modal ------------------------------------------------------- */ +.save-success.body { + overflow-y: scroll; + overflow-x: hidden; +} + +.save-success .link-out { + margin: 0px 5px; + white-space: nowrap; +} + +.save-summary, +.save-communityLinks { + padding: 0px 20px 15px 20px; +} + +.save-communityLinks { + border-top: 1px solid #ccc; +} + +.save-success table, .save-success p { - padding: 15px 15px 0 15px; + margin-top: 15px; } -.save-success a.details { - padding-left: 15px; +.save-success h3 { + font-size: 14px; + margin-top: 15px; + line-height: 1.5; + padding-bottom: 0; } -.save-success .button { - padding-top: 15px; +.save-success td { + vertical-align: top; } -.save-success .logo-osm { - color: #7092ff; - margin-bottom: 10px; +.save-success td.cell-icon { + width: 40px; } -.save-success a.button.social { - height: auto; - border-bottom: none; +.save-success td.cell-detail { + padding: 0 10px; } -.save-success .icon.social { - height: 80px; - width: 80px; - color: #7092ff; +.save-success td.community-detail { + padding-bottom: 15px; +} + +.summary-view-on-osm, +.community-name { + font-size: 14px; + font-weight: bold; +} +.community-languages { + margin-top: 5px; + font-style: italic; +} +.community-languages:only-child { + margin-top: 0; } +.community-detail a.hide-toggle, +.community-detail a:visited.hide-toggle { + font-size: 12px; + font-weight: normal; + padding-bottom: 0; +} +.community-detail .hide-toggle svg.icon.pre-text { + width: 12px; + height: 15px; +} + +.community-events { + margin-top: 5px; +} + +.community-event, +.community-more { + background-color: #efefef; + padding: 8px; + border-radius: 4px; + margin-bottom: 5px; +} + +.community-event-name { + font-size: 14px; + font-weight: bold; +} +.community-event-when { + font-weight: bold; +} + +.community-missing { + padding: 10px; + text-align: center; +} + + /* Splash Modal ------------------------------------------------------- */ .modal-actions .logo-walkthrough, @@ -5960,7 +6314,7 @@ svg.mouseclick use.right { .tooltip { position: absolute; display: none; - color:#333; + color: #333; font-size: 12px; } @@ -6114,33 +6468,33 @@ svg.mouseclick use.right { /* Exceptions for tooltip layouts */ /* make tooltips in panels dark */ -.map-overlay .tooltip.top .tooltip-arrow, +.map-pane .tooltip.top .tooltip-arrow, .entity-editor-pane .tooltip.top .tooltip-arrow, .warning-section .tooltip.top .tooltip-arrow { border-top-color: #000; } -.map-overlay .tooltip.bottom .tooltip-arrow, +.map-pane .tooltip.bottom .tooltip-arrow, .entity-editor-pane .tooltip.bottom .tooltip-arrow, .warning-section .tooltip.bottom .tooltip-arrow { border-bottom-color: #000; } -.map-overlay .tooltip.left .tooltip-arrow, +.map-pane .tooltip.left .tooltip-arrow, .entity-editor-pane .tooltip.left .tooltip-arrow, .warning-section .tooltip.left .tooltip-arrow { border-left-color: #000; } -.map-overlay .tooltip.right .tooltip-arrow, +.map-pane .tooltip.right .tooltip-arrow, .entity-editor-pane .tooltip.right .tooltip-arrow, .warning-section .tooltip.right .tooltip-arrow { border-right-color: #000; } -.map-overlay .tooltip-inner, -.map-overlay .tooltip-heading, -.map-overlay .keyhint-wrap, +.map-pane .tooltip-inner, +.map-pane .tooltip-heading, +.map-pane .keyhint-wrap, .entity-editor-pane .tooltip-inner, .warning-section .tooltip-inner { background: #000;