diff options
| author | Henry Jameson <me@hjkos.com> | 2018-12-18 22:43:26 +0300 |
|---|---|---|
| committer | Henry Jameson <me@hjkos.com> | 2018-12-18 22:43:26 +0300 |
| commit | 81c83566cd8a9bf09b568264e289591c52fbca0d (patch) | |
| tree | 327b6e195cb9820213dd838384353beb22e99f6b /src/components/user_settings/user_settings.vue | |
| parent | 485a531d57108f8adf57ae5043610ef107b26d3e (diff) | |
| parent | f62ff2d894d87c7e9c200687eb2a91bcb111e7e1 (diff) | |
Merge remote-tracking branch 'upstream/develop' into user-profile-overhault
* upstream/develop: (24 commits)
Feature/bigger icons for mobile / #211
Fix oauth url
Make user profile page cleaner
Redirect to /main/all
Move userProfile link to methods
Fix user profile test
Add temporary redirects
Add local profile test
Implement user_profile.spec.js
Use babel polyfill in karma
Use 'userProfileLink' to generate user-profile link
Rollback disableDotRule
Use "-1" in indexOf
Add generateProfileLink
Use "~" as a route namespace symbol
Disable dot rule
Pass userName instead of userId
Typo in tests
Fix redirect paths
Fix typo
...
Diffstat (limited to 'src/components/user_settings/user_settings.vue')
| -rw-r--r-- | src/components/user_settings/user_settings.vue | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/components/user_settings/user_settings.vue b/src/components/user_settings/user_settings.vue index b238571d..4bc2eeec 100644 --- a/src/components/user_settings/user_settings.vue +++ b/src/components/user_settings/user_settings.vue @@ -49,7 +49,7 @@ <button class="btn btn-default" v-else-if="avatarPreview" @click="submitAvatar">{{$t('general.submit')}}</button> <div class='alert error' v-if="avatarUploadError"> Error: {{ avatarUploadError }} - <i class="icon-cancel" @click="clearUploadError('avatar')"></i> + <i class="button-icon icon-cancel" @click="clearUploadError('avatar')"></i> </div> </div> <div class="setting-item"> @@ -66,7 +66,7 @@ <button class="btn btn-default" v-else-if="bannerPreview" @click="submitBanner">{{$t('general.submit')}}</button> <div class='alert error' v-if="bannerUploadError"> Error: {{ bannerUploadError }} - <i class="icon-cancel" @click="clearUploadError('banner')"></i> + <i class="button-icon icon-cancel" @click="clearUploadError('banner')"></i> </div> </div> <div class="setting-item"> @@ -81,7 +81,7 @@ <button class="btn btn-default" v-else-if="backgroundPreview" @click="submitBg">{{$t('general.submit')}}</button> <div class='alert error' v-if="backgroundUploadError"> Error: {{ backgroundUploadError }} - <i class="icon-cancel" @click="clearUploadError('background')"></i> + <i class="button-icon icon-cancel" @click="clearUploadError('background')"></i> </div> </div> </div> |