From c129c38631b6f73c1661d4b1ed6f14d7830d6eb8 Mon Sep 17 00:00:00 2001
From: Matteo Pagliazzi <matteopagliazzi@gmail.com>
Date: Fri, 25 Aug 2017 23:54:50 +0200
Subject: [PATCH] Paglias/client fixes (#8990)

* correct buttons for reset modal

* correct buttons for delete account modal

* fix first party member not showing up
---
 website/client/components/appHeader.vue            | 8 ++------
 website/client/components/memberDetails.vue        | 5 ++---
 website/client/components/settings/deleteModal.vue | 4 ++--
 website/client/components/settings/resetModal.vue  | 4 ++--
 4 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/website/client/components/appHeader.vue b/website/client/components/appHeader.vue
index a3538b26d7..10b7b3cff2 100644
--- a/website/client/components/appHeader.vue
+++ b/website/client/components/appHeader.vue
@@ -6,7 +6,7 @@
   .view-party(v-if="user.party && user.party._id && partyMembers && partyMembers.length > 1")
     // TODO button should open the party members modal
     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(
       v-for="(member, $index) in partyMembers",
       :key="member._id",
@@ -48,16 +48,12 @@
     flex-grow: 1;
   }
 
-  .party-members {
-    max-width: 100%;
-    overflow: scroll;
-  }
-
   .view-party {
     position: absolute;
     z-index: 10;
     right: 0;
     padding-right: 40px;
+    padding-left: 10px;
     height: 100%;
     background-image: linear-gradient(to right, rgba($purple-50, 0), $purple-50);
 
diff --git a/website/client/components/memberDetails.vue b/website/client/components/memberDetails.vue
index 54b427df54..f51925a8d4 100644
--- a/website/client/components/memberDetails.vue
+++ b/website/client/components/memberDetails.vue
@@ -44,13 +44,12 @@ div
     padding-left: 16px;
     padding-right: 24px;
     opacity: 1;
-    transition: opacity 0.15s ease-out;
+    transition: width 0.15s ease-out;
   }
 
   .member-details.condensed:not(.expanded) .member-stats {
     opacity: 0;
-    position: absolute;
-    z-index: -1;
+    display: none;
   }
 
   // Condensed version
diff --git a/website/client/components/settings/deleteModal.vue b/website/client/components/settings/deleteModal.vue
index bb3249939e..10d47ffd67 100644
--- a/website/client/components/settings/deleteModal.vue
+++ b/website/client/components/settings/deleteModal.vue
@@ -12,8 +12,8 @@
             label(for='feedbackTextArea') {{ $t('feedback') }}
             textarea#feedbackTextArea.form-control(v-model='feedback')
       .modal-footer
-        button.btn.btn-danger(@click='close()') {{ $t('neverMind') }}
-        button.btn.btn-primary(@click='deleteAccount()', :disabled='!password') {{ $t('deleteDo') }}
+        button.btn.btn-primary(@click='close()') {{ $t('neverMind') }}
+        button.btn.btn-danger(@click='deleteAccount()', :disabled='!password') {{ $t('deleteDo') }}
         .modal-header
     .social-delete(v-if='!user.auth.local.email')
       h4 {{ $t('deleteAccount') }}
diff --git a/website/client/components/settings/resetModal.vue b/website/client/components/settings/resetModal.vue
index a07eb902b9..ea19d208d5 100644
--- a/website/client/components/settings/resetModal.vue
+++ b/website/client/components/settings/resetModal.vue
@@ -3,8 +3,8 @@
     p {{ $t('resetText1') }}
     p {{ $t('resetText2') }}
     .modal-footer
-      button.btn.btn-danger(@click='close()') {{ $t('neverMind') }}
-      button.btn.btn-primary(@click='reset()') {{ $t('resetDo') }}
+      button.btn.btn-primary(@click='close()') {{ $t('neverMind') }}
+      button.btn.btn-danger(@click='reset()') {{ $t('resetDo') }}
 </template>
 
 <script>