devsam/core
3
6
Fork 1
Code Issues 60 Pull Requests Releases 1 Wiki Activity

fix: 메인 화면 오동작 요소 수정

Browse Source 
- 설문조사 항목 표기
- 설문조사 항목 marquee로 틀어짐(제거)
- 1000xp 모드에서 도시 툴팁 가려지는 문제 수정정
This commit is contained in:
Hide_D
2021-12-03 15:26:45 +09:00
parent 4c2dabe4cc
commit 83c71bec25
3 changed files with 23 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hwe/css/map.css
+1 -1
View File
@@ -90,7 +90,7 @@
.world_map .city_tooltip{ .world_map .city_tooltip{
position: absolute; position: absolute;
z-index:6; z-index:16;
display:none; display:none;
min-width:120px; min-width:120px;
border: 0.02em gray solid; border: 0.02em gray solid;
hwe/index.php
+10 -10
View File
@@ -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->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-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 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 class="s-border-t py-2 col col-6 col-md-4"><?php if ($gameStor->tournament == 0) : ?>
<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) : ?>
<span style='color:magenta'>현재 토너먼트 경기 없음</span> <span style='color:magenta'>현재 토너먼트 경기 없음</span>
<?php else : ?> <?php else : ?>
↑<span style='color:cyan'><?= ↑<span style='color:cyan'><?=
@@ -196,14 +193,17 @@ if (!$otherTextInfo) {
<?php endif; ?> <?php endif; ?>
</div> </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) : ?> <?php if ($auctionCount > 0) : ?>
<span style='color:cyan'><?= $auctionCount ?>건</span> 거래 진행중 <span style='color:cyan'><?= $auctionCount ?>건</span> 거래 진행중
<?php else : ?> <?php else : ?>
<span style='color:magenta'>진행중 거래 없음</span> <span style='color:magenta'>진행중 거래 없음</span>
<?php endif; ?> <?php endif; ?>
</div> </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 <?php
$vote = $gameStor->vote ?: ['']; $vote = $gameStor->vote ?: [''];
$vote_title = Tag2Code($gameStor->vote_title ?? '-'); $vote_title = Tag2Code($gameStor->vote_title ?? '-');
@@ -211,9 +211,7 @@ if (!$otherTextInfo) {
<?php if ($vote[0] == "") : ?> <?php if ($vote[0] == "") : ?>
<span style='color:magenta'>진행중 설문 없음</span> <span style='color:magenta'>진행중 설문 없음</span>
<?php else : ?> <?php else : ?>
<marquee scrollamount=3 style='line-height:1.5em;padding:0;margin:0;'> <span style='color:cyan'>설문 진행중</span> : <span><?= $vote_title ?></span>
<span style='color:cyan'>설문 진행중</span> : $vote_title
</marquee>
<?php endif; ?> <?php endif; ?>
</div> </div>
</div> </div>
@@ -226,7 +224,9 @@ if (!$otherTextInfo) {
<div class="row gx-0"> <div class="row gx-0">
<div class="col s-border-t py-2" id="nation-msg-position"> <div class="col s-border-t py-2" id="nation-msg-position">
<div class="px-2">【 국가방침 】</div> <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> </div>
<div class="row gx-0"> <div class="row gx-0">
hwe/scss/main.scss
+12 -4
View File
@@ -69,6 +69,12 @@ body {
} }
} }
.vote-cell {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
@include media-breakpoint-up(md) { @include media-breakpoint-up(md) {
#map_view { #map_view {
grid-template-columns: 700px 300px; grid-template-columns: 700px 300px;
@@ -101,7 +107,7 @@ body {
.commandPad { .commandPad {
position: absolute; position: absolute;
z-index: 99; z-index: 7;
} }
@@ -153,7 +159,7 @@ body {
} }
} }
#nation-msg-box{ #nation-msg-box {
position: relative; position: relative;
overflow: hidden; overflow: hidden;
} }
@@ -433,13 +439,15 @@ body {
@include media-breakpoint-down(md) { @include media-breakpoint-down(md) {
#mailbox_list-col{ #mailbox_list-col {
order: 1; order: 1;
} }
#msg_submit-col { #msg_submit-col {
order: 2; order: 2;
} }
#msg_input-col{
#msg_input-col {
order: 3; order: 3;
} }
} }