krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-15 21:57:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed block icon not showing in profile modal. (#9667)

Browse Source 
* Fixed block and add icon not showing and the ordering of the buttons. Also fixed and added tooltips for buttons.

* Changed unnecessary change of color in svg icon files and changed tooltip attribute to not be empty
This commit is contained in:
Andrew Bustos
2017-12-05 14:01:18 -07:00
committed by Sabe Jones
parent ec179182e7
commit 341f16cc82
3 changed files with 29 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
website/client/components/userMenu/profile.vue
View File

@@ -3,18 +3,16 @@ div
b-modal#profile(title="Profile", size='lg', :hide-footer="true")
div(slot='modal-header')
.profile-actions
button.btn.btn-secondary(@click='sendMessage()')
button.btn.btn-secondary.message-icon(@click='sendMessage()', v-b-tooltip.hover.left="$t('sendMessage')")
.svg-icon.message-icon(v-html="icons.message")
button.btn.btn-secondary(v-if='user._id !== this.userLoggedIn._id && userLoggedIn.inbox.blocks.indexOf(user._id) === -1', :tooltip="$t('unblock')",
@click="blockUser()", tooltip-placement='right')
span.glyphicon.glyphicon-plus
| {{$t('block')}}
button.btn.btn-secondary(v-if='user._id !== this.userLoggedIn._id && userLoggedIn.inbox.blocks.indexOf(user._id) !== -1',
:tooltip="$t('unblock')", @click="unblockUser()", tooltip-placement='right')
span.glyphicon.glyphicon-ban-circle
| {{$t('unblock')}}
button.btn.btn-secondary(@click='openSendGemsModal()')
button.btn.btn-secondary.gift-icon(@click='openSendGemsModal()', v-b-tooltip.hover.bottom="$t('sendGems')")
.svg-icon.gift-icon(v-html="icons.gift")
button.btn.btn-secondary.remove-icon(v-if='user._id !== this.userLoggedIn._id && userLoggedIn.inbox.blocks.indexOf(user._id) === -1',
@click="blockUser()", v-b-tooltip.hover.right="$t('block')")
.svg-icon.remove-icon(v-html="icons.remove")
button.btn.btn-secondary.positive-icon(v-if='user._id !== this.userLoggedIn._id && userLoggedIn.inbox.blocks.indexOf(user._id) !== -1',
@click="unblockUser()", v-b-tooltip.hover.right="$t('unblock')")
.svg-icon.positive-icon(v-html="icons.positive")
.row
.col-12
member-details(:member="user")
@@ -307,17 +305,31 @@ div
button {
width: 40px;
height: 40px;
padding: .8em;
padding: .7em;
margin-right: .5em;
}
}
.message-icon {
width: 16px;
color: #686274;
}
.gift-icon {
width: 14px;
padding: 0 0 0 1px;
color: #686274;
}
.remove-icon {
width:16px;
color: #686274;
}
.positive-icon {
width: 14px;
color: #686274;
}
.pet-mount-row {
@@ -573,6 +585,8 @@ const TOTAL_NUMBER_OF_DROP_ANIMALS = DROP_ANIMALS.length;
import message from 'assets/svg/message.svg';
import gift from 'assets/svg/gift.svg';
import remove from 'assets/svg/remove.svg';
import positive from 'assets/svg/positive.svg';
import dots from 'assets/svg/dots.svg';
export default {
@@ -588,6 +602,8 @@ export default {
return {
icons: Object.freeze({
message,
remove,
positive,
gift,
dots,
}),