diff options
| author | Shpuld Shpuldson <shp@cock.li> | 2020-10-29 08:36:39 +0200 |
|---|---|---|
| committer | Shpuld Shpuldson <shp@cock.li> | 2020-10-29 08:36:39 +0200 |
| commit | cb3578fcca763a43ec946af75e6e345ed5adc14a (patch) | |
| tree | 85fdd3f8bf98eae557d33ca1a82e3688e4e7f309 /src/components/login_form | |
| parent | 7007659e05842dc06eb2c13eddaba6ab657df5ea (diff) | |
| parent | a84db4bd8f04bdfc14836f55f441aa8478265291 (diff) | |
fix conflicts
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> |