From 180fd18d4bbc5388d59b9537bb160b5521dda16f Mon Sep 17 00:00:00 2001
From: AkiraFukushima <h3.poteto@gmail.com>
Date: Tue, 22 Mar 2022 21:41:56 +0900
Subject: [PATCH] refs #2606 Use vue-fontawesome in Modals/NewToot

---
 package.json                                              | 1 +
 .../components/TimelineSpace/Modals/NewToot/Poll.vue      | 2 +-
 .../components/TimelineSpace/Modals/NewToot/Status.vue    | 2 +-
 src/renderer/main.ts                                      | 8 ++++++--
 yarn.lock                                                 | 7 +++++++
 5 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index d58f9c68..14ecb386 100644
--- a/package.json
+++ b/package.json
@@ -70,6 +70,7 @@
   },
   "dependencies": {
     "@fortawesome/fontawesome-svg-core": "^6.1.0",
+    "@fortawesome/free-regular-svg-icons": "^6.1.0",
     "@fortawesome/free-solid-svg-icons": "^6.1.0",
     "@fortawesome/vue-fontawesome": "^2.0.6",
     "@panter/vue-i18next": "^0.15.2",
diff --git a/src/renderer/components/TimelineSpace/Modals/NewToot/Poll.vue b/src/renderer/components/TimelineSpace/Modals/NewToot/Poll.vue
index c606620d..167dd391 100644
--- a/src/renderer/components/TimelineSpace/Modals/NewToot/Poll.vue
+++ b/src/renderer/components/TimelineSpace/Modals/NewToot/Poll.vue
@@ -4,7 +4,7 @@
       <li class="poll-option" v-for="(option, id) in value" v-bind:key="id">
         <el-radio :disabled="true" :label="id">
           <el-input :placeholder="`choice ${id}`" :value="value[id]" @input="value => updateOption(value, id)" size="small"></el-input>
-          <el-button class="remove-poll" type="text" @click="removePoll(id)" size="small"><icon name="times"></icon></el-button>
+          <el-button class="remove-poll" type="text" @click="removePoll(id)" size="small"><font-awesome-icon icon="xmark" /></el-button>
         </el-radio>
       </li>
     </ul>
diff --git a/src/renderer/components/TimelineSpace/Modals/NewToot/Status.vue b/src/renderer/components/TimelineSpace/Modals/NewToot/Status.vue
index c10403ef..c5dc8b52 100644
--- a/src/renderer/components/TimelineSpace/Modals/NewToot/Status.vue
+++ b/src/renderer/components/TimelineSpace/Modals/NewToot/Status.vue
@@ -41,7 +41,7 @@
     </el-popover>
     <div v-click-outside="hideEmojiPicker">
       <el-button type="text" class="emoji-selector" @click="toggleEmojiPicker">
-        <icon name="regular/smile" scale="1.2"></icon>
+        <font-awesome-icon :icon="['far', 'face-smile']" size="lg" />
       </el-button>
       <div v-if="openEmojiPicker" class="emoji-picker">
         <picker set="emojione" :autoFocus="true" :custom="pickerEmojis" @select="selectEmoji" />
diff --git a/src/renderer/main.ts b/src/renderer/main.ts
index aeea1f61..68a2e1d8 100644
--- a/src/renderer/main.ts
+++ b/src/renderer/main.ts
@@ -24,8 +24,10 @@ import {
   faLock,
   faEyeSlash,
   faEye,
-  faPlus
+  faPlus,
+  faXmark
 } from '@fortawesome/free-solid-svg-icons'
+import { faFaceSmile } from '@fortawesome/free-regular-svg-icons'
 import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome'
 import 'vue-awesome/icons'
 import Icon from 'vue-awesome/components/Icon'
@@ -66,7 +68,9 @@ library.add(
   faLock,
   faEyeSlash,
   faEye,
-  faPlus
+  faPlus,
+  faFaceSmile,
+  faXmark
 )
 
 Vue.use(ElementUI, { locale })
diff --git a/yarn.lock b/yarn.lock
index 0e1259f2..f0a289de 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1067,6 +1067,13 @@
   dependencies:
     "@fortawesome/fontawesome-common-types" "6.1.0"
 
+"@fortawesome/free-regular-svg-icons@^6.1.0":
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/@fortawesome/free-regular-svg-icons/-/free-regular-svg-icons-6.1.0.tgz#5e6fb07e170a76ff8d081fb352022f933ecbb5f9"
+  integrity sha512-MLSBZ3AprHZXVG6zVg9Jd/mGZrlX/1jxqQsHhvZuhdRdL9bZQyXHe5RmP0n4IOth/fdnoj3fs+EnbW/O+0K4dw==
+  dependencies:
+    "@fortawesome/fontawesome-common-types" "6.1.0"
+
 "@fortawesome/free-solid-svg-icons@^6.1.0":
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.1.0.tgz#1bdc3ce6ddd2336348ba324ac4a72161725b0d95"