diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2020-10-28 21:21:35 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2020-10-28 21:21:35 +0000 |
| commit | a84db4bd8f04bdfc14836f55f441aa8478265291 (patch) | |
| tree | c5e08f042c0cbab4cc212e35c624d5afa65b85bc /src/components/login_form | |
| parent | e2c4816feb700d25bbeaebee6c5a67ae5f478e90 (diff) | |
| parent | ef36ca44f613c3d7d2ea11a9ad4f7fe828f7ae83 (diff) | |
Merge branch 'fontawesome5' into 'develop'
FontAwesome 5
Closes #982
See merge request pleroma/pleroma-fe!1260
Diffstat (limited to 'src/components/login_form')
| -rw-r--r-- | src/components/login_form/login_form.js | 8 | ||||
| -rw-r--r-- | src/components/login_form/login_form.vue | 5 |
2 files changed, 11 insertions, 2 deletions
diff --git a/src/components/login_form/login_form.js b/src/components/login_form/login_form.js index 0d8f1da6..638bd812 100644 --- a/src/components/login_form/login_form.js +++ b/src/components/login_form/login_form.js @@ -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: () => ({ diff --git a/src/components/login_form/login_form.vue b/src/components/login_form/login_form.vue index b4fdcefb..a1f77210 100644 --- a/src/components/login_form/login_form.vue +++ b/src/components/login_form/login_form.vue @@ -76,8 +76,9 @@ > <div class="alert error"> {{ error }} - <i - class="button-icon icon-cancel" + <FAIcon + class="fa-scale-110 fa-old-padding" + icon="times" @click="clearError" /> </div> |