diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2021-04-20 23:22:59 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-20 23:22:59 +0900 |
| commit | 11349561d697b11df7bcaa3d57ed3498eb4dd3c5 (patch) | |
| tree | 8dfe96ed7c9b695872b7d416383920355621d3c3 /src/client/components/global | |
| parent | Tweak style (diff) | |
| download | misskey-11349561d697b11df7bcaa3d57ed3498eb4dd3c5.tar.gz misskey-11349561d697b11df7bcaa3d57ed3498eb4dd3c5.tar.bz2 misskey-11349561d697b11df7bcaa3d57ed3498eb4dd3c5.zip | |
Use FontAwesome as web font instead of vue component (#7469)
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* Update yarn.lock
* wip
* wip
Diffstat (limited to 'src/client/components/global')
| -rw-r--r-- | src/client/components/global/a.vue | 11 | ||||
| -rw-r--r-- | src/client/components/global/error.vue | 4 | ||||
| -rw-r--r-- | src/client/components/global/url.vue | 4 |
3 files changed, 7 insertions, 12 deletions
diff --git a/src/client/components/global/a.vue b/src/client/components/global/a.vue index 7ad62a7310..952dfb1841 100644 --- a/src/client/components/global/a.vue +++ b/src/client/components/global/a.vue @@ -6,7 +6,6 @@ <script lang="ts"> import { defineComponent } from 'vue'; -import { faExpandAlt, faColumns, faExternalLinkAlt, faLink, faWindowMaximize } from '@fortawesome/free-solid-svg-icons'; import * as os from '@client/os'; import copyToClipboard from '@client/scripts/copy-to-clipboard'; import { router } from '@client/router'; @@ -57,31 +56,31 @@ export default defineComponent({ type: 'label', text: this.to, }, { - icon: faWindowMaximize, + icon: 'fas fa-window-maximize', text: this.$ts.openInWindow, action: () => { os.pageWindow(this.to); } }, this.sideViewHook ? { - icon: faColumns, + icon: 'fas fa-columns', text: this.$ts.openInSideView, action: () => { this.sideViewHook(this.to); } } : undefined, { - icon: faExpandAlt, + icon: 'fas fa-expand-alt', text: this.$ts.showInPage, action: () => { this.$router.push(this.to); } }, null, { - icon: faExternalLinkAlt, + icon: 'fas fa-external-link-alt', text: this.$ts.openInNewTab, action: () => { window.open(this.to, '_blank'); } }, { - icon: faLink, + icon: 'fas fa-link', text: this.$ts.copyLink, action: () => { copyToClipboard(`${url}${this.to}`); diff --git a/src/client/components/global/error.vue b/src/client/components/global/error.vue index af989b1c57..05a508a653 100644 --- a/src/client/components/global/error.vue +++ b/src/client/components/global/error.vue @@ -2,7 +2,7 @@ <transition :name="$store.state.animation ? 'zoom' : ''" appear> <div class="mjndxjcg"> <img src="https://xn--931a.moe/assets/error.jpg" class="_ghost"/> - <p><Fa :icon="faExclamationTriangle"/> {{ $ts.somethingHappened }}</p> + <p><i class="fas fa-exclamation-triangle"></i> {{ $ts.somethingHappened }}</p> <MkButton @click="() => $emit('retry')" class="button">{{ $ts.retry }}</MkButton> </div> </transition> @@ -10,7 +10,6 @@ <script lang="ts"> import { defineComponent } from 'vue'; -import { faExclamationTriangle } from '@fortawesome/free-solid-svg-icons'; import MkButton from '@client/components/ui/button.vue'; export default defineComponent({ @@ -19,7 +18,6 @@ export default defineComponent({ }, data() { return { - faExclamationTriangle }; }, }); diff --git a/src/client/components/global/url.vue b/src/client/components/global/url.vue index f68a3c00be..e633a57bd8 100644 --- a/src/client/components/global/url.vue +++ b/src/client/components/global/url.vue @@ -15,13 +15,12 @@ <span class="pathname" v-if="pathname != ''">{{ self ? pathname.substr(1) : pathname }}</span> <span class="query">{{ query }}</span> <span class="hash">{{ hash }}</span> - <Fa :icon="faExternalLinkSquareAlt" v-if="target === '_blank'" class="icon"/> + <i v-if="target === '_blank'" class="fas fa-external-link-square-alt icon"></i> </component> </template> <script lang="ts"> import { defineComponent } from 'vue'; -import { faExternalLinkSquareAlt } from '@fortawesome/free-solid-svg-icons'; import { toUnicode as decodePunycode } from 'punycode/'; import { url as local } from '@client/config'; import { isDeviceTouch } from '@client/scripts/is-device-touch'; @@ -55,7 +54,6 @@ export default defineComponent({ hideTimer: null, checkTimer: null, close: null, - faExternalLinkSquareAlt }; }, created() { |