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

feat: 나머지 메인 버튼도 lumen 버튼으로 통일

Browse Source
This commit is contained in:
Hide_D
2021-11-30 01:38:07 +09:00
parent 6dcb46c0b8
commit 3c930dacb8
4 changed files with 47 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hwe/d_setting/templates/allButton.php.orig
+1 -1
View File
@@ -1,4 +1,4 @@
<div class="buttonPlate bg1"> <div class="buttonPlate">
<a href="a_status.php" target="_blank" class="open-window"><button type="button" class="toolbarButton">세력도</button></a> <a href="a_status.php" target="_blank" class="open-window"><button type="button" class="toolbarButton">세력도</button></a>
<a href="a_kingdomList.php" target="_blank" class="open-window"><button type="button" class="toolbarButton">세력일람</button></a> <a href="a_kingdomList.php" target="_blank" class="open-window"><button type="button" class="toolbarButton">세력일람</button></a>
<a href="a_genList.php" target="_blank" class="open-window"><button type="button" class="toolbarButton">장수일람</button></a> <a href="a_genList.php" target="_blank" class="open-window"><button type="button" class="toolbarButton">장수일람</button></a>
hwe/index.php
+16 -16
View File
@@ -143,11 +143,11 @@ $nationColorType = substr($myNationStatic['color'] ?? '#000000', 1);
<body class="img_back sam-color-<?= $nationColorType ?>"> <body class="img_back sam-color-<?= $nationColorType ?>">
<div id="container"> <div id="container" class="bg0">
<div class="row toolbars"><?= allButton($gameStor->npcmode == 1) ?></div> <div class="row toolbars gx-0"><?= allButton($gameStor->npcmode == 1) ?></div>
<div class="tb_layout bg0 row"> <div class="tb_layout row gx-0">
<div style="height:50px" id="server_title"> <div id="server_title" class="row py-1">
<font size=4>삼국지 모의전투 HiDCHe <?= $serverName . $serverCnt ?>기 (<font color=cyan><?= $scenario ?></font>)</font> <h3>삼국지 모의전투 HiDCHe <?= $serverName . $serverCnt ?>기 (<font color=cyan><?= $scenario ?></font>)</h3>
</div> </div>
<?php if ($valid == 1) : ?> <?php if ($valid == 1) : ?>
@@ -167,13 +167,13 @@ $nationColorType = substr($myNationStatic['color'] ?? '#000000', 1);
</div> </div>
<?php endif; ?> <?php endif; ?>
<div class="row" style='height:30px;'> <div class="row py-1">
<div class="col"><?= info(2) ?></div> <div class="col"><?= info(2) ?></div>
<div class="col">전체 접속자 수 : <?= $gameStor->online_user_cnt ?> 명</div> <div class="col">전체 접속자 수 : <?= $gameStor->online_user_cnt ?> 명</div>
<div class="col">턴당 갱신횟수 : <?= $gameStor->conlimit ?>회</div> <div class="col">턴당 갱신횟수 : <?= $gameStor->conlimit ?>회</div>
<div class="col2"></div> <div class="col2"></div>
</div> </div>
<div class="row" style='height:30px;'> <div class="row py-1">
<div class="col"><?= !$plock ? ("<span style='color:cyan;'>동작 시각: " . substr($gameStor->turntime, 5, 14) . "</span>") : ("<span style='color:magenta;'>동작 시각: " . substr($gameStor->turntime, 5, 14) . "</span>") ?></div> <div class="col"><?= !$plock ? ("<span style='color:cyan;'>동작 시각: " . substr($gameStor->turntime, 5, 14) . "</span>") : ("<span style='color:magenta;'>동작 시각: " . substr($gameStor->turntime, 5, 14) . "</span>") ?></div>
<div class="col"><?php if ($gameStor->tournament == 0) : ?> <div class="col"><?php if ($gameStor->tournament == 0) : ?>
<font color=magenta>현재 토너먼트 경기 없음</font> <font color=magenta>현재 토너먼트 경기 없음</font>
@@ -245,19 +245,19 @@ $nationColorType = substr($myNationStatic['color'] ?? '#000000', 1);
</div> </div>
</div> </div>
<?php endif; ?> <?php endif; ?>
<div id="map_view"> <div id="map_view" class="gx-0">
<div id="mapZone" class="view-item"><?= getMapHtml($mapTheme) ?></div> <div id="mapZone" class="view-item"><?= getMapHtml($mapTheme) ?></div>
<div class="view-item" id="reservedCommandList"></div> <div class="view-item" id="reservedCommandList"></div>
<div id="cityInfo" class="view-item" style="border:none;text-align:center;"><?= cityInfo($generalObj) ?></div> <div id="cityInfo" class="view-item" style="border:none;text-align:center;"><?= cityInfo($generalObj) ?></div>
<div id="routeButtons" class="view-item row justify-content-center"><button type='button' class='btn btn-sammo-base2 col-2' id='refreshPage'>갱 신</button><button type='button' class='btn btn-sammo-base2 col-3' onclick="location.replace('../')" >로비로</button></div> <div id="routeButtons" class="view-item row justify-content-center"><button type='button' class='btn btn-sammo-base2 col-2' id='refreshPage'>갱 신</button><button type='button' class='btn btn-sammo-base2 col-3' onclick="location.replace('../')">로비로</button></div>
</div> </div>
<div class="row"> <div class="row gx-0">
<div class="col-lg-6"><?php myNationInfo($generalObj); ?></div> <div class="col-lg-6"><?php myNationInfo($generalObj); ?></div>
<div class="col-lg-6"><?php generalInfo($generalObj); ?></div> <div class="col-lg-6"><?php generalInfo($generalObj); ?></div>
</div> </div>
<div class="row"><?= commandButton() ?></div> <div class="row gx-0"><?= commandButton() ?></div>
<div class="row"> <div class="row gx-0">
<div class="col-lg-6"> <div class="col-lg-6">
<div><b>장수 동향</b></div> <div><b>장수 동향</b></div>
<div id="general_public_record" style="text-align:left;"><?= formatHistoryToHTML(getGlobalActionLogRecent(15)) ?></div> <div id="general_public_record" style="text-align:left;"><?= formatHistoryToHTML(getGlobalActionLogRecent(15)) ?></div>
@@ -271,7 +271,7 @@ $nationColorType = substr($myNationStatic['color'] ?? '#000000', 1);
<div id="world_history" colspan=2 style="text-align:left;"><?= formatHistoryToHTML(getGlobalHistoryLogRecent(15)) ?></div> <div id="world_history" colspan=2 style="text-align:left;"><?= formatHistoryToHTML(getGlobalHistoryLogRecent(15)) ?></div>
</div> </div>
</div> </div>
<div class="message_input_form bg0"> <div class="message_input_form bg0 gx-0">
<select id="mailbox_list" size="1"> <select id="mailbox_list" size="1">
<select name="genlist" size="1" style="color:white;background-color:black;font-size:13px"> <select name="genlist" size="1" style="color:white;background-color:black;font-size:13px">
@@ -283,8 +283,8 @@ $nationColorType = substr($myNationStatic['color'] ?? '#000000', 1);
<button id="msg_submit">서신전달&amp;갱신</button><br> <button id="msg_submit">서신전달&amp;갱신</button><br>
내용 없이 '서신전달&amp;갱신'을 누르면 메세지창이 갱신됩니다. 내용 없이 '서신전달&amp;갱신'을 누르면 메세지창이 갱신됩니다.
</div> </div>
<div class="row toolbars"><?= allButton($gameStor->npcmode == 1) ?></div> <div class="row toolbars gx-0"><?= allButton($gameStor->npcmode == 1) ?></div>
<div id="message_board" class="row"> <div id="message_board" class="row gx-0">
<div class="col-lg-6 board_side bg0"> <div class="col-lg-6 board_side bg0">
<div class="board_header bg0" id='public_talk_position'>전체 메시지(최고99자)</div> <div class="board_header bg0" id='public_talk_position'>전체 메시지(최고99자)</div>
<section class="public_message"> <section class="public_message">
@@ -316,7 +316,7 @@ $nationColorType = substr($myNationStatic['color'] ?? '#000000', 1);
</div> </div>
</div> </div>
</div> </div>
<div class="row toolbars"><?= allButton($gameStor->npcmode == 1) ?><?= banner() ?></div> <div class="row toolbars gx-0"><?= allButton($gameStor->npcmode == 1) ?><?= banner() ?></div>
</div> </div>
<?php <?php
if ($con == 1) { if ($con == 1) {
hwe/scss/main.scss
+29 -45
View File
@@ -73,38 +73,30 @@ body {
#mapZone { #mapZone {
height: 520px; height: 520px;
grid-column-start: 1; grid-column: 1 / 2;
grid-column-end: 2; grid-row: 1 / 2;
grid-row-start: 1;
grid-row-end: 2;
} }
#cityInfo { #cityInfo {
grid-column-start: 1; grid-column: 1 / 2;
grid-column-end: 2; grid-row: 2 / 3;
grid-row-start: 2;
grid-row-end: 3;
} }
#routeButtons { #routeButtons {
grid-column-start: 1; grid-column: 1 / 3;
grid-column-end: 2; grid-row: 3 / 4;
grid-row-start: 3;
grid-row-end: 4;
} }
#reservedCommandList { #reservedCommandList {
width: 300px; width: 300px;
grid-column-start: 2; grid-column: 2 / 3;
grid-column-end: 3; grid-row: 1 / 3;
grid-row-start: 1; position: relative;
grid-row-end: 4;
position:relative;
} }
.commandPad{ .commandPad {
position:absolute; position: absolute;
z-index: 99; z-index: 99;
} }
@@ -182,10 +174,8 @@ body {
#mapZone { #mapZone {
grid-column-start: 1; grid-column: 1 / 2;
grid-column-end: 2; grid-row: 1 / 2;
grid-row-start: 1;
grid-row-end: 2;
.world_map { .world_map {
@@ -207,25 +197,19 @@ body {
#reservedCommandList { #reservedCommandList {
grid-column-start: 1; grid-column: 1 / 2;
grid-column-end: 2; grid-row: 2 / 3;
grid-row-start: 2;
grid-row-end: 3;
} }
#routeButtons { #routeButtons {
grid-column-start: 1; grid-column: 1 / 2;
grid-column-end: 2; grid-row: 3 / 4;
grid-row-start: 3;
grid-row-end: 4;
} }
#cityInfo { #cityInfo {
grid-column-start: 1; grid-column: 1 / 2;
grid-column-end: 2; grid-row: 4 / 5;
grid-row-start: 4;
grid-row-end: 5;
} }
.mainCityInfo { .mainCityInfo {
@@ -240,27 +224,27 @@ body {
} }
.toolbarButton { .toolbarButton {
float: left; @extend .btn;
background-color: #225500; @extend .btn-sammo-base2;
color: white;
width: 100%; width: 100%;
height: 30px;
font-weight: bold; font-weight: bold;
font-size: 13px; font-size: 13px;
margin: 0;
display: block;
} }
.toolbarButton2 { .toolbarButton2 {
float: left; @extend .btn;
@extend .btn-sammo-base2;
background-color: #225500; background-color: #225500;
color: magenta; color: magenta;
width: 100%; width: 100%;
height: 30px;
font-weight: bold; font-weight: bold;
font-size: 13px; font-size: 13px;
margin: 0;
display: block; &:hover,
&:focus,
&:active {
color: magenta;
}
} }
.nation_info td { .nation_info td {
hwe/templates/allButton.php
+1 -1
View File
@@ -1,4 +1,4 @@
<div class="buttonPlate bg1"> <div class="buttonPlate">
<a href="a_status.php" target="_blank" class="open-window"><button type="button" class="toolbarButton">세력도</button></a> <a href="a_status.php" target="_blank" class="open-window"><button type="button" class="toolbarButton">세력도</button></a>
<a href="a_kingdomList.php" target="_blank" class="open-window"><button type="button" class="toolbarButton">세력일람</button></a> <a href="a_kingdomList.php" target="_blank" class="open-window"><button type="button" class="toolbarButton">세력일람</button></a>
<a href="a_genList.php" target="_blank" class="open-window"><button type="button" class="toolbarButton">장수일람</button></a> <a href="a_genList.php" target="_blank" class="open-window"><button type="button" class="toolbarButton">장수일람</button></a>