diff options
| author | MeiMei <30769358+mei23@users.noreply.github.com> | 2018-12-21 02:30:49 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2018-12-21 02:30:49 +0900 |
| commit | decf2d396fbcfea9eb600c409b0b42b0e9b519a1 (patch) | |
| tree | 35f61eee1837839a13eca9079fd1a9deca563f1c /src | |
| parent | Fix: ap/show does not return on error (#3704) (diff) | |
| download | sharkey-decf2d396fbcfea9eb600c409b0b42b0e9b519a1.tar.gz sharkey-decf2d396fbcfea9eb600c409b0b42b0e9b519a1.tar.bz2 sharkey-decf2d396fbcfea9eb600c409b0b42b0e9b519a1.zip | |
Fix processing icon (#3705)
Diffstat (limited to 'src')
| -rw-r--r-- | src/client/app/common/views/components/follow-button.vue | 2 | ||||
| -rw-r--r-- | src/client/app/common/views/pages/follow.vue | 2 | ||||
| -rw-r--r-- | src/client/app/init.ts | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/src/client/app/common/views/components/follow-button.vue b/src/client/app/common/views/components/follow-button.vue index d88a11aca8..6d120f52b4 100644 --- a/src/client/app/common/views/components/follow-button.vue +++ b/src/client/app/common/views/components/follow-button.vue @@ -48,7 +48,7 @@ export default Vue.extend({ iconAndText(): any[] { return ( (this.hasPendingFollowRequestFromYou && this.user.isLocked) ? ['hourglass-half', this.$t('request-pending')] : - (this.hasPendingFollowRequestFromYou && !this.user.isLocked) ? ['hourglass-start', this.$t('follow-processing')] : + (this.hasPendingFollowRequestFromYou && !this.user.isLocked) ? ['spinner', this.$t('follow-processing')] : (this.isFollowing) ? ['minus', this.$t('following')] : (!this.isFollowing && this.user.isLocked) ? ['plus', this.$t('follow-request')] : (!this.isFollowing && !this.user.isLocked) ? ['plus', this.$t('follow')] : diff --git a/src/client/app/common/views/pages/follow.vue b/src/client/app/common/views/pages/follow.vue index 854982d91a..6c945ab22d 100644 --- a/src/client/app/common/views/pages/follow.vue +++ b/src/client/app/common/views/pages/follow.vue @@ -22,7 +22,7 @@ :disabled="followWait"> <template v-if="!followWait"> <template v-if="user.hasPendingFollowRequestFromYou && user.isLocked"><fa icon="hourglass-half"/> {{ $t('request-pending') }}</template> - <template v-else-if="user.hasPendingFollowRequestFromYou && !user.isLocked"><fa icon="hourglass-start"/> {{ $t('follow-processing') }}</template> + <template v-else-if="user.hasPendingFollowRequestFromYou && !user.isLocked"><fa icon="spinner"/> {{ $t('follow-processing') }}</template> <template v-else-if="user.isFollowing"><fa icon="minus"/> {{ $t('following') }}</template> <template v-else-if="!user.isFollowing && user.isLocked"><fa icon="plus"/> {{ $t('follow-request') }}</template> <template v-else-if="!user.isFollowing && !user.isLocked"><fa icon="plus"/> {{ $t('follow') }}</template> diff --git a/src/client/app/init.ts b/src/client/app/init.ts index d7dd1efedf..0004b43b47 100644 --- a/src/client/app/init.ts +++ b/src/client/app/init.ts @@ -123,6 +123,7 @@ import { faArrowLeft, faMapMarker, faRobot, + faHourglassHalf, } from '@fortawesome/free-solid-svg-icons'; import { @@ -253,6 +254,7 @@ library.add( faArrowLeft, faMapMarker, faRobot, + faHourglassHalf, farBell, farEnvelope, |