Merge remote-tracking branch 'upstream/develop' into neckbeard
This commit is contained in:
commit
f13f8f7245
|
@ -101,6 +101,9 @@ const Notifications = {
|
|||
if (!this.scrollerRef) {
|
||||
this.scrollerRef = this.$refs.root.closest('.mobile-notifications')
|
||||
}
|
||||
if (!this.scrollerRef) {
|
||||
this.scrollerRef = this.$refs.root.closest('.column.main')
|
||||
}
|
||||
this.scrollerRef.addEventListener('scroll', this.updateScrollPosition)
|
||||
},
|
||||
unmounted () {
|
||||
|
|
|
@ -158,10 +158,10 @@
|
|||
class="form-error"
|
||||
>
|
||||
<ul>
|
||||
<li v-if="!v$.user.confirm.required">
|
||||
<li v-if="v$.user.confirm.required.$invalid">
|
||||
<span>{{ $t('registration.validations.password_confirmation_required') }}</span>
|
||||
</li>
|
||||
<li v-if="!v$.user.confirm.sameAsPassword">
|
||||
<li v-if="v$.user.confirm.sameAs.$invalid">
|
||||
<span>{{ $t('registration.validations.password_confirmation_match') }}</span>
|
||||
</li>
|
||||
</ul>
|
||||
|
|
Loading…
Reference in New Issue