krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-19 07:37:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix item-with-icon height/margins . public guild item member count

Browse Source
This commit is contained in:
negue
2019-03-09 22:19:55 +01:00
parent 8ecbdc1448
commit caea222330
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
website/client/components/groups/group.vue
View File

@@ -21,12 +21,12 @@
.svg-icon.shield(v-html="icons.silverGuildBadgeIcon", v-if='group.memberCount > 100 && group.memberCount < 999') .svg-icon.shield(v-html="icons.silverGuildBadgeIcon", v-if='group.memberCount > 100 && group.memberCount < 999')
.svg-icon.shield(v-html="icons.bronzeGuildBadgeIcon", v-if='group.memberCount < 100') .svg-icon.shield(v-html="icons.bronzeGuildBadgeIcon", v-if='group.memberCount < 100')
span.number {{ group.memberCount | abbrNum }} span.number {{ group.memberCount | abbrNum }}
div.member-list(v-once) {{ $t('memberList') }} div.member-list.label(v-once) {{ $t('memberList') }}
.col-4(v-if='!isParty') .col-4(v-if='!isParty')
.item-with-icon(@click='showGroupGems()') .item-with-icon(@click='showGroupGems()')
.svg-icon.gem(v-html="icons.gem") .svg-icon.gem(v-html="icons.gem")
span.number {{group.balance * 4}} span.number {{group.balance * 4}}
div(v-once) {{ $t('guildBank') }} div.label(v-once) {{ $t('guildBank') }}
chat( chat(
:label="$t('chat')", :label="$t('chat')",
:group="group", :group="group",
@@ -100,6 +100,9 @@
box-shadow: 0 2px 2px 0 rgba(26, 24, 29, 0.16), 0 1px 4px 0 rgba(26, 24, 29, 0.12); box-shadow: 0 2px 2px 0 rgba(26, 24, 29, 0.16), 0 1px 4px 0 rgba(26, 24, 29, 0.12);
padding: 1em; padding: 1em;
text-align: center; text-align: center;
min-width: 80px;
max-width: 120px;
height: 76px;
.svg-icon.shield, .svg-icon.gem { .svg-icon.shield, .svg-icon.gem {
width: 28px; width: 28px;
@@ -115,7 +118,7 @@
font-weight: bold; font-weight: bold;
} }
.member-list { .label {
margin-top: .5em; margin-top: .5em;
} }
} }

2
website/client/components/groups/publicGuildItem.vue
View File

@@ -109,7 +109,7 @@ router-link.card-link(:to="{ name: 'guild', params: { groupId: guild._id } }")
.member-count { .member-count {
position: relative; position: relative;
top: -3.6em; top: -3.7em;
font-size: 18px; font-size: 18px;
font-weight: bold; font-weight: bold;
line-height: 1.1; line-height: 1.1;