Merge branch 'master' into workout_detail

src/components/Global/Button/RectangleButton.vue

@@ -14,12 +14,7 @@
     @click.native="$emit('click')"
   >
     <template v-if="text">
-      <template v-if="icon"
-        ><v-icon
-          :size="size"
-          :class="[icon, { 'mr-1': !isModal, modal__icon: isModal }]"
-        ></v-icon
-      ></template>
+      <template v-if="icon"><v-icon :size="size" :class="icon"></v-icon></template>
       {{ text }}
       <template v-if="iconRight"
         ><v-icon :size="size" :class="[iconRight, 'ml-1']"></v-icon
@@ -51,9 +46,6 @@ export default {
     bgColor: {
       default: "transparent",
     },
-    isModal: {
-      default: false,
-    },
     type: {
       type: String,
       default: "button",
@@ -76,10 +68,6 @@ export default {
 .filter-btn .v-btn__content .v-icon::before {
   margin-left: 0 !important;
 }
-// .modal__icon::before {
-//   margin-right: 0 !important;
-//   margin-left: 0 !important;
-// }
 @import "../../../styles/setup/variables.scss";
 @each $color, $value in $allColors {
   .v-btn.color-#{ "" + $color} {

src/components/ProgramSeries/Modals/AddSeriesModal.vue

@@ -66,10 +66,8 @@
         <RectangleButton
           class="btn__modal--cancel pl-0"
           text="cancel"
-          icon="WMi-cancel-1"
+          icon="WMi-cancel-linear"
           text-mode="text"
-          size="large"
-          :is-modal="true"
           height="29"
           @click="$_closeModal()"
         />

src/components/Programs/Modals/FiltersModal.vue

@@ -75,10 +75,8 @@
         <RectangleButton
           class="btn__modal--cancel pl-0"
           text="cancel"
-          icon="WMi-cancel-1"
+          icon="WMi-cancel-linear"
           text-mode="text"
-          size="large"
-          :is-modal="true"
           height="29"
           @click="clearFilter"
         />

src/components/Users/Modals/ChangeRoleModal.vue

@@ -34,10 +34,8 @@
         <RectangleButton
           class="btn__modal--cancel pl-0"
           text="cancel"
-          icon="WMi-cancel-1"
+          icon="WMi-cancel-linear"
           text-mode="text"
-          size="large"
-          :is-modal="true"
           height="29"
           @click="$_closeModal()"
         />

src/components/Users/Modals/FiltersModal.vue

@@ -67,10 +67,8 @@
         <RectangleButton
           class="btn__modal--cancel pl-0"
           text="clear"
-          icon="WMi-cancel-1"
+          icon="WMi-cancel-linear"
           text-mode="text"
-          size="large"
-          :is-modal="true"
           height="29"
           @click="clearFilter"
         />

src/components/Workouts/Modals/FiltersModal.vue

@@ -54,10 +54,8 @@
         <RectangleButton
           class="btn__modal--cancel pl-0"
           text="clear"
-          icon="WMi-cancel-1"
+          icon="WMi-cancel-linear"
           text-mode="text"
-          size="large"
-          :is-modal="true"
           height="29"
           @click="clearFilter"
         />

src/components/WorkoutsSeries/Modals/AddWorkoutModal.vue

@@ -44,14 +44,7 @@
                   class="mt-3"
                 /> -->
                 <div class="pb-3 align mt-2">
-                  <div
-                    class="
-                      series__workout__title
-                      wa__f__m__eb
-                      text-uppercase
-                      mb-2
-                    "
-                  >
+                  <div class="series__workout__title wa__f__m__eb text-uppercase mb-2">
                     {{ item.name }}
                   </div>
                   <div class="series__workout__description">
@@ -65,9 +58,7 @@
         <template v-if="Object.keys(selectedWorkout).length !== 0">
           <v-divider class="mt-6"></v-divider>
           <v-row class="mt-1">
-            <v-col cols="12"
-              ><AddWorkoutsItem :addWorkout="selectedWorkout"
-            /></v-col>
+            <v-col cols="12"><AddWorkoutsItem :addWorkout="selectedWorkout" /></v-col>
           </v-row>
         </template>
         <div class="mt-6">
@@ -116,10 +107,8 @@
         <RectangleButton
           class="btn__modal--cancel pl-0"
           text="cancel"
-          icon="WMi-cancel-1"
+          icon="WMi-cancel-linear"
           text-mode="text"
-          size="large"
-          :is-modal="true"
           height="29"
           @click="$_closeModal()"
         />
@@ -183,10 +172,7 @@ export default {
     },
   },
   methods: {
-    ...mapActions("workoutToSeries", [
-      "loadWorkoutsToSeries",
-      "addWorkoutToSeries",
-    ]),
+    ...mapActions("workoutToSeries", ["loadWorkoutsToSeries", "addWorkoutToSeries"]),
     ...mapMutations("workoutToSeries", ["SET_FILTER_WORKOUTS_TO_SERIES"]),
     closeModal() {
       this.SET_FILTER_WORKOUTS_TO_SERIES({});
@@ -239,4 +225,4 @@ export default {
 .align {
   line-height: 4px;
 }
-</style>
+</style>