Skip to content

Commit

Permalink
Merge pull request #45 from rslvn/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
rslvn authored Nov 2, 2020
2 parents b934207 + 9e151ae commit 98282f5
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 4 deletions.
4 changes: 2 additions & 2 deletions src/components/image/ProfilePhotoUpdater.vue
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
<h3 class="h3 has-margin-bottom-30">
{{ $t('image.crop.preview') }}
</h3>
<img v-if="previewSrc" :src="previewSrc" class="profile-200">
<img v-if="previewSrc" :src="previewSrc" class="profile-200-round has-margin-top-15">
<img v-if="previewSrc" :src="previewSrc" class="profile-200" alt="preview">
<img v-if="previewSrc" :src="previewSrc" class="profile-200-round has-margin-top-15" alt="preview2">
<div class="buttons is-centered has-margin-top-30">
<b-button>{{ $t('common.save') }}</b-button>
<b-button>{{ $t('common.cancel') }}</b-button>
Expand Down
2 changes: 1 addition & 1 deletion src/components/image/crop/ImageCropper.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<div>
<img ref="imageCropRef" class="img-container" :src="image.src" crossorigin>
<img ref="imageCropRef" class="img-container" :src="image.src" crossorigin alt="crop">
<slot name="preview" />
</div>
</template>
Expand Down
2 changes: 1 addition & 1 deletion src/components/navbar/TopNavbar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<b-navbar-item v-if="authUser" tag="router-link" :to="dynamicProfileRoute">
<b-field>
<BackgroundSquareImage :image-url="profilePhoto" size="28" rounded="true" />
<span class="has-margin-left-5"><b>{{ authUser.name || authUser.email }}</b></span>
<span class="has-margin-left-5"><strong>{{ authUser.name || authUser.email }}</strong></span>
</b-field>
</b-navbar-item>

Expand Down
1 change: 1 addition & 0 deletions src/plugins/vee-validate-plugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { getUserByUsername } from '~/service/firebase/firestore'

for (const [rule, validation] of Object.entries(rules)) {
extend(rule, {
params: [],
...validation
})
}
Expand Down

0 comments on commit 98282f5

Please sign in to comment.