From 6ece7b720dda77c6cfb81d510a177544856b8c8b Mon Sep 17 00:00:00 2001
From: "f.shokouhi" <fhshokouhi@gmail.com>
Date: Sun, 3 Nov 2019 11:34:10 +0330
Subject: [PATCH] new changes

---
 .../js/vue/components/modal/cycle/Show.vue    | 33 ++++++++++++++++---
 .../js/vue/components/modal/label/Show.vue    |  4 +--
 .../js/vue/components/modal/package/Show.vue  |  2 +-
 resources/js/vue/views/Cycle/AddEdit.vue      | 30 ++++++++++++-----
 resources/js/vue/views/Package/AddEdit.vue    | 28 ++++++++++++----
 5 files changed, 76 insertions(+), 21 deletions(-)

diff --git a/resources/js/vue/components/modal/cycle/Show.vue b/resources/js/vue/components/modal/cycle/Show.vue
index 98f02117..56bcf88a 100644
--- a/resources/js/vue/components/modal/cycle/Show.vue
+++ b/resources/js/vue/components/modal/cycle/Show.vue
@@ -51,10 +51,10 @@
                 <v-flex xs12>
                     <hr class="v-divider theme--light">
                 </v-flex>
-                <v-layout row wrap class="ml-4">
+                <v-layout row wrap style="margin-left: 20px !important;">
 
                     <template>
-                      <v-expansion-panel v-for="(label, key) in data.labels" :key="key">
+                      <v-expansion-panel class="WM-Panel" v-for="(label, key) in data.labels" :key="key">
                         <v-expansion-panel-content>
                           <template v-slot:header>
                             <div>{{ label.name }}</div>
@@ -63,7 +63,7 @@
                             <v-card-text>count : {{ label.pivot.count }}</v-card-text>
                             <v-card-text>note : {{ label.note }}</v-card-text>
                             <v-card-text> Package :
-                                <v-expansion-panel>
+                                <v-expansion-panel class="WM-Panel">
                                   <v-expansion-panel-content>
                                     <template v-slot:header>
                                       <div>{{ label.package.name }}</div>
@@ -72,7 +72,7 @@
                                       <v-card-text>note : {{ label.package.note }}</v-card-text>
                                       <v-card-text>
                                           Items :
-                                          <v-expansion-panel v-for="item in label.package.items" :key="item.key">
+                                          <v-expansion-panel class="WM-Panel" v-for="item in label.package.items" :key="item.key">
                                             <v-expansion-panel-content>
                                               <template v-slot:header>
                                                 <div>{{ item.name }}</div>
@@ -126,3 +126,28 @@ export default {
     }
 };
 </script>
+<style media="screen">
+  .v-expansion-panel.WM-Panel {
+    box-shadow: none;
+    border-top: 1px solid #aaa;
+    border-right: 1px solid #aaa;
+    border-bottom: 1px solid #aaa;
+    border-left: 4px solid #e91e63;
+    padding: 5px 10px;
+    margin: 10px 0;
+  }
+  .v-expansion-panel.WM-Panel .v-expansion-panel__header {
+    font-weight:300;
+    font-size: 24px;
+    padding: 5px 10px;
+    margin: 7px 0;
+  }
+  .v-expansion-panel.WM-Panel .v-card__text {
+    padding: 0 0 0 30px;
+    font-weight: 600;
+    font-size: 18px;
+  }
+  .v-expansion-panel.WM-Panel .v-expansion-panel__body>.v-card {
+      margin: 5px 0 8px 0 !important;
+  }
+</style>
diff --git a/resources/js/vue/components/modal/label/Show.vue b/resources/js/vue/components/modal/label/Show.vue
index 0cc0a5e9..3359fc65 100644
--- a/resources/js/vue/components/modal/label/Show.vue
+++ b/resources/js/vue/components/modal/label/Show.vue
@@ -65,7 +65,7 @@
                 </v-flex>
                 <v-layout row wrap class="ml-4">
                     <template>
-                      <v-expansion-panel>
+                      <v-expansion-panel class="WM-Panel">
                         <v-expansion-panel-content>
                           <template v-slot:header>
                             <div>{{ data.package.name }}</div>
@@ -73,7 +73,7 @@
                           <v-card>
                             <v-card-text>note : {{ data.package.note }}</v-card-text>
                             <v-card-text> Items :
-                                <v-expansion-panel v-for="item in data.package.items" :key="item.key">
+                                <v-expansion-panel class="WM-Panel" v-for="item in data.package.items" :key="item.key">
                                   <v-expansion-panel-content>
                                     <template v-slot:header>
                                       <div>{{ item.name }}</div>
diff --git a/resources/js/vue/components/modal/package/Show.vue b/resources/js/vue/components/modal/package/Show.vue
index 0e302fca..d150e14a 100644
--- a/resources/js/vue/components/modal/package/Show.vue
+++ b/resources/js/vue/components/modal/package/Show.vue
@@ -47,7 +47,7 @@
                 </v-flex>
                 <v-layout row wrap class="ml-4">
                     <template>
-                      <v-expansion-panel>
+                      <v-expansion-panel class="WM-Panel">
                         <v-expansion-panel-content
                           v-for="(item, key) in data.items" :key="key"
                         >
diff --git a/resources/js/vue/views/Cycle/AddEdit.vue b/resources/js/vue/views/Cycle/AddEdit.vue
index 1ebc9ce5..5d14b731 100644
--- a/resources/js/vue/views/Cycle/AddEdit.vue
+++ b/resources/js/vue/views/Cycle/AddEdit.vue
@@ -2,7 +2,7 @@
     <v-form ref="form">
         <v-container grid-list-xs fluid>
             <material-card color="black" title="Add Cycle">
-                <v-layout align-center justify-center wrap class="px-5 my-3">
+                <v-layout wrap class="px-5 my-3">
                     <v-flex xs12 sm6 md4 class="WM-FlexCenter">
                         <v-icon class="fa fa-align-left mr-2 WM-Margin-B-8"></v-icon>
                         <v-text-field
@@ -59,7 +59,9 @@
           							></v-date-picker>
           						</v-menu>
           					</v-flex>
-                    <v-flex xs12 sm6 md4 class="WM-FlexCenter pl-3" style="position: relative" v-for="(label, key) in formData.labels" :key="key">
+                    <v-flex xs12></v-flex>
+                    <v-flex xs12 sm6 md4 class="WM-FlexCenter WM-DuplicateInput" style="position: relative" v-for="(label, key) in formData.labels" :key="key">
+                      <div class="Inner">
                         <v-icon class="fa fa-check mr-2 WM-Margin-B-8"></v-icon>
                         <v-autocomplete
                             color="black"
@@ -78,20 +80,23 @@
                         @click="duplicateForm(key)"
                         >
                         <v-icon class="white--text mr-2 caption">fas fa-plus</v-icon>ADD
-                    </v-btn>
+                        </v-btn>
                         <v-btn v-if="key > 0"
                         absolute
                         small
-                        left
-                        bottom
-                        color="red"
+                        right
+                        top
+                        color="pink"
                         @click="removeForm(key)"
                         >
                         <v-icon class="white--text mr-2 caption">fas fa-remove</v-icon>REMOVE
-                    </v-btn>
-
+                      </v-btn>
+                      </div>
                     </v-flex>
                     <v-spacer></v-spacer>
+                    <v-flex xs12>
+                        <hr class="v-divider theme--light" style="margin:30px 0 0 0 !important">
+                    </v-flex>
                     <v-flex xs12 sm12 md12 class="WM-FlexCenter">
                       <!-- <v-icon class="fa fa-sort-amount-desc mr-2"></v-icon> -->
           						<v-textarea color="black" v-model="formData.note" class="py-3 pr-3" name="address">
@@ -213,4 +218,13 @@ export default {
 .v-btn--floating, .v-btn--icon:before {
     border-radius: 50%!important;
 }
+.WM-DuplicateInput {
+  margin: 15px 0;
+}
+.WM-DuplicateInput .Inner {
+  padding: 15px 20px !important;
+  margin: 0 10px 0 0;
+  width: 100%;
+  border: 1px solid rgba(0,0,0,.2);
+}
 </style>
diff --git a/resources/js/vue/views/Package/AddEdit.vue b/resources/js/vue/views/Package/AddEdit.vue
index 65a386f9..126d98dc 100644
--- a/resources/js/vue/views/Package/AddEdit.vue
+++ b/resources/js/vue/views/Package/AddEdit.vue
@@ -14,8 +14,10 @@
 								class="py-3 pr-3"
 							></v-text-field>
 					</v-flex>
+					<v-flex xs12 md12 sm12></v-flex>
 					<!-- <v-row style="position: relative" v-for="(item, key) in formData.items" :key="key"> -->
-						<v-flex xs12 md3 sm3 class="WM-FlexCenter pl-3" style="position: relative" v-for="(item, key) in formData.items" :key="key">
+						<v-flex xs12 md3 sm3 class="WM-FlexCenter WM-DuplicateInput" style="position: relative" v-for="(item, key) in formData.items" :key="key">
+							<div class="Inner">
 							<v-icon class="fas fa-check mr-2 WM-Margin-B-8"></v-icon>
 							<v-autocomplete
 
@@ -41,17 +43,20 @@
 							<v-btn v-if="key > 0"
 							absolute
 							small
-							left
-							bottom
-							color="red"
+							right
+							top
+							color="pink"
 							@click="removeForm(key)"
 							>
 							<v-icon class="white--text mr-2 caption">fas fa-remove</v-icon>REMOVE
 						</v-btn>
+						</div>
 						</v-flex>
 					<!-- </v-row> -->
-
-
+					<v-spacer></v-spacer>
+					<v-flex xs12>
+							<hr class="v-divider theme--light" style="margin-top:30px !important">
+					</v-flex>
 				</v-layout>
 				<v-layout align-center justify-center wrap class="px-5 mb-3">
 					<v-flex xs12 sm12 md12>
@@ -162,3 +167,14 @@ export default {
 	}
 };
 </script>
+<style media="screen">
+.WM-DuplicateInput {
+	margin: 15px 0;
+}
+.WM-DuplicateInput .Inner {
+	padding: 15px 20px !important;
+	margin: 0 10px 0 0;
+	width: 100%;
+	border: 1px solid rgba(0,0,0,.2);
+}
+</style>