From a2f5d665973e5408574e7d83ac75c1465626e341 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Sat, 4 Dec 2021 00:42:51 +0900
Subject: [PATCH] =?UTF-8?q?misc:=20500px=20=EB=A0=88=EC=9D=B4=EC=95=84?=
 =?UTF-8?q?=EC=9B=83=20=EA=B5=AC=EC=84=B1=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/index.php      | 19 +++++++++++-------
 hwe/scss/main.scss | 50 +++++++++++++++++++++++++++++++---------------
 2 files changed, 46 insertions(+), 23 deletions(-)

diff --git a/hwe/index.php b/hwe/index.php
index 855d68e6..e1edba00 100644
--- a/hwe/index.php
+++ b/hwe/index.php
@@ -267,14 +267,19 @@ if (!$otherTextInfo) {
                     </div>
                 </div>
                 <div id="cityInfo" class="view-item" style="border:none;text-align:center;"><?= cityInfo($generalObj) ?></div>
+                <div id="nation-position"><?php myNationInfo($generalObj); ?></div>
+                <div id="general-position"><?php generalInfo($generalObj); ?></div>
+                <div id="generalCommandButton" class="row gx-0"><?= commandButton() ?></div>
             </div>
         </div>
-        <div class="row gx-0">
-            <div class="col-md-6" id="nation-position"><?php myNationInfo($generalObj); ?></div>
-            <div class="col-md-6" id="general-position"><?php generalInfo($generalObj); ?></div>
+        <div id="actionMiniPlateSub" class="gx-0 row">
+            <div class="col">
+                <div class="gx-1 row">
+                    <div class="col-8 d-grid"><button type='button' class='btn btn-sammo-base2 refreshPage'>갱 신</button></div>
+                    <div class="col-4 d-grid"><button type='button' class='btn btn-sammo-base2' onclick="location.replace('../')">로비로</button></div>
+                </div>
+            </div>
         </div>
-
-        <div class="row gx-0"><?= commandButton() ?></div>
         <div class="row gx-0">
             <div class="col-md-6" id="general_public_record-position">
                 <div class="bg1 center s-border-tb"><b>장수 동향</b></div>
@@ -349,13 +354,13 @@ if (!$otherTextInfo) {
     <div id="float-tabs">
         <div class="btn-group-vertical">
             <a href="#nation-msg-position" class="btn btn-sammo-nation">방침</a>
-            <a href="#mapZone" class="btn btn-sammo-nation">지도</a>
-            <a href="#reservedCommandList" class="btn btn-sammo-nation">명령</a>
             <a href="#cityInfo" class="btn btn-sammo-nation">도시</a>
             <a href="#nation-position" class="btn btn-sammo-nation">국가</a>
             <a href="#general-position" class="btn btn-sammo-nation">장수</a>
+            <a href="#reservedCommandList" class="btn btn-sammo-nation">명령</a>
         </div>
         <div class="btn-group-vertical">
+            <a href="#mapZone" class="btn btn-secondary">지도</a>
             <a href="#general_public_record-position" class="btn btn-secondary">동향</a>
             <a href="#general_log-position" class="btn btn-secondary">개인</a>
             <a href="#world_history-position" class="btn btn-secondary">정세</a>
diff --git a/hwe/scss/main.scss b/hwe/scss/main.scss
index 8ff27e08..b7242e88 100644
--- a/hwe/scss/main.scss
+++ b/hwe/scss/main.scss
@@ -77,41 +77,57 @@ body {
 
 @include media-breakpoint-up(md) {
     #map_view {
-        grid-template-columns: 700px 300px;
+        grid-template-columns: 500px 200px 300px;
         grid-template-rows: 520px 130px;
     }
 
     #mapZone {
         height: 520px;
-        grid-column: 1 / 2;
+        grid-column: 1 / 3;
         grid-row: 1 / 2;
     }
 
     #cityInfo {
-        grid-column: 1 / 2;
+        grid-column: 1 / 3;
         grid-row: 2 / 3;
     }
 
 
     #reservedCommandZone {
         width: 300px;
-        grid-column: 2 / 3;
+        grid-column: 3 / 4;
         grid-row: 1 / 3;
         position: relative;
     }
 
-    #actionMiniPlate{
+    #actionMiniPlate {
         position: absolute;
         right: 0;
         bottom: 1em;
         width: 290px;
     }
 
+    #actionMiniPlateSub {
+        display: none;
+    }
+
     .commandPad {
         position: absolute;
         z-index: 7;
     }
 
+    #nation-position{
+        grid-column: 1 / 2;
+    }
+
+    #general-position{
+        grid-column: 2 / 4;
+    }
+
+    #generalCommandButton{
+        grid-column: 1 / 4;
+    }
+
 
     .buttonPlate {
         display: grid;
@@ -197,10 +213,17 @@ body {
         transform: scale(0.5);
     }
 
-    #mapZone {
-        grid-column: 1 / 2;
-        grid-row: 1 / 2;
+    #map_view {
+        grid-template-columns: 1fr;
+    }
 
+    #reservedCommandZone{
+        grid-row: 5 / 6;
+    }
+
+
+    #mapZone {
+        grid-row: 6 / 7;
 
         .world_map {
             width: 500px;
@@ -220,19 +243,14 @@ body {
     }
 
 
-    #reservedCommandZone {
-        grid-column: 1 / 2;
-        grid-row: 2 / 3;
+    #actionMiniPlate {
+        display: none;
     }
 
-    #actionMiniPlate{
+    #actionMiniPlate {
         margin-bottom: 0.5em;
     }
 
-    #cityInfo {
-        grid-column: 1 / 2;
-        grid-row: 4 / 5;
-    }
 
     .mainCityInfo {
         display: grid;