From fdf14b2cfdf91d02e85a6685ba2b3eb28b8d4b4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Mon, 12 Jul 2021 16:43:37 +0200
Subject: [PATCH] Change minor design and text issues

- Remove the split line under the last list item.
- Enter spaces.
- Partial swapping of upper and lower case letters.
---
 webapp/components/Editor/MenuLegend.vue | 32 +++++++++++++++----------
 webapp/locales/en.json                  | 22 ++++++++---------
 webapp/locales/ru.json                  | 22 ++++++++---------
 3 files changed, 41 insertions(+), 35 deletions(-)

diff --git a/webapp/components/Editor/MenuLegend.vue b/webapp/components/Editor/MenuLegend.vue
index f748c072c..afc137b1f 100644
--- a/webapp/components/Editor/MenuLegend.vue
+++ b/webapp/components/Editor/MenuLegend.vue
@@ -15,9 +15,13 @@
     <template #popover="" class="legend">
       <div class="legend-container">
         <div class="legend-header">{{ $t(`editor.legend.legendTitle`) }}</div>
-        <div class="legend-table" v-for="item in legenditems" :key="item.name">
+        <div
+          :class="['legend-table', index < legendItems.length - 1 && 'legend-table-split-line']"
+          v-for="(item, index) in legendItems"
+          :key="item.name"
+        >
           <div>
-            <base-button size="small" circle ghost :icon="item.iconname" class="legend-icon">
+            <base-button size="small" circle ghost :icon="item.iconName" class="legend-icon">
               <span v-if="item.label">{{ item.label }}</span>
             </base-button>
             <span>{{ $t(item.name) }}</span>
@@ -43,18 +47,18 @@ export default {
   },
   data() {
     return {
-      legenditems: [
-        { iconname: 'bold', name: `editor.legend.bold`, shortcut: 'Ctrl+b' },
-        { iconname: 'italic', name: `editor.legend.italic`, shortcut: 'Ctrl+i' },
-        { iconname: 'underline', name: `editor.legend.underline`, shortcut: 'Ctrl+u' },
-        { iconname: 'link', name: `editor.legend.link`, shortcut: '' },
-        { iconname: 'paragraph', name: `editor.legend.paragraph`, shortcut: '' },
+      legendItems: [
+        { iconName: 'bold', name: `editor.legend.bold`, shortcut: 'ctrl + b' },
+        { iconName: 'italic', name: `editor.legend.italic`, shortcut: 'ctrl + i' },
+        { iconName: 'underline', name: `editor.legend.underline`, shortcut: 'ctrl + u' },
+        { iconName: 'link', name: `editor.legend.link`, shortcut: '' },
+        { iconName: 'paragraph', name: `editor.legend.paragraph`, shortcut: '' },
         { label: 'H3', name: `editor.legend.heading3`, shortcut: '### + space' },
         { label: 'H4', name: `editor.legend.heading4`, shortcut: '#### + space' },
-        { iconname: 'list-ul', name: `editor.legend.unorderedList`, shortcut: '* + space' },
-        { iconname: 'list-ol', name: `editor.legend.orderedList`, shortcut: '1. + space' },
-        { iconname: 'quote-right', name: `editor.legend.quote`, shortcut: '> + space' },
-        { iconname: 'minus', name: `editor.legend.ruler`, shortcut: '---' },
+        { iconName: 'list-ul', name: `editor.legend.unorderedList`, shortcut: '* + space' },
+        { iconName: 'list-ol', name: `editor.legend.orderedList`, shortcut: '1. + space' },
+        { iconName: 'quote-right', name: `editor.legend.quote`, shortcut: '> + space' },
+        { iconName: 'minus', name: `editor.legend.ruler`, shortcut: '---' },
       ],
     }
   },
@@ -91,9 +95,11 @@ export default {
   display: grid;
   align-items: center;
   grid-template-columns: 1fr 1fr;
-  border-bottom: 0.5px solid grey;
   padding: 0.2em;
 }
+.legend-table-split-line {
+  border-bottom: 0.5px solid grey;
+}
 
 .legend-table > div {
   display: flex;
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index a283857df..7a080b5cb 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -314,18 +314,18 @@
       "noHashtagsFound": "No hashtags found"
     },
     "legend": {
-      "bold": "bold",
-      "heading3": "heading3",
-      "heading4": "heading4",
-      "italic": "italic",
+      "bold": "Bold",
+      "heading3": "Heading 3",
+      "heading4": "Heading 4",
+      "italic": "Italic",
       "legendTitle": "Keyboard shortcuts and markdown code",
-      "link": "link",
-      "orderedList": "ordered list",
-      "paragraph": "paragraph",
-      "quote": "quote",
-      "ruler": "ruler",
-      "underline": "underline",
-      "unorderedList": "unordered list"
+      "link": "Link",
+      "orderedList": "Ordered list",
+      "paragraph": "Paragraph",
+      "quote": "Quote",
+      "ruler": "Ruler",
+      "underline": "Underline",
+      "unorderedList": "Unordered list"
     },
     "mention": {
       "noUsersFound": "No users found"
diff --git a/webapp/locales/ru.json b/webapp/locales/ru.json
index d2b2afa54..b24589527 100644
--- a/webapp/locales/ru.json
+++ b/webapp/locales/ru.json
@@ -261,18 +261,18 @@
       "noHashtagsFound": "Хэштеги не найдены"
     },
     "legend": {
-      "bold": "полужирный",
-      "heading3": "заголовок 3",
-      "heading4": "заголовок 4",
-      "italic": "курсив",
+      "bold": "Полужирный",
+      "heading3": "Заголовок 3",
+      "heading4": "Заголовок 4",
+      "italic": "Курсив",
       "legendTitle": "Клавиатурные сокращения и код разметки",
-      "link": "ссылка",
-      "orderedList": "нумерованный список",
-      "paragraph": "параграф",
-      "quote": "кавычки",
-      "ruler": "горизонтальная линия",
-      "underline": "подчеркнутый",
-      "unorderedList": "маркированный список"
+      "link": "Ссылка",
+      "orderedList": "Нумерованный список",
+      "paragraph": "Параграф",
+      "quote": "Кавычки",
+      "ruler": "Горизонтальная линия",
+      "underline": "Подчеркнутый",
+      "unorderedList": "Маркированный список"
     },
     "mention": {
       "noUsersFound": "Пользователи не найдены"