From 7b75f4e01b4d9a8a0eff440e4a0cc45ec5b2e268 Mon Sep 17 00:00:00 2001
From: Hide_D <hided62@gmail.com>
Date: Wed, 27 Jul 2022 23:02:35 +0900
Subject: [PATCH] =?UTF-8?q?misc:=20GeneralLiteCard=20grid=20=EC=A1=B0?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/ts/components/GeneralLiteCard.vue | 47 ++++++++++++++++-----------
 1 file changed, 28 insertions(+), 19 deletions(-)

diff --git a/hwe/ts/components/GeneralLiteCard.vue b/hwe/ts/components/GeneralLiteCard.vue
index 18364975..71919d4f 100644
--- a/hwe/ts/components/GeneralLiteCard.vue
+++ b/hwe/ts/components/GeneralLiteCard.vue
@@ -1,13 +1,19 @@
 <template>
   <div class="general-card-basic bg2">
-    <div class="general-icon" :style="{
-      backgroundImage: `url(${iconPath})`,
-    }"></div>
+    <div
+      class="general-icon"
+      :style="{
+        backgroundImage: `url(${iconPath})`,
+      }"
+    ></div>
 
-    <div class="general-name" :style="{
-      color: isBrightColor(nation.color) ? '#000' : '#fff',
-      backgroundColor: nation.color,
-    }">
+    <div
+      class="general-name"
+      :style="{
+        color: isBrightColor(nation.color) ? '#000' : '#fff',
+        backgroundColor: nation.color,
+      }"
+    >
       {{ general.name }} 【{{ general.officerLevelText }} | {{ generalTypeCall }} |
       <span :style="{ color: injuryInfo.color }">{{ injuryInfo.text }}</span>
       】
@@ -47,12 +53,7 @@
     <div class="bg1">성격</div>
     <div v-b-tooltip.hover :title="personal.info ?? undefined">{{ personal.name }}</div>
 
-    <div class="bg1">특기</div>
-    <div>
-      <span v-b-tooltip.hover :title="specialDomestic.info ?? undefined"> {{ specialDomestic.name }}</span> /
-      <span v-b-tooltip.hover :title="specialWar.info ?? undefined"> {{ specialWar.name }}</span>
-    </div>
-
+    <div class="filler"></div>
     <div class="bg1">Lv</div>
     <div class="general-exp-level">
       {{ general.explevel }}
@@ -61,6 +62,14 @@
     <div class="bg1">연령</div>
     <div :style="{ color: ageColor }">{{ general.age }}세</div>
 
+    <div class="bg1">특기</div>
+    <div>
+      <span v-b-tooltip.hover :title="specialDomestic.info ?? undefined"> {{ specialDomestic.name }}</span> /
+      <span v-b-tooltip.hover :title="specialWar.info ?? undefined"> {{ specialWar.name }}</span>
+    </div>
+
+    <div class="filler"></div>
+
     <div class="bg1">삭턴</div>
     <div>{{ general.killturn }} 턴</div>
 
@@ -135,27 +144,27 @@ const ageColor = computed(() => {
   }
   return "red";
 });
-
 </script>
 
 <style lang="scss" scoped>
 .general-card-basic {
   display: grid;
   grid-template-columns: 64px repeat(3, 2fr 5fr);
-  grid-template-rows: repeat(9, calc(64px / 3));
+  grid-template-rows: repeat(5, calc(64px / 3));
   text-align: center;
   font-size: 14px;
 
   border-bottom: 1px solid gray;
   border-right: 1px solid gray;
 
-  >div.bg1,
-  >.general-crew-type-icon,
-  >.general-icon {
+  > div.bg1,
+  > .general-crew-type-icon,
+  > .general-icon,
+  > .filler {
     border-left: 1px solid gray;
   }
 
-  >div {
+  > div {
     border-top: 1px solid gray;
   }
 }