solve conflicts

resources/assets/js/components/dataViews/vueCardView/VueCardView.vue

@@ -1,7 +1,10 @@
 <template>
-  <div class="pm-vue-card-view">
+  <div class="pm-vue-card-view" :height="height">
     <div class="pm-vue-card-view-container">
-      <div>
+      <div
+        class="pm-vue-card-view-body"
+        :style="{height: height + 'px'}"
+      >
         <vue-card v-for="item in data" :key="item.id">
           <slot
             v-for="column in options.columns"
@@ -12,6 +15,10 @@
           ></slot>
         </vue-card>
       </div>
+
+      <div class="pm-vue-card-view-footer">
+        <a @click="viewMore" class="list-group-item">View more</a>
+      </div>
     </div>
   </div>
 </template>
@@ -28,7 +35,6 @@ export default {
   props: ["options"],
   data() {
     return {
- 
     };
   },
   mounted() {
@@ -44,8 +50,19 @@ export default {
 
 <style>
 .pm-vue-card-view {
+  font-family: "proxima-nova", "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-size: 0.9rem;
 }
 
-.pm-vue-card-view-container {
+.pm-vue-card-view-body {
+  border: 1px solid rgba(0, 0, 0, 0.125);
+  padding-bottom: 5px;
+  margin-top: 5px;
+  overflow-y: auto;
+}
+
+.pm-vue-card-view-footer {
+  text-align: center;
+  line-height: 1.25;
 }
 </style>