solve conflicts

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

@@ -1,6 +1,6 @@
 <template>
   <div class="pm-vue-card">
-    <div class="card" style="width: 18rem">
+    <div class="card pm-vue-card-inside" style="width: 20rem">
       <div class="card-body">
         <slot> </slot>
       </div>
@@ -13,8 +13,7 @@ export default {
   name: "VueCardView",
   props: ["columns", "item"],
   data() {
-    return {
-    };
+    return {};
   },
   methods: {
     classBtn(cls) {
@@ -27,5 +26,15 @@ export default {
 <style>
 .pm-vue-card {
   display: inline-block;
+  padding: 0.7rem;
+}
+.pm-vue-card-inside {
+  border-left: solid lightseagreen;
+  color: #212529;
+  background-color: #f8f9fa;
+}
+
+.pm-vue-card-inside:hover {
+  background-color: #cfd9e4;
 }
 </style>