From 8895ac329a0636483ac09be02df8ff0a0d45209d Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Fri, 3 Dec 2021 15:26:45 +0900
Subject: [PATCH] =?UTF-8?q?fix:=20=EB=A9=94=EC=9D=B8=20=ED=99=94=EB=A9=B4?=
 =?UTF-8?q?=20=EC=98=A4=EB=8F=99=EC=9E=91=20=EC=9A=94=EC=86=8C=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95=20-=20=EC=84=A4=EB=AC=B8=EC=A1=B0=EC=82=AC=20?=
 =?UTF-8?q?=ED=95=AD=EB=AA=A9=20=ED=91=9C=EA=B8=B0=20-=20=EC=84=A4?=
 =?UTF-8?q?=EB=AC=B8=EC=A1=B0=EC=82=AC=20=ED=95=AD=EB=AA=A9=20marquee?=
 =?UTF-8?q?=EB=A1=9C=20=ED=8B=80=EC=96=B4=EC=A7=90(=EC=A0=9C=EA=B1=B0)=20-?=
 =?UTF-8?q?=201000xp=20=EB=AA=A8=EB=93=9C=EC=97=90=EC=84=9C=20=EB=8F=84?=
 =?UTF-8?q?=EC=8B=9C=20=ED=88=B4=ED=8C=81=20=EA=B0=80=EB=A0=A4=EC=A7=80?=
 =?UTF-8?q?=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20=EC=88=98=EC=A0=95=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/css/map.css    |  2 +-
 hwe/index.php      | 20 ++++++++++----------
 hwe/scss/main.scss | 16 ++++++++++++----
 3 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/hwe/css/map.css b/hwe/css/map.css
index 94085c21..9e3f0e73 100644
--- a/hwe/css/map.css
+++ b/hwe/css/map.css
@@ -90,7 +90,7 @@
 
 .world_map .city_tooltip{
     position: absolute;
-    z-index:6;
+    z-index:16;
     display:none;
     min-width:120px;
     border: 0.02em gray solid;
diff --git a/hwe/index.php b/hwe/index.php
index a83f67b9..e2a99fc8 100644
--- a/hwe/index.php
+++ b/hwe/index.php
@@ -182,10 +182,7 @@ if (!$otherTextInfo) {
                 <div class="s-border-t col py-2 col-4 col-md-2">전체 접속자 수 : <?= $gameStor->online_user_cnt ?> 명</div>
                 <div class="s-border-t col py-2 col-4 col-md-2">턴당 갱신횟수 : <?= $gameStor->conlimit ?>회</div>
                 <div class="s-border-t col py-2 col-8 col-md-4"><?= info(3) ?></div>
-                <div class="s-border-t py-2 col col-6 col-md-3">
-                    <div style="display:inline-block;"><?= !$plock ? ("<span style='color:cyan;'>동작 시각: " . substr($gameStor->turntime, 5, 14) . "</span>") : ("<span style='color:magenta;'>동작 시각: " . substr($gameStor->turntime, 5, 14) . "</span>") ?></div>
-                </div>
-                <div class="s-border-t py-2 col col-6 col-md-3"><?php if ($gameStor->tournament == 0) : ?>
+                <div class="s-border-t py-2 col col-6 col-md-4"><?php if ($gameStor->tournament == 0) : ?>
                         <span style='color:magenta'>현재 토너먼트 경기 없음</span>
                     <?php else : ?>
                         ↑<span style='color:cyan'><?=
@@ -196,14 +193,17 @@ if (!$otherTextInfo) {
 
                     <?php endif; ?>
                 </div>
-                <div class="s-border-t py-2 col col-6 col-md-3">
+                <div class="s-border-t py-2 col col-6 col-md-2">
+                    <div style="display:inline-block;"><?= !$plock ? ("<span style='color:cyan;'>동작 시각: " . substr($gameStor->turntime, 5, 14) . "</span>") : ("<span style='color:magenta;'>동작 시각: " . substr($gameStor->turntime, 5, 14) . "</span>") ?></div>
+                </div>
+                <div class="s-border-t py-2 col col-6 col-md-2">
                     <?php if ($auctionCount > 0) : ?>
                         <span style='color:cyan'><?= $auctionCount ?>건</span> 거래 진행중
                     <?php else : ?>
                         <span style='color:magenta'>진행중 거래 없음</span>
                     <?php endif; ?>
                 </div>
-                <div class="s-border-t py-2 col col-6 col-md-3">
+                <div class="s-border-t py-2 col col-6 col-md-4 vote-cell">
                     <?php
                     $vote = $gameStor->vote ?: [''];
                     $vote_title = Tag2Code($gameStor->vote_title ?? '-');
@@ -211,9 +211,7 @@ if (!$otherTextInfo) {
                     <?php if ($vote[0] == "") : ?>
                         <span style='color:magenta'>진행중 설문 없음</span>
                     <?php else : ?>
-                        <marquee scrollamount=3 style='line-height:1.5em;padding:0;margin:0;'>
-                            <span style='color:cyan'>설문 진행중</span> : $vote_title
-                        </marquee>
+                        <span style='color:cyan'>설문 진행중</span> : <span><?= $vote_title ?></span>
                     <?php endif; ?>
                 </div>
             </div>
@@ -226,7 +224,9 @@ if (!$otherTextInfo) {
             <div class="row gx-0">
                 <div class="col s-border-t py-2" id="nation-msg-position">
                     <div class="px-2">【 국가방침 】</div>
-                    <div id='nation-msg-box'><div id='nation-msg'><?= nationMsg($generalObj) ?></div></div>
+                    <div id='nation-msg-box'>
+                        <div id='nation-msg'><?= nationMsg($generalObj) ?></div>
+                    </div>
                 </div>
             </div>
             <div class="row gx-0">
diff --git a/hwe/scss/main.scss b/hwe/scss/main.scss
index 8ca19401..06db29f4 100644
--- a/hwe/scss/main.scss
+++ b/hwe/scss/main.scss
@@ -69,6 +69,12 @@ body {
     }
 }
 
+.vote-cell {
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
+
 @include media-breakpoint-up(md) {
     #map_view {
         grid-template-columns: 700px 300px;
@@ -101,7 +107,7 @@ body {
 
     .commandPad {
         position: absolute;
-        z-index: 99;
+        z-index: 7;
     }
 
 
@@ -153,7 +159,7 @@ body {
     }
 }
 
-#nation-msg-box{
+#nation-msg-box {
     position: relative;
     overflow: hidden;
 }
@@ -433,13 +439,15 @@ body {
 
 
 @include media-breakpoint-down(md) {
-    #mailbox_list-col{
+    #mailbox_list-col {
         order: 1;
     }
+
     #msg_submit-col {
         order: 2;
     }
-    #msg_input-col{
+
+    #msg_input-col {
         order: 3;
     }
 }