diff --git a/css/65_data.css b/css/65_data.css index bae3c4818..962311fee 100644 --- a/css/65_data.css +++ b/css/65_data.css @@ -20,16 +20,19 @@ .layer-notes .note .note-fill { color: #ff3300; stroke: #333; + stroke-width: 40px; } .note-header-icon.new .note-fill, .layer-notes .note.new .note-fill { color: #ffee00; stroke: #333; + stroke-width: 40px; } .note-header-icon.closed .note-fill, .layer-notes .note.closed .note-fill { color: #55dd00; stroke: #333; + stroke-width: 40px; } /* slight adjustments to preset icon for note icons */ diff --git a/css/80_app.css b/css/80_app.css index dc7c00f7a..6558bb99c 100644 --- a/css/80_app.css +++ b/css/80_app.css @@ -588,19 +588,28 @@ button.save.has-count .count::before { right: -6px; } +.help-wrap svg.icon.pre-text.add-note, button.add-note svg.icon { height: 15px; width: 15px; color: rgba(0,0,0,0.25); - stroke-width: 60; - stroke: black; + stroke: #333; + stroke-width: 60px; margin-top: 3px; +} +button.add-note svg.icon { + margin-left: unset; margin-right: 7px; } [dir='rtl'] button.add-note svg.icon { margin-left: 7px; margin-right: unset; } +.help-wrap svg.icon.pre-text.add-note { + margin-left: 3px; + margin-right: 3px; +} + /* Icons */ diff --git a/data/core.yaml b/data/core.yaml index 01758a331..df3ba1d3f 100644 --- a/data/core.yaml +++ b/data/core.yaml @@ -779,13 +779,14 @@ en: boundary_add: "To add a feature to a boundary relation, select the feature and scroll down to the \"All relations\" section of the feature editor, then click the {plus} add button to add this feature to a nearby existing relation or a new relation." notes: title: Notes - intro: "*Notes* are used to alert other users that a feature requires fixing or attention. Notes mark a specific location on the map. To view existing notes or add new ones, click the {data} **Map data** panel or press the shortcut key `` to enable the notes layer." + intro: "*Notes* are used to alert other users that a feature requires fixing or attention. Notes mark a specific location on the map. To view existing notes or add new ones, click the {data} **Map data** panel to enable the OpenStreetMap notes layer." add_note_h: "Adding Notes" add_note: "To add a new note, click the {note} **Note** button on the toolbar above the map, or press the shortcut key `4`. This will change the mouse cursor to a cross symbol. To place the new note on the map, position the mouse cursor where the note should go, then {leftclick} left-click or press `Space`." - move_note: "Only new notes can be moved. To move a note, place the mouse cursor over the new note, then press and hold the {leftclick} left mouse button while dragging the note to its new location. Once acceptable, give the note a description and click `Add Note`." + move_note: "Only new notes can be moved. To move a note, place the mouse cursor over the new note, then press and hold the {leftclick} left mouse button while dragging the note to its new location." update_note_h: "Closing, Reopening, and Commenting" - update_note: "An existing note can be updated by closing it, reopening it, or commenting on it. Closing a note indicates that the problem has been resolved. Reopening a note indicates that the original or a previous issue is not resolved, or that there is a new issue. A comment on a note is for discussion." - update_note_command: "To update a note, {leftclick} left-click on the note to select it and show the edit menu, then update as needed. Notes are not features and updates must be saved individually." + update_note: "An existing note can be updated by closing it, reopening it, or adding a comment to it. Closing a note indicates that the problem has been resolved. Reopening a note indicates that the original issue is not resolved." + save_note_h: "Saving Notes" + save_note: "You must save any note edits individually by clicking the buttons below the note comments. Note edits are **not** included in changesets that you upload to OpenStreetMap." imagery: title: Background Imagery intro: "The background imagery that appears beneath the map data is an important resource for mapping. This imagery can be aerial photos collected from satellites, airplanes, and drones, or it can be scanned historical maps or other freely available source data." diff --git a/dist/locales/en.json b/dist/locales/en.json index 683d76d88..1d8e703e6 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -924,13 +924,14 @@ }, "notes": { "title": "Notes", - "intro": "*Notes* are used to alert other users that a feature requires fixing or attention. Notes mark a specific location on the map. To view existing notes or add new ones, click the {data} **Map data** panel or press the shortcut key `` to enable the notes layer.", + "intro": "*Notes* are used to alert other users that a feature requires fixing or attention. Notes mark a specific location on the map. To view existing notes or add new ones, click the {data} **Map data** panel to enable the OpenStreetMap notes layer.", "add_note_h": "Adding Notes", "add_note": "To add a new note, click the {note} **Note** button on the toolbar above the map, or press the shortcut key `4`. This will change the mouse cursor to a cross symbol. To place the new note on the map, position the mouse cursor where the note should go, then {leftclick} left-click or press `Space`.", - "move_note": "Only new notes can be moved. To move a note, place the mouse cursor over the new note, then press and hold the {leftclick} left mouse button while dragging the note to its new location. Once acceptable, give the note a description and click `Add Note`.", + "move_note": "Only new notes can be moved. To move a note, place the mouse cursor over the new note, then press and hold the {leftclick} left mouse button while dragging the note to its new location.", "update_note_h": "Closing, Reopening, and Commenting", - "update_note": "An existing note can be updated by closing it, reopening it, or commenting on it. Closing a note indicates that the problem has been resolved. Reopening a note indicates that the original or a previous issue is not resolved, or that there is a new issue. A comment on a note is for discussion.", - "update_note_command": "To update a note, {leftclick} left-click on the note to select it and show the edit menu, then update as needed. Notes are not features and updates must be saved individually." + "update_note": "An existing note can be updated by closing it, reopening it, or adding a comment to it. Closing a note indicates that the problem has been resolved. Reopening a note indicates that the original issue is not resolved.", + "save_note_h": "Saving Notes", + "save_note": "You must save any note edits individually by clicking the buttons below the note comments. Note edits are **not** included in changesets that you upload to OpenStreetMap." }, "imagery": { "title": "Background Imagery", diff --git a/modules/ui/help.js b/modules/ui/help.js index a5901b2a9..29942ca2a 100644 --- a/modules/ui/help.js +++ b/modules/ui/help.js @@ -154,7 +154,8 @@ export function uiHelp(context) { 'move_note', 'update_note_h', 'update_note', - 'update_note_command' + 'save_note_h', + 'save_note' ]], ['imagery', [ @@ -222,6 +223,7 @@ export function uiHelp(context) { 'help.relations.boundary_h': 3, 'help.notes.add_note_h': 3, 'help.notes.update_note_h': 3, + 'help.notes.save_note_h': 3, 'help.imagery.sources_h': 3, 'help.imagery.offsets_h': 3, 'help.streetlevel.using_h': 3, @@ -232,7 +234,7 @@ export function uiHelp(context) { point: icon('#iD-icon-point', 'pre-text'), line: icon('#iD-icon-line', 'pre-text'), area: icon('#iD-icon-area', 'pre-text'), - note: icon('#iD-icon-note', 'pre-text'), + note: icon('#iD-icon-note', 'pre-text add-note'), plus: icon('#iD-icon-plus', 'pre-text'), minus: icon('#iD-icon-minus', 'pre-text'), orthogonalize: icon('#iD-operation-orthogonalize', 'pre-text'), diff --git a/svg/iD-sprite/icons/icon-note.svg b/svg/iD-sprite/icons/icon-note.svg index 11033f707..c531a3212 100644 --- a/svg/iD-sprite/icons/icon-note.svg +++ b/svg/iD-sprite/icons/icon-note.svg @@ -1,5 +1,5 @@ - +