sjw
/
pleroma-fe
mirror of https://git.pleroma.social/sjw/pleroma-fe.git
1
0
Fork 0
Code Issues Releases Wiki Activity

cancel -> times

This commit is contained in:
Henry Jameson 2020-10-20 21:18:23 +03:00
parent e8650d3409
commit 046c60cb61
25 changed files with 127 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/components/chat_message/chat_message.js
View File

@ -7,6 +7,14 @@ import LinkPreview from '../link-preview/link-preview.vue'
import StatusContent from '../status_content/status_content.vue'
import ChatMessageDate from '../chat_message_date/chat_message_date.vue'
import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
import { library } from '@fortawesome/fontawesome-svg-core'
import {
faTimes
} from '@fortawesome/free-solid-svg-icons'
library.add(
faTimes
)
const ChatMessage = {
name: 'ChatMessage',

2
src/components/chat_message/chat_message.vue
View File

@ -56,7 +56,7 @@
class="dropdown-item dropdown-item-icon"
@click="deleteMessage"
>
<i class="icon-cancel" /> {{ $t("chats.delete") }}
<FAIcon icon="times" /> {{ $t("chats.delete") }}
</button>
</div>
</div>

8
src/components/chat_panel/chat_panel.js
View File

@ -1,9 +1,13 @@
import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
import { library } from '@fortawesome/fontawesome-svg-core'
import { faBullhorn } from '@fortawesome/free-solid-svg-icons'
import {
faBullhorn,
faTimes
} from '@fortawesome/free-solid-svg-icons'
library.add(
faBullhorn
faBullhorn,
faTimes
)
const chatPanel = {

2
src/components/chat_panel/chat_panel.vue
View File

@ -13,7 +13,7 @@
<span>{{ $t('shoutbox.title') }}</span>
<i
v-if="floating"
class="icon-cancel"
icon="times"
/>
</div>
</div>

8
src/components/global_notice_list/global_notice_list.js
View File

@ -1,3 +1,11 @@
import { library } from '@fortawesome/fontawesome-svg-core'
import {
faTimes
} from '@fortawesome/free-solid-svg-icons'
library.add(
faTimes
)
const GlobalNoticeList = {
computed: {

2
src/components/global_notice_list/global_notice_list.vue
View File

@ -10,7 +10,7 @@
{{ $t(notice.messageKey, notice.messageArgs) }}
</div>
<i
class="button-icon icon-cancel"
class="button-icon" icon="times"
@click="closeNotice(notice)"
/>
</div>

8
src/components/image_cropper/image_cropper.js
View File

@ -1,5 +1,13 @@
import Cropper from 'cropperjs'
import 'cropperjs/dist/cropper.css'
import { library } from '@fortawesome/fontawesome-svg-core'
import {
faTimes
} from '@fortawesome/free-solid-svg-icons'
library.add(
faTimes
)
const ImageCropper = {
props: {

4
src/components/image_cropper/image_cropper.vue
View File

@ -41,8 +41,8 @@
class="alert error"
>
{{ submitErrorMsg }}
<i
class="button-icon icon-cancel"
<FAIcon
class="button-icon" icon="times"
@click="clearError"
/>
</div>

8
src/components/login_form/login_form.js
View File

@ -1,5 +1,13 @@
import { mapState, mapGetters, mapActions, mapMutations } from 'vuex'
import oauthApi from '../../services/new_api/oauth.js'
import { library } from '@fortawesome/fontawesome-svg-core'
import {
faTimes
} from '@fortawesome/free-solid-svg-icons'
library.add(
faTimes
)
const LoginForm = {
data: () => ({

2
src/components/login_form/login_form.vue
View File

@ -77,7 +77,7 @@
<div class="alert error">
{{ error }}
<i
class="button-icon icon-cancel"
class="button-icon" icon="times"
@click="clearError"
/>
</div>

8
src/components/mfa_form/recovery_form.js
View File

@ -1,5 +1,13 @@
import mfaApi from '../../services/new_api/mfa.js'
import { mapState, mapGetters, mapActions, mapMutations } from 'vuex'
import { library } from '@fortawesome/fontawesome-svg-core'
import {
faTimes
} from '@fortawesome/free-solid-svg-icons'
library.add(
faTimes
)
export default {
data: () => ({

2
src/components/mfa_form/recovery_form.vue
View File

@ -55,7 +55,7 @@
<div class="alert error">
{{ error }}
<i
class="button-icon icon-cancel"
class="button-icon" icon="times"
@click="clearError"
/>
</div>

9
src/components/mfa_form/totp_form.js
View File

@ -1,5 +1,14 @@
import mfaApi from '../../services/new_api/mfa.js'
import { mapState, mapGetters, mapActions, mapMutations } from 'vuex'
import { library } from '@fortawesome/fontawesome-svg-core'
import {
faTimes
} from '@fortawesome/free-solid-svg-icons'
library.add(
faTimes
)
export default {
data: () => ({
code: null,

2
src/components/mfa_form/totp_form.vue
View File

@ -57,7 +57,7 @@
<div class="alert error">
{{ error }}
<i
class="button-icon icon-cancel"
class="button-icon" icon="times"
@click="clearError"
/>
</div>

8
src/components/mobile_nav/mobile_nav.js
View File

@ -3,6 +3,14 @@ import Notifications from '../notifications/notifications.vue'
import { unseenNotificationsFromStore } from '../../services/notification_utils/notification_utils'
import GestureService from '../../services/gesture_service/gesture_service'
import { mapGetters } from 'vuex'
import { library } from '@fortawesome/fontawesome-svg-core'
import {
faTimes
} from '@fortawesome/free-solid-svg-icons'
library.add(
faTimes
)
const MobileNav = {
components: {

2
src/components/mobile_nav/mobile_nav.vue
View File

@ -59,7 +59,7 @@
class="mobile-nav-button"
@click.stop.prevent="closeMobileNotifications()"
>
<i class="button-icon icon-cancel" />
<FAIcon class="button-icon" icon="times" />
</a>
</div>
<div

8
src/components/password_reset/password_reset.js
View File

@ -1,5 +1,13 @@
import { mapState } from 'vuex'
import passwordResetApi from '../../services/new_api/password_reset.js'
import { library } from '@fortawesome/fontawesome-svg-core'
import {
faTimes
} from '@fortawesome/free-solid-svg-icons'
library.add(
faTimes
)
const passwordReset = {
data: () => ({

2
src/components/password_reset/password_reset.vue
View File

@ -66,7 +66,7 @@
class="button-icon dismiss"
@click.prevent="dismissError()"
>
<i class="icon-cancel" />
<FAIcon icon="times" />
</a>
</p>
</div>

6
src/components/post_status_form/post_status_form.js
View File

@ -18,7 +18,8 @@ import {
faSmileBeam,
faPollH,
faUpload,
faBan
faBan,
faTimes
} from '@fortawesome/free-solid-svg-icons'
library.add(
@ -26,7 +27,8 @@ library.add(
faSmileBeam,
faPollH,
faUpload,
faBan
faBan,
faTimes
)
const buildMentionsString = ({ user, attentions = [] }, currentUser) => {

10
src/components/post_status_form/post_status_form.vue
View File

@ -40,7 +40,7 @@
class="button-icon dismiss"
@click.prevent="dismissScopeNotice()"
>
<i class="icon-cancel" />
<FAIcon icon="times" />
</a>
</p>
<p
@ -52,7 +52,7 @@
class="button-icon dismiss"
@click.prevent="dismissScopeNotice()"
>
<i class="icon-cancel" />
<FAIcon icon="times" />
</a>
</p>
<p
@ -64,7 +64,7 @@
class="button-icon dismiss"
@click.prevent="dismissScopeNotice()"
>
<i class="icon-cancel" />
<FAIcon icon="times" />
</a>
</p>
<p
@ -285,7 +285,7 @@
>
Error: {{ error }}
<i
class="button-icon icon-cancel"
class="button-icon" icon="times"
@click="clearError"
/>
</div>
@ -296,7 +296,7 @@
class="media-upload-wrapper"
>
<i
class="fa button-icon icon-cancel"
class="button-icon" icon="times"
@click="removeMediaFile(file)"
/>
<attachment

9
src/components/search_bar/search_bar.js
View File

@ -1,3 +1,12 @@
import { library } from '@fortawesome/fontawesome-svg-core'
import {
faTimes
} from '@fortawesome/free-solid-svg-icons'
library.add(
faTimes
)
const SearchBar = {
data: () => ({
searchTerm: undefined,

4
src/components/search_bar/search_bar.vue
View File

@ -29,8 +29,8 @@
>
<i class="icon-search" />
</button>
<i
class="button-icon icon-cancel"
<FAIcon
class="button-icon" icon="times"
@click.prevent.stop="toggleHidden"
/>
</template>

8
src/components/settings_modal/tabs/profile_tab.js
View File

@ -8,6 +8,14 @@ import EmojiInput from 'src/components/emoji_input/emoji_input.vue'
import suggestor from 'src/components/emoji_input/suggestor.js'
import Autosuggest from 'src/components/autosuggest/autosuggest.vue'
import Checkbox from 'src/components/checkbox/checkbox.vue'
import { library } from '@fortawesome/fontawesome-svg-core'
import {
faTimes
} from '@fortawesome/free-solid-svg-icons'
library.add(
faTimes
)
const ProfileTab = {
data () {

12
src/components/settings_modal/tabs/profile_tab.vue
View File

@ -129,7 +129,7 @@
>
<i
v-show="newFields.length > 1"
class="icon-cancel"
icon="times"
@click="deleteField(i)"
/>
</div>
@ -169,7 +169,7 @@
<i
v-if="!isDefaultAvatar && pickAvatarBtnVisible"
:title="$t('settings.reset_avatar')"
class="reset-button icon-cancel"
class="reset-button" icon="times"
type="button"
@click="resetAvatar"
/>
@ -197,7 +197,7 @@
<i
v-if="!isDefaultBanner"
:title="$t('settings.reset_profile_banner')"
class="reset-button icon-cancel"
class="reset-button" icon="times"
type="button"
@click="resetBanner"
/>
@ -231,7 +231,7 @@
>
Error: {{ bannerUploadError }}
<i
class="button-icon icon-cancel"
class="button-icon" icon="times"
@click="clearUploadError('banner')"
/>
</div>
@ -243,7 +243,7 @@
<i
v-if="!isDefaultBackground"
:title="$t('settings.reset_profile_background')"
class="reset-button icon-cancel"
class="reset-button" icon="times"
type="button"
@click="resetBackground"
/>
@ -277,7 +277,7 @@
>
Error: {{ backgroundUploadError }}
<i
class="button-icon icon-cancel"
class="button-icon" icon="times"
@click="clearUploadError('background')"
/>
</div>

13
src/components/settings_modal/tabs/theme_tab/preview.vue
View File

@ -53,7 +53,7 @@
/>
<i
style="color: var(--cRed)"
class="button-icon icon-cancel"
class="button-icon" icon="times"
/>
</div>
</div>
@ -103,6 +103,17 @@
</div>
</template>
<script>
import { library } from '@fortawesome/fontawesome-svg-core'
import {
faTimes
} from '@fortawesome/free-solid-svg-icons'
library.add(
faTimes
)
</script>
<style lang="scss">
.preview-container {
position: relative;