aboutsummaryrefslogtreecommitdiff
path: root/src/components/password_reset/password_reset.vue
diff options
context:
space:
mode:
authorShpuld Shpuldson <shp@cock.li>2020-10-29 08:36:39 +0200
committerShpuld Shpuldson <shp@cock.li>2020-10-29 08:36:39 +0200
commitcb3578fcca763a43ec946af75e6e345ed5adc14a (patch)
tree85fdd3f8bf98eae557d33ca1a82e3688e4e7f309 /src/components/password_reset/password_reset.vue
parent7007659e05842dc06eb2c13eddaba6ab657df5ea (diff)
parenta84db4bd8f04bdfc14836f55f441aa8478265291 (diff)
fix conflicts
Diffstat (limited to 'src/components/password_reset/password_reset.vue')
-rw-r--r--src/components/password_reset/password_reset.vue6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/components/password_reset/password_reset.vue b/src/components/password_reset/password_reset.vue
index 713c9dce..0deb9ccf 100644
--- a/src/components/password_reset/password_reset.vue
+++ b/src/components/password_reset/password_reset.vue
@@ -63,10 +63,10 @@
>
<span>{{ error }}</span>
<a
- class="button-icon dismiss"
+ class="fa-scale-110 fa-old-padding dismiss"
@click.prevent="dismissError()"
>
- <i class="icon-cancel" />
+ <FAIcon icon="times" />
</a>
</p>
</div>
@@ -122,7 +122,7 @@
padding-right: 2rem;
}
- .icon-cancel {
+ .dismiss {
cursor: pointer;
}
}