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

View file

@ -7,6 +7,14 @@ import LinkPreview from '../link-preview/link-preview.vue'
import StatusContent from '../status_content/status_content.vue' import StatusContent from '../status_content/status_content.vue'
import ChatMessageDate from '../chat_message_date/chat_message_date.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 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 = { const ChatMessage = {
name: 'ChatMessage', name: 'ChatMessage',

View file

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

View file

@ -1,9 +1,13 @@
import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator' import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
import { library } from '@fortawesome/fontawesome-svg-core' 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( library.add(
faBullhorn faBullhorn,
faTimes
) )
const chatPanel = { const chatPanel = {

View file

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

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 = { const GlobalNoticeList = {
computed: { computed: {

View file

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

View file

@ -1,5 +1,13 @@
import Cropper from 'cropperjs' import Cropper from 'cropperjs'
import 'cropperjs/dist/cropper.css' 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 = { const ImageCropper = {
props: { props: {

View file

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

View file

@ -1,5 +1,13 @@
import { mapState, mapGetters, mapActions, mapMutations } from 'vuex' import { mapState, mapGetters, mapActions, mapMutations } from 'vuex'
import oauthApi from '../../services/new_api/oauth.js' 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 = { const LoginForm = {
data: () => ({ data: () => ({

View file

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

View file

@ -1,5 +1,13 @@
import mfaApi from '../../services/new_api/mfa.js' import mfaApi from '../../services/new_api/mfa.js'
import { mapState, mapGetters, mapActions, mapMutations } from 'vuex' 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 { export default {
data: () => ({ data: () => ({

View file

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

View file

@ -1,5 +1,14 @@
import mfaApi from '../../services/new_api/mfa.js' import mfaApi from '../../services/new_api/mfa.js'
import { mapState, mapGetters, mapActions, mapMutations } from 'vuex' 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 { export default {
data: () => ({ data: () => ({
code: null, code: null,

View file

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

View file

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

View file

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

View file

@ -1,5 +1,13 @@
import { mapState } from 'vuex' import { mapState } from 'vuex'
import passwordResetApi from '../../services/new_api/password_reset.js' 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 = { const passwordReset = {
data: () => ({ data: () => ({

View file

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

View file

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

View file

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

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 = { const SearchBar = {
data: () => ({ data: () => ({
searchTerm: undefined, searchTerm: undefined,

View file

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

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 suggestor from 'src/components/emoji_input/suggestor.js'
import Autosuggest from 'src/components/autosuggest/autosuggest.vue' import Autosuggest from 'src/components/autosuggest/autosuggest.vue'
import Checkbox from 'src/components/checkbox/checkbox.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 = { const ProfileTab = {
data () { data () {

View file

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

View file

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