fix colors

kitsteam · Jan 12, 2024 · cbf4fa0 · cbf4fa0
1 parent d2f3901
commit cbf4fa0
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 108 deletions.
diff --git a/frontend/compiled-lang/lang.json b/frontend/compiled-lang/lang.json
@@ -5,7 +5,6 @@
   "chart.buttons.share.feedback": "Share a link to your feedback chart to allow others to add new words.",
   "close": "Close",
   "download": "Download",
-  "feedback.admin.header": "Feedback Chart",
   "feedback.admin.header.subline": "Collect feedback and display it in a chart",
   "feedback.user.button.submit": "Submit Feedback",
   "feedback.user.input.hint": "Please enter Feedback",
@@ -15,7 +14,6 @@
   "filter.all": "All categories",
   "languages.de": "German",
   "languages.en": "English",
-  "live.admin.header": "Live Text Chart",
   "live.admin.header.subline": "Enter text to count and categorize words",
   "live.filter": "Filter",
   "live.text.button.submit": "Add Text",
@@ -32,35 +30,12 @@
   "toolbar.buttons.clear": "Clear",
   "toolbar.buttons.colors": "Colors",
   "toolbar.buttons.danger": "Danger",
-  "toolbar.buttons.dropdown.filter.adjective": "Adjective",
-  "toolbar.buttons.dropdown.filter.adverb": "Adverb",
-  "toolbar.buttons.dropdown.filter.all": "All",
-  "toolbar.buttons.dropdown.filter.article": "Article",
-  "toolbar.buttons.dropdown.filter.conjuncture": "Conjuncture",
-  "toolbar.buttons.dropdown.filter.misc": "Misc",
-  "toolbar.buttons.dropdown.filter.none": "No filter",
-  "toolbar.buttons.dropdown.filter.noun": "Noun",
-  "toolbar.buttons.dropdown.filter.preposition": "Preposition",
-  "toolbar.buttons.dropdown.filter.pronoun": "Pronoun",
-  "toolbar.buttons.dropdown.filter.verb": "Verb",
-  "toolbar.buttons.dropdown.orientation.ninety": "Set rotation angle 90",
-  "toolbar.buttons.dropdown.orientation.zero": "Set rotation angle 0",
   "toolbar.buttons.dropdown.theme.grammar": "Change to grammatical category",
   "toolbar.buttons.dropdown.theme.grey": "Change to greyscale colors",
   "toolbar.buttons.dropdown.theme.mix": "Change to fancy colors",
-  "toolbar.buttons.orientation": "Orientation",
   "toolbar.buttons.settings": "Toggle Settings",
-  "toolbar.buttons.share": "Share",
   "toolbar.settings.language": "Language",
-  "toolbar.settings.theme.adjective": "Adjective color",
-  "toolbar.settings.theme.adverb": "Adverb color",
-  "toolbar.settings.theme.article": "Article color",
-  "toolbar.settings.theme.conjuncture": "Conjuncture color",
-  "toolbar.settings.theme.hint": "Color is used when color filter is set on setting &quot;grammatical category&quot;",
-  "toolbar.settings.theme.misc": "Misc color",
-  "toolbar.settings.theme.noun": "Noun color",
-  "toolbar.settings.theme.preposition": "Preposition color",
-  "toolbar.settings.theme.pronoun": "Pronoun color",
-  "toolbar.settings.theme.verb": "Verb color",
+  "toolbar.settings.rotation": "Limit rotation angle to 0°",
+  "toolbar.settings.theme.explanation": "Please select a color for each grammar category",
   "wordchart.empty": "This word chart is currently empty."
 }
diff --git a/frontend/lang/lang.json b/frontend/lang/lang.json
@@ -17,9 +17,6 @@
   "download": {
     "defaultMessage": "Download"
   },
-  "feedback.admin.header": {
-    "defaultMessage": "Feedback Chart"
-  },
   "feedback.admin.header.subline": {
     "defaultMessage": "Collect feedback and display it in a chart"
   },
@@ -47,9 +44,6 @@
   "languages.en": {
     "defaultMessage": "English"
   },
-  "live.admin.header": {
-    "defaultMessage": "Live Text Chart"
-  },
   "live.admin.header.subline": {
     "defaultMessage": "Enter text to count and categorize words"
   },
@@ -98,45 +92,6 @@
   "toolbar.buttons.danger": {
     "defaultMessage": "Danger"
   },
-  "toolbar.buttons.dropdown.filter.all": {
-    "defaultMessage": "All"
-  },
-  "toolbar.buttons.dropdown.filter.none": {
-    "defaultMessage": "No filter"
-  },
-  "toolbar.buttons.dropdown.filter.noun": {
-    "defaultMessage": "Noun"
-  },
-  "toolbar.buttons.dropdown.filter.verb": {
-    "defaultMessage": "Verb"
-  },
-  "toolbar.buttons.dropdown.filter.adjective": {
-    "defaultMessage": "Adjective"
-  },
-  "toolbar.buttons.dropdown.filter.adverb": {
-    "defaultMessage": "Adverb"
-  },
-  "toolbar.buttons.dropdown.filter.article": {
-    "defaultMessage": "Article"
-  },
-  "toolbar.buttons.dropdown.filter.preposition": {
-    "defaultMessage": "Preposition"
-  },
-  "toolbar.buttons.dropdown.filter.conjuncture": {
-    "defaultMessage": "Conjuncture"
-  },
-  "toolbar.buttons.dropdown.filter.pronoun": {
-    "defaultMessage": "Pronoun"
-  },
-  "toolbar.buttons.dropdown.filter.misc": {
-    "defaultMessage": "Misc"
-  },
-  "toolbar.buttons.dropdown.orientation.ninety": {
-    "defaultMessage": "Set rotation angle 90"
-  },
-  "toolbar.buttons.dropdown.orientation.zero": {
-    "defaultMessage": "Set rotation angle 0"
-  },
   "toolbar.buttons.dropdown.theme.grammar": {
     "defaultMessage": "Change to grammatical category"
   },
@@ -146,47 +101,17 @@
   "toolbar.buttons.dropdown.theme.mix": {
     "defaultMessage": "Change to fancy colors"
   },
-  "toolbar.buttons.orientation": {
-    "defaultMessage": "Orientation"
-  },
   "toolbar.buttons.settings": {
     "defaultMessage": "Toggle Settings"
   },
-  "toolbar.buttons.share": {
-    "defaultMessage": "Share"
-  },
   "toolbar.settings.language": {
     "defaultMessage": "Language"
   },
-  "toolbar.settings.theme.article": {
-    "defaultMessage": "Article color"
-  },
-  "toolbar.settings.theme.adjective": {
-    "defaultMessage": "Adjective color"
-  },
-  "toolbar.settings.theme.adverb": {
-    "defaultMessage": "Adverb color"
-  },
-  "toolbar.settings.theme.conjuncture": {
-    "defaultMessage": "Conjuncture color"
-  },
-  "toolbar.settings.theme.pronoun": {
-    "defaultMessage": "Pronoun color"
-  },
-  "toolbar.settings.theme.preposition": {
-    "defaultMessage": "Preposition color"
-  },
-  "toolbar.settings.theme.misc": {
-    "defaultMessage": "Misc color"
-  },
-  "toolbar.settings.theme.noun": {
-    "defaultMessage": "Noun color"
-  },
-  "toolbar.settings.theme.verb": {
-    "defaultMessage": "Verb color"
+  "toolbar.settings.rotation": {
+    "defaultMessage": "Limit rotation angle to 0°"
   },
-  "toolbar.settings.theme.hint": {
-    "defaultMessage": "Color is used when color filter is set on setting &quot;grammatical category&quot;"
+  "toolbar.settings.theme.explanation": {
+    "defaultMessage": "Please select a color for each grammar category"
   },
   "wordchart.empty": {
     "defaultMessage": "This word chart is currently empty."

diff --git a/frontend/src/shared/colors.ts b/frontend/src/shared/colors.ts
@@ -1,7 +1,7 @@
 const themeGreyColors: string[] = ['#080808', '#242424', '#3a3a3a', '#4f4f4f', '#646464']
 const themeMixedColors: string[] = ['#F75C03', '#D90368', '#820263', '#291720', '#04A777']
 
-export const DEFAULT_COLOR = '#666666'
+export const DEFAULT_COLOR = '#9E9E9E'
 
 export enum ColorTheme {
   Mixed,

diff --git a/frontend/src/shared/defaultChartSettings.ts b/frontend/src/shared/defaultChartSettings.ts
@@ -43,7 +43,16 @@ export const defaultWordchartSettings: ReactWordcloudSettings = {
 }
 
 export const defaultGrammaticalCategoryColors: GrammaticalCategoryColors = {
-  verb: '#A53139', adjective: '#0035DA', noun: '#000000', preposition: '#199463', default: DEFAULT_COLOR, adverb: '#199463', pronoun: '#AD4AC6', article: '#3194E7', conjuncture: '#FFFF42', misc: DEFAULT_COLOR
+  verb: '#E53935',
+  adjective: '#303F9F',
+  noun: '#000000',
+  preposition: '#388E3C',
+  default: DEFAULT_COLOR,
+  adverb: '#F57C00',
+  pronoun: '#7B1FA2',
+  article: '#0288D1',
+  conjuncture: '#EC187A',
+  misc: DEFAULT_COLOR
 }
 
 export const defaultPaginationCount = 21