fix

src/components/Global/Modal/BasicModal.vue

@@ -7,11 +7,7 @@
     dark
   >
     <main-back height="100%" :is-modal="true">
-      <component
+      <component :is="tag" @submit="$emit('submit')" :ref="tag == 'form' ? 'form' : null">
-        :is="tag"
-        @submit="$emit('submit')"
-        :ref="tag == 'form' ? 'form' : null"
-      >
         <v-card class="wa__modal">
           <div class="wa__modal-header">
             <slot name="header" :modal="modal" :data="data" v-if="modal"></slot>
@@ -19,9 +15,9 @@
           <v-card-text class="wa__modal-content pb-0">
             <slot :modal="modal" :data="data" v-if="modal"></slot>
           </v-card-text>
-          <template v-if="!notFooter">
+          <div v-if="hasFooter" class="px-4">
             <v-divider class="mb-0"></v-divider>
-          </template>
+          </div>
           <v-card-actions class="wa__modal-footer px-0">
             <slot name="footer" :modal="modal" :data="data" v-if="modal"></slot>
           </v-card-actions>
@@ -39,8 +35,8 @@ export default {
     maxWidth: { default: null },
     name: { default: null },
     transition: { default: "slide-x-transition" },
-    notFooter: {
+    hasFooter: {
-      default: false,
+      default: true,
     },
     tag: {
       default: "div",

src/components/ProgramSeries/Modals/AddSeriesModal.vue

@@ -61,8 +61,7 @@
       </div>
     </template>
     <template #footer>
-      <v-spacer></v-spacer>
+      <div class="d-flex justify-space-between align-items-center w-100 pb-10 px-4">
-      <div class="d-flex justify-space-between align-items-center w-100 pb-10">
         <RectangleButton
           class="btn__modal--cancel pl-0"
           text="cancel"

src/components/Programs/Modals/Detail.vue

@@ -69,12 +69,14 @@
     </template>
     <template #footer>
       <v-spacer></v-spacer>
-      <RectangleButton
+      <div class="px-4">
-        height="29"
+        <RectangleButton
-        class="btn__modal--confirm custom-btn wa__f__m__eb"
+          height="29"
-        text="close"
+          class="btn__modal--confirm custom-btn wa__f__m__eb"
-        @click="$_closeModal()"
+          text="close"
-      />
+          @click="$_closeModal()"
+        />
+      </div>
     </template>
   </basic-modal>
 </template>

src/components/Programs/Modals/FiltersModal.vue

@@ -70,8 +70,7 @@
       </div>
     </template>
     <template #footer>
-      <v-spacer></v-spacer>
+    <div class="d-flex justify-space-between align-items-center w-100 px-4">
-      <div class="d-flex justify-space-between align-items-center w-100">
         <RectangleButton
           class="btn__modal--cancel pl-0"
           text="cancel"

src/components/Users/Modals/ChangeRoleModal.vue

@@ -29,8 +29,7 @@
       </v-item-group>
     </template>
     <template #footer>
-      <v-spacer></v-spacer>
+      <div class="d-flex justify-space-between align-items-center w-100 px-4">
-      <div class="d-flex justify-space-between align-items-center w-100">
         <RectangleButton
           class="btn__modal--cancel pl-0"
           text="cancel"

src/components/Users/Modals/Detail.vue

@@ -61,12 +61,14 @@
     </template>
     <template #footer>
       <v-spacer></v-spacer>
-      <RectangleButton
+      <div class="px-4">
-        height="29"
+        <RectangleButton
-        class="btn__modal--confirm custom-btn wa__f__m__eb"
+          height="29"
-        text="close"
+          class="btn__modal--confirm custom-btn wa__f__m__eb"
-        @click="$_closeModal()"
+          text="close"
-      />
+          @click="$_closeModal()"
+        />
+      </div>
     </template>
   </basic-modal>
 </template>

src/components/Users/Modals/FiltersModal.vue

@@ -62,8 +62,7 @@
       </div>
     </template>
     <template #footer>
-      <v-spacer></v-spacer>
+      <div class="d-flex justify-space-between align-items-center w-100 px-4">
-      <div class="d-flex justify-space-between align-items-center w-100">
         <RectangleButton
           class="btn__modal--cancel pl-0"
           text="clear"

src/components/Workouts/Modals/Detail.vue

@@ -83,12 +83,14 @@
     </template>
     <template #footer>
       <v-spacer></v-spacer>
-      <RectangleButton
+      <div class="px-4">
-        height="29"
+        <RectangleButton
-        class="btn__modal--confirm custom-btn wa__f__m__eb"
+          height="29"
-        text="close"
+          class="btn__modal--confirm custom-btn wa__f__m__eb"
-        @click="$_closeModal()"
+          text="close"
-      />
+          @click="$_closeModal()"
+        />
+      </div>
     </template>
   </basic-modal>
 </template>

src/components/Workouts/Modals/FiltersModal.vue

@@ -49,8 +49,7 @@
       </div>
     </template>
     <template #footer>
-      <v-spacer></v-spacer>
+      <div class="d-flex justify-space-between align-items-center w-100 px-4">
-      <div class="d-flex justify-space-between align-items-center w-100">
         <RectangleButton
           class="btn__modal--cancel pl-0"
           text="clear"

src/components/WorkoutsSeries/Modals/AttachWorkoutModal.vue

@@ -103,8 +103,7 @@
       </div>
     </template>
     <template #footer>
-      <v-spacer></v-spacer>
+      <div class="d-flex justify-space-between align-items-center w-100 px-4">
-      <div class="d-flex justify-space-between align-items-center w-100">
         <RectangleButton
           class="btn__modal--cancel pl-0"
           text="cancel"