WIP(profile): close button finally workinating

website/client/src/components/userMenu/profile.vue

@@ -1,8 +1,5 @@
 <template>
   <div>
-    <close-x
-      @click="close()"
-    />
     <div
       v-if="!user && userLoaded"
     >
@@ -512,6 +509,11 @@
 <style lang="scss" >
   @import '~@/assets/scss/colors.scss';
 
+  .modal-header {
+    padding: 24px;
+    border-bottom: 0px solid $white;
+    background-color: $white;
+  }
   #userProfile {
     .dropdown-menu {
       margin-left: -48px;
@@ -959,7 +961,6 @@ import markdown from '@/directives/markdown';
 import achievementsLib from '@/../../common/script/libs/achievements';
 import Content from '@/../../common/script/content';
 import profileStats from './profileStats';
-import closeX from '../ui/closeX';
 
 import message from '@/assets/svg/message.svg';
 import gift from '@/assets/svg/gift.svg';
@@ -990,7 +991,6 @@ export default {
     profileStats,
     error404,
     toggle,
-    closeX,
   },
   mixins: [externalLinks, userCustomStateMixin('userLoggedIn')],
   props: ['userId', 'startingPage'],
@@ -1322,9 +1322,6 @@ export default {
       this.isOpened = true;
       this.$emit('toggled', this.isOpened);
     },
-    close () {
-      this.$root.$emit('bv::hide::modal', 'profile');
-    },
   },
 };
 </script>

website/client/src/components/userMenu/profileModal.vue

@@ -2,10 +2,15 @@
   <b-modal
     id="profile"
     :hide-footer="true"
-    :hide-header="true"
     @hide="beforeHide"
     @shown="onShown()"
   >
+    <div slot="modal-header">
+      <close-x
+        @close="close()"
+      />
+    </div>
+
     <profile
       :user-id="userId"
       :starting-page="startingPage"
@@ -44,10 +49,12 @@
 
 <script>
 import profile from './profile';
+import closeX from '../ui/closeX';
 
 export default {
   components: {
     profile,
+    closeX,
   },
   data () {
     return {
@@ -76,6 +83,9 @@ export default {
         this.$router.back();
       }
     },
+    close () {
+      this.$root.$emit('bv::hide::modal', 'profile');
+    },
   },
 };