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

Paglias/client fixes (#8990)

Browse Source 
* correct buttons for reset modal

* correct buttons for delete account modal

* fix first party member not showing up
This commit is contained in:
Matteo Pagliazzi
2017-08-25 23:54:50 +02:00
committed by GitHub
parent 748ce8a23f
commit c129c38631
4 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
website/client/components/appHeader.vue
View File

@@ -6,7 +6,7 @@
.view-party(v-if="user.party && user.party._id && partyMembers && partyMembers.length > 1") .view-party(v-if="user.party && user.party._id && partyMembers && partyMembers.length > 1")
// TODO button should open the party members modal // TODO button should open the party members modal
button.btn.btn-primary(@click='openPartyModal()') {{ $t('viewParty') }} button.btn.btn-primary(@click='openPartyModal()') {{ $t('viewParty') }}
.col-6.party-members.d-flex.flex-row(v-if="partyMembers && partyMembers.length > 1") .party-members.d-flex(v-if="partyMembers && partyMembers.length > 1")
member-details( member-details(
v-for="(member, $index) in partyMembers", v-for="(member, $index) in partyMembers",
:key="member._id", :key="member._id",
@@ -48,16 +48,12 @@
flex-grow: 1; flex-grow: 1;
} }
.party-members {
max-width: 100%;
overflow: scroll;
}
.view-party { .view-party {
position: absolute; position: absolute;
z-index: 10; z-index: 10;
right: 0; right: 0;
padding-right: 40px; padding-right: 40px;
padding-left: 10px;
height: 100%; height: 100%;
background-image: linear-gradient(to right, rgba($purple-50, 0), $purple-50); background-image: linear-gradient(to right, rgba($purple-50, 0), $purple-50);

5
website/client/components/memberDetails.vue
View File

@@ -44,13 +44,12 @@ div
padding-left: 16px; padding-left: 16px;
padding-right: 24px; padding-right: 24px;
opacity: 1; opacity: 1;
transition: opacity 0.15s ease-out; transition: width 0.15s ease-out;
} }
.member-details.condensed:not(.expanded) .member-stats { .member-details.condensed:not(.expanded) .member-stats {
opacity: 0; opacity: 0;
position: absolute; display: none;
z-index: -1;
} }
// Condensed version // Condensed version

4
website/client/components/settings/deleteModal.vue
View File

@@ -12,8 +12,8 @@
label(for='feedbackTextArea') {{ $t('feedback') }} label(for='feedbackTextArea') {{ $t('feedback') }}
textarea#feedbackTextArea.form-control(v-model='feedback') textarea#feedbackTextArea.form-control(v-model='feedback')
.modal-footer .modal-footer
button.btn.btn-danger(@click='close()') {{ $t('neverMind') }} button.btn.btn-primary(@click='close()') {{ $t('neverMind') }}
button.btn.btn-primary(@click='deleteAccount()', :disabled='!password') {{ $t('deleteDo') }} button.btn.btn-danger(@click='deleteAccount()', :disabled='!password') {{ $t('deleteDo') }}
.modal-header .modal-header
.social-delete(v-if='!user.auth.local.email') .social-delete(v-if='!user.auth.local.email')
h4 {{ $t('deleteAccount') }} h4 {{ $t('deleteAccount') }}

4
website/client/components/settings/resetModal.vue
View File

@@ -3,8 +3,8 @@
p {{ $t('resetText1') }} p {{ $t('resetText1') }}
p {{ $t('resetText2') }} p {{ $t('resetText2') }}
.modal-footer .modal-footer
button.btn.btn-danger(@click='close()') {{ $t('neverMind') }} button.btn.btn-primary(@click='close()') {{ $t('neverMind') }}
button.btn.btn-primary(@click='reset()') {{ $t('resetDo') }} button.btn.btn-danger(@click='reset()') {{ $t('resetDo') }}
</template> </template>
<script> <script>