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

[client fix] Level-100 stats message (#9039)

Browse Source 
* Fix formatting for level 100 cap message

* Fix position for attribute points counter
* Fix text overflow in points box by increasing column width from 8 to 12

* Fix tests: Add userV to expected response in response middleware
This commit is contained in:
Michael Hibbs
2017-09-15 14:33:05 +01:00
committed by Matteo Pagliazzi
parent 89f8f047ae
commit 79b3b26ab2
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -252,11 +252,11 @@ div
#allocation(v-if='user._id === userLoggedIn._id') #allocation(v-if='user._id === userLoggedIn._id')
.row.title-row .row.title-row
.col-6 .col-6
h3(v-if='userLevel100Plus', v-once) {{ $t('noMoreAllocate') }} h3(v-if='userLevel100Plus', v-once, v-html="$t('noMoreAllocate')")
h3(v-if='user.stats.points || userLevel100Plus') h3(v-if='user.stats.points || userLevel100Plus')
| Points Available | Points Available
.counter.badge(v-if='user.stats.points || userLevel100Plus') .counter.badge(v-if='user.stats.points || userLevel100Plus')
| {{user.stats.points}}  | {{user.stats.points}} 
.col-6 .col-6
.float-right .float-right
toggle-switch(:label="$t('autoAllocation')", v-model='user.preferences.automaticAllocation', @change='userset({"preferences.automaticAllocation": Boolean(user.preferences.automaticAllocation), "preferences.allocationMode": "taskbased"})') toggle-switch(:label="$t('autoAllocation')", v-model='user.preferences.automaticAllocation', @change='userset({"preferences.automaticAllocation": Boolean(user.preferences.automaticAllocation), "preferences.allocationMode": "taskbased"})')
@@ -264,7 +264,7 @@ div
.row .row
.col-3(v-for='(statInfo, stat) in allocateStatsList') .col-3(v-for='(statInfo, stat) in allocateStatsList')
.box.white.row.col-12 .box.white.row.col-12
.col-8 .col-12
div(:class='stat') {{ $t(stats[stat].title) }} div(:class='stat') {{ $t(stats[stat].title) }}
.number {{ user.stats[stat] }} .number {{ user.stats[stat] }}
.points pts .points pts
@@ -476,9 +476,9 @@ div
} }
.counter.badge { .counter.badge {
position: absolute; position: relative;
top: -0.5em; top: -0.25em;
left: 10em; left: 0.5em;
color: #fff; color: #fff;
background-color: #ff944c; background-color: #ff944c;
box-shadow: 0 1px 1px 0 rgba(26, 24, 29, 0.12); box-shadow: 0 1px 1px 0 rgba(26, 24, 29, 0.12);