aboutsummaryrefslogtreecommitdiff
path: root/src/components/chat_panel/chat_panel.vue
diff options
context:
space:
mode:
authorShpuld Shpludson <shp@cock.li>2020-11-06 17:27:25 +0000
committerShpuld Shpludson <shp@cock.li>2020-11-06 17:27:25 +0000
commit23232e1c8f35d7ddc8adb7a6dbf813b2831c90ec (patch)
treeb0c8c409d3af0901cb47de648ccbea53da89c16d /src/components/chat_panel/chat_panel.vue
parentb225c3578f3c89af5ed3a0be3f8f3a6bbcedcc7d (diff)
parent60983ae42b584694de0211ca67ef72d492a293c9 (diff)
Merge branch 'develop' into 'master'
Merge develop into master for 2.2.0 See merge request pleroma/pleroma-fe!1278
Diffstat (limited to 'src/components/chat_panel/chat_panel.vue')
-rw-r--r--src/components/chat_panel/chat_panel.vue12
1 files changed, 8 insertions, 4 deletions
diff --git a/src/components/chat_panel/chat_panel.vue b/src/components/chat_panel/chat_panel.vue
index 570435e7..7993c94d 100644
--- a/src/components/chat_panel/chat_panel.vue
+++ b/src/components/chat_panel/chat_panel.vue
@@ -11,9 +11,9 @@
>
<div class="title">
<span>{{ $t('shoutbox.title') }}</span>
- <i
+ <FAIcon
v-if="floating"
- class="icon-cancel"
+ icon="times"
/>
</div>
</div>
@@ -63,7 +63,10 @@
@click.stop.prevent="togglePanel"
>
<div class="title">
- <i class="icon-megaphone" />
+ <FAIcon
+ class="icon"
+ icon="bullhorn"
+ />
{{ $t('shoutbox.title') }}
</div>
</div>
@@ -87,7 +90,8 @@
.chat-panel {
.chat-heading {
cursor: pointer;
- .icon-comment-empty {
+
+ .icon {
color: $fallback--text;
color: var(--text, $fallback--text);
}