pleroma-fe

commit: ee620f6028ec18b5c982a220eafc67370ffd2e24
parent d6fe4f6a4fa4c8fb928bcd187e605c76f985d06d
Author: lain <lain@soykaf.club>
Date:   Wed, 16 Sep 2020 09:22:05 +0000

Merge branch 'fix/use-shoutbox-name-in-sidedrawer' into 'develop'

change side drawer to use shoutbox name - fix #956

Closes #956

See merge request pleroma/pleroma-fe!1235
Diffstat:
M
src/components/chat_panel/chat_panel.vue
2
+-
M
src/components/side_drawer/side_drawer.vue
2
+-
M
src/i18n/en.json
1
-
M
static/fontello.json
6
++++++

4 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/components/chat_panel/chat_panel.vue b/src/components/chat_panel/chat_panel.vue
@@ -63,7 +63,7 @@
         @click.stop.prevent="togglePanel"
       >
         <div class="title">
-          <i class="icon-comment-empty" />
+          <i class="icon-megaphone" />
           {{ $t('shoutbox.title') }}
         </div>
       </div>
diff --git a/src/components/side_drawer/side_drawer.vue b/src/components/side_drawer/side_drawer.vue
@@ -90,7 +90,7 @@
           @click="toggleDrawer"
         >
           <router-link :to="{ name: 'chat' }">
-            <i class="button-icon icon-chat" /> {{ $t("nav.chat") }}
+            <i class="button-icon icon-megaphone" /> {{ $t("shoutbox.title") }}
           </router-link>
         </li>
       </ul>
diff --git a/src/i18n/en.json b/src/i18n/en.json
@@ -113,7 +113,6 @@
     "about": "About",
     "administration": "Administration",
     "back": "Back",
-    "chat": "Local Chat",
     "friend_requests": "Follow Requests",
     "mentions": "Mentions",
     "interactions": "Interactions",
diff --git a/static/fontello.json b/static/fontello.json
@@ -405,6 +405,12 @@
       "css": "block",
       "code": 59434,
       "src": "fontawesome"
+    },
+    {
+      "uid": "3e674995cacc2b09692c096ea7eb6165",
+      "css": "megaphone",
+      "code": 59435,
+      "src": "fontawesome"
     }
   ]
 } 
\ No newline at end of file