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

feat: 국가별 색 버튼을 lumen button profile에 맞춰 작성

Browse Source
This commit is contained in:
Hide_D
2021-11-30 00:54:08 +09:00
parent 846bdfdc88
commit 27c7a5a3ad
5 changed files with 126 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hwe/index.php
+11 -8
View File
@@ -92,6 +92,9 @@ $serverName = UniqueConst::$serverName;
$serverCnt = $gameStor->server_cnt; $serverCnt = $gameStor->server_cnt;
$auctionCount = $db->queryFirstField('SELECT count(`no`) FROM auction'); $auctionCount = $db->queryFirstField('SELECT count(`no`) FROM auction');
$myNationStatic = getNationStaticInfo($generalObj->getNationID());
$nationColorType = substr($myNationStatic['color'] ?? '#000000', 1);
?> ?>
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
@@ -127,18 +130,18 @@ $auctionCount = $db->queryFirstField('SELECT count(`no`) FROM auction');
<?= WebUtil::printCSS('dist_css/main.css') ?> <?= WebUtil::printCSS('dist_css/main.css') ?>
<?= WebUtil::printCSS('css/map.css') ?> <?= WebUtil::printCSS('css/map.css') ?>
<?= WebUtil::printStaticValues([ <?= WebUtil::printStaticValues([
'maxTurn'=>GameConst::$maxTurn, 'maxTurn' => GameConst::$maxTurn,
'maxPushTurn'=>12, 'maxPushTurn' => 12,
'commandList'=>getCommandTable($generalObj), 'commandList' => getCommandTable($generalObj),
'serverNow'=>TimeUtil::now(false), 'serverNow' => TimeUtil::now(false),
'baseColor2'=>GameConst::$basecolor2, 'baseColor2' => GameConst::$basecolor2,
])?> ]) ?>
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.7.1/css/all.css" integrity="sha384-fnmOCqbTlWIlj8LyTjo7mOUStjsKC4pOpQbqyi7RrhN7udi9RwhKkMHpvLbHG9Sr" crossorigin="anonymous"> <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.7.1/css/all.css" integrity="sha384-fnmOCqbTlWIlj8LyTjo7mOUStjsKC4pOpQbqyi7RrhN7udi9RwhKkMHpvLbHG9Sr" crossorigin="anonymous">
<link href="https://fonts.googleapis.com/css?family=Nanum+Gothic|Nanum+Myeongjo|Nanum+Pen+Script" rel="stylesheet"> <link href="https://fonts.googleapis.com/css?family=Nanum+Gothic|Nanum+Myeongjo|Nanum+Pen+Script" rel="stylesheet">
</head> </head>
<body class="img_back"> <body class="img_back sam-color-<?= $nationColorType ?>">
<div id="container"> <div id="container">
<div class="row toolbars"><?= allButton($gameStor->npcmode == 1) ?></div> <div class="row toolbars"><?= allButton($gameStor->npcmode == 1) ?></div>
@@ -246,7 +249,7 @@ $auctionCount = $db->queryFirstField('SELECT count(`no`) FROM auction');
<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"><input type=button value='갱 신' id='refreshPage' style='background-color:<?= GameConst::$basecolor2 ?>;color:white;width:110px;font-size:13px;'><input type=button value='로비로' onclick="location.replace('../')" style="background-color:<?= GameConst::$basecolor2 ?>;color:white;width:160px;font-size:13px;"></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">
<div class="col-lg-6"><?php myNationInfo($generalObj); ?></div> <div class="col-lg-6"><?php myNationInfo($generalObj); ?></div>
hwe/scss/bootstrap5.scss
Vendored
+3 -1
View File
@@ -7,6 +7,8 @@ $input-color: #303030;
@import url("https://cdn.jsdelivr.net/npm/bootstrap-icons/font/bootstrap-icons.css"); @import url("https://cdn.jsdelivr.net/npm/bootstrap-icons/font/bootstrap-icons.css");
@import "./variables.scss";
@import "./bootswatch_custom_variables.scss"; @import "./bootswatch_custom_variables.scss";
@import "../../node_modules/bootstrap5/scss/bootstrap.scss"; @import "../../node_modules/bootstrap5/scss/bootstrap.scss";
@import "./bootswatch_custom.scss"; @import "./bootswatch_custom.scss";
@import "./bootstrap_sammo.scss";
hwe/scss/bootstrap_sammo.scss
Vendored
+67
View File
@@ -0,0 +1,67 @@
@function frontColor($color) {
@return color-contrast($color);
}
@each $colorType, $color in $nationColors {
.sam-nation-color-#{$colorType} {
.sam-nation-own-bgcolor{
background-color: $color;
color: frontColor($color);
}
.btn-sammo-nation{
@include button-variant($color, $color);
&:hover,
&:active,
&:focus {
background-color: $color;
}
&,
&:not(.disabled):hover,
&:not(.disabled):active,
&:focus {
border-color: shade-color($color, 10%);
}
}
}
.btn-sammo-nation-#{$colorType}{
@include button-variant($color, $color);
&:hover,
&:active,
&:focus {
background-color: $color;
}
&,
&:not(.disabled):hover,
&:not(.disabled):active,
&:focus {
border-color: shade-color($color, 10%);
}
}
}
@each $colorType, $color in $sammoColors {
.btn-sammo-#{$colorType}{
@include button-variant($color, $color);
&:hover,
&:active,
&:focus {
background-color: $color;
}
&,
&:not(.disabled):hover,
&:not(.disabled):active,
&:focus {
border-color: shade-color($color, 10%);
}
}
}
hwe/scss/main.scss
+1 -2
View File
@@ -92,7 +92,6 @@ body {
grid-column-end: 2; grid-column-end: 2;
grid-row-start: 3; grid-row-start: 3;
grid-row-end: 4; grid-row-end: 4;
text-align: center;
} }
#reservedCommandList { #reservedCommandList {
@@ -201,7 +200,7 @@ body {
.map_title { .map_title {
transform-origin: 0px 0px; transform-origin: 0px 0px;
transform: scale(calc(500 / 700)); transform: scale(calc(500 / 700));
margin-bottom: -20px * 200 / 700; margin-bottom: calc(-20px * 200 / 700);
} }
.map_body { .map_body {
hwe/scss/variables.scss
+44 -1
View File
@@ -1,4 +1,47 @@
//TODO:혹시나 몰라서, 나중에 실제로 수정 //TODO:혹시나 몰라서, 나중에 실제로 수정
$bg1color: #141c65aa; $bg1color: #141c65aa;
$bg2color: #225500aa; $bg2color: #225500aa;
$sammoColors: (
'base1': #000044,
'base2': #225500,
'base3': #660000,
'base4': #330000,
);
$nationColors: (
"000000": #000000,
"FF0000": #FF0000,
"800000": #800000,
"A0522D": #A0522D,
"FF6347": #FF6347,
"FFA500": #FFA500,
"FFDAB9": #FFDAB9,
"FFD700": #FFD700,
"FFFF00": #FFFF00,
"7CFC00": #7CFC00,
"00FF00": #00FF00,
"808000": #808000,
"008000": #008000,
"2E8B57": #2E8B57,
"008080": #008080,
"20B2AA": #20B2AA,
"6495ED": #6495ED,
"7FFFD4": #7FFFD4,
"AFEEEE": #AFEEEE,
"87CEEB": #87CEEB,
"00FFFF": #00FFFF,
"00BFFF": #00BFFF,
"0000FF": #0000FF,
"000080": #000080,
"483D8B": #483D8B,
"7B68EE": #7B68EE,
"BA55D3": #BA55D3,
"800080": #800080,
"FF00FF": #FF00FF,
"FFC0CB": #FFC0CB,
"F5F5DC": #F5F5DC,
"E0FFFF": #E0FFFF,
"FFFFFF": #FFFFFF,
"A9A9A9": #A9A9A9,
);