Merge pull request #152 from nrotstan/adjust-editor-language

Minor adjustment to Editor labeling.
maproulette · Mar 5, 2018 · edfdac1 · edfdac1
2 parents 7e0fa35 + 8b46899
commit edfdac1
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 29 deletions.
diff --git a/src/components/TaskPane/ActiveTaskDetails/ActiveTaskControls/ActiveTaskControls.scss b/src/components/TaskPane/ActiveTaskDetails/ActiveTaskControls/ActiveTaskControls.scss
@@ -33,18 +33,6 @@
     margin-bottom: 20px;
   }
 
-  &__task-comment {
-    width: 100%;
-
-    input {
-      width: 100%;
-      font-size: 16px;
-      padding: 5px;
-      border: 2px solid $grey;
-      border-radius: $radius-medium;
-    }
-  }
-
   &.is-minimized {
     .active-task-controls__control-block {
       flex-direction: column;

diff --git a/...ents/TaskPane/ActiveTaskDetails/ActiveTaskControls/TaskCommentInput/TaskCommentInput.scss b/...ents/TaskPane/ActiveTaskDetails/ActiveTaskControls/TaskCommentInput/TaskCommentInput.scss
@@ -7,7 +7,7 @@
     width: 100%;
     font-size: $size-6;
     color: $grey;
-    padding: 5px 10px;
+    padding: 8px 12px;
     border: 2px solid $grey;
     border-radius: $radius-medium;
 

diff --git a/...TaskDetails/ActiveTaskControls/TaskEditControl/__snapshots__/TaskEditControl.test.js.snap b/...TaskDetails/ActiveTaskControls/TaskEditControl/__snapshots__/TaskEditControl.test.js.snap
@@ -146,17 +146,17 @@ ShallowWrapper {
       "options": Array [
         Object {
           "key": 0,
-          "text": "iD",
+          "text": "Edit in iD (web editor)",
           "value": 0,
         },
         Object {
           "key": 1,
-          "text": "JOSM",
+          "text": "Edit in JOSM",
           "value": 1,
         },
         Object {
           "key": 2,
-          "text": "JOSM with new layer",
+          "text": "Edit in new JOSM layer",
           "value": 2,
         },
       ],
@@ -293,17 +293,17 @@ ShallowWrapper {
         "options": Array [
           Object {
             "key": 0,
-            "text": "iD",
+            "text": "Edit in iD (web editor)",
             "value": 0,
           },
           Object {
             "key": 1,
-            "text": "JOSM",
+            "text": "Edit in JOSM",
             "value": 1,
           },
           Object {
             "key": 2,
-            "text": "JOSM with new layer",
+            "text": "Edit in new JOSM layer",
             "value": 2,
           },
         ],

diff --git a/src/lang/en-US.json b/src/lang/en-US.json
@@ -268,9 +268,9 @@
   "Challenge.type.challenge": "Challenge",
   "Challenge.type.survey": "Survey",
   "Editor.none.label": "None",
-  "Editor.id.label": "iD",
-  "Editor.josm.label": "JOSM",
-  "Editor.josmLayer.label": "JOSM with new layer",
+  "Editor.id.label": "Edit in iD (web editor)",
+  "Editor.josm.label": "Edit in JOSM",
+  "Editor.josmLayer.label": "Edit in new JOSM layer",
   "Errors.user.missingHomeLocation": "No home location found. Please set your home location in your openstreetmap.org settings and then refresh this page to try again.",
   "Errors.user.unauthorized": "Please sign in to continue.",
   "Errors.user.updateFailure": "Unable to update your user on server.",

diff --git a/src/services/Editor/Messages.js b/src/services/Editor/Messages.js
@@ -10,14 +10,14 @@ export default defineMessages({
   },
   id: {
     id: "Editor.id.label",
-    defaultMessage: "iD"
+    defaultMessage: "Edit in iD (web editor)"
   },
   josm: {
     id: "Editor.josm.label",
-    defaultMessage: "JOSM"
+    defaultMessage: "Edit in JOSM"
   },
   josmLayer: {
     id: "Editor.josmLayer.label",
-    defaultMessage: "JOSM with new layer"
+    defaultMessage: "Edit in new JOSM layer"
   },
 })
diff --git a/src/theme.scss b/src/theme.scss
@@ -138,10 +138,6 @@ $tablet: 40px;
   &.full-width {
     width: 100%;
   }
-
-  &.label-only {
-    font-weight: $weight-normal;
-  }
 }
 
 .button.icon-only {