diff --git a/hwe/css/main.css b/hwe/css/main.css deleted file mode 100644 index 600aea20..00000000 --- a/hwe/css/main.css +++ /dev/null @@ -1,100 +0,0 @@ -@charset "UTF-8"; - -body { -color:white; - background-color:black; - border-width:1px; - border-color:gray; background-position:center; background-repeat:repeat-y; -} - -#container { - width:1000px; - margin: 0 auto; -} - -.buttonPlate{ - width:1000px; - height:60px; -} - -.toolbarButton { - float:left; - background-color:#225500; - color:white; - width:125px; - height:30px; - font-weight:bold; - font-size:13px; - margin:0; - display:block; -} - -.commandButton { - float:left; - width:100px; - height:30px; - font-weight:bold; - font-size:13px; - margin:0; - display:block; -} - -.commandButton:disabled::before{ - content:'【' -} - -.commandButton:disabled::after{ - content:'】' -} - -.commandButton:disabled{ - background-color:transparent !important; - color:gray !important; - border-color:transparent !important; -} - -.toolbarButton2 { - float:left; - background-color:#225500; - color:magenta; - width:125px; - height:30px; - font-weight:bold; - font-size:13px; - margin:0; - display:block; -} - -.nation_info td{ - height:18px; -} - -#generalTurnSelector{ - width:50px; - color:white; - background-color:black; - font-size:13px; -} - -#sidebar{ - position:fixed; - right:0; - top: 50%; - transform: translateY(-50%); -} - -#sidebar button{ - /*width:100px;*/ -} - -.turn_pad{ - white-space:nowrap; - font-weight:lighter; - max-width: 162px; - width: 162px; - -} - -.turn_pad .turn_text{ - display:inline-block; -} \ No newline at end of file diff --git a/hwe/css/msg.css b/hwe/css/msg.css deleted file mode 100644 index aaeff82a..00000000 --- a/hwe/css/msg.css +++ /dev/null @@ -1,202 +0,0 @@ -@charset "UTF-8"; - -/*임시용 */ - -#container{ - width:1000px; - margin:auto; - font-size:13px; -} -/*임시용 끝*/ - -#message_board{ - height:1370px; - position:relative; -} -/* -#message_board section{ - overflow-y:auto; - overflow-x:hidden; -} -*/ -.msg_plate{ - width:100%; - outline-style:solid; - outline-width:1px; - outline-color: gray; - min-height:64px; - font-size:12px; - word-break:break-all; - color:white; -} - -.msg_plate_private{ - background-color:#5d1e1a; -} - -.msg_plate_private.msg_plate_dest{ - background-color:#5d461a; -} - -.msg_plate_public{ - background-color:#141c65; - -} - -.msg_plate_national, .msg_plate_diplomacy{ - background-color:#00582c; -} - -.msg_plate_national.msg_plate_dest, .msg_plate_diplomacy.msg_plate_dest { - background-color:#704615; -} - -.msg_plate_national.msg_plate_src, .msg_plate_diplomacy.msg_plate_src { - background-color:#70153b; -} - -.public_message{ - height:667px; -} - -.diplomacy_message{ - flex: 1; -} - -.national_message{ - height:667px; -} - -.private_message{ - flex: 1; -} - -.msg_icon{ - float:left; - width:64px; - height:64px; - border-right:solid 1px gray; -} - -.msg_time{ - font-size:0.75em; - font-weight:normal; -} - -.msg_header{ - font-weight: bold; - margin-bottom:3px; - color:white; - position: relative; -} - -.message_input_form{ - position:relative; -} - -#msg_input{ - color:white; - background-color:black; - font-size:12px; - width:715px; - margin:0 2px; - height:20px; - border:solid 1px gray; -} - -#msg_submit{ - position:absolute; - right:0; - margin-right:2px; -} - -#mailbox_list{ - float:left; - color:white; - background-color:black; - font-size:12px; - width:160px; - height:20px; -} - -.board_header{ - color:white; - outline-style:solid; - outline-width:1px; - outline-color: gray; -} -/* -.board_side{ - position:absolute; - height:1370px; - width:50%; - overflow-y: hidden; - outline-style:solid; - outline-width:1px; - outline-color: gray; - display: flex; - flex-wrap: wrap; - flex-direction: column; -} -.board_side > div{ - height: 1.2em; -} -*/ -.msg_invalid{ - color:rgba(255,255,255,0.5); -} - -.msg_body{ - padding-left:64px; -} - -.msg_target{ - margin:2px 2px 0 2px; - padding:2px 3px; - display:inline-block; - box-shadow: 2px 2px black; - border-radius: 3px; -} - -.btn-delete-msg{ - position: absolute; - right: 0; - top: 0; - margin:2px 2px 0 2px; - font-size:8px; -} - -/* -.public_message .msg_target{ - box-shadow: 2px 2px darkslategrey; -} -*/ - -.msg_target.msg_bright{ - color:black; -} - -.msg_target.msg_dark{ - color:white; -} - -.msg_from_to{ - display:inline-block; -} - -.msg_content{ - margin-left:10px; - margin-right:5px; - overflow:hidden; -} - -.msg_prompt{ - text-align:right; - margin-top:5px; - margin-right:5px; -} - -#mailbox_list option{ - color:white; - background-color:black; -} \ No newline at end of file diff --git a/hwe/d_setting/templates/allButton.php.orig b/hwe/d_setting/templates/allButton.php.orig index af1a4562..ba0ce006 100644 --- a/hwe/d_setting/templates/allButton.php.orig +++ b/hwe/d_setting/templates/allButton.php.orig @@ -1,5 +1,4 @@
-
@@ -8,8 +7,6 @@ -
-
@@ -18,5 +15,4 @@ -
diff --git a/hwe/index.php b/hwe/index.php index fed45210..3cdbb5e6 100644 --- a/hwe/index.php +++ b/hwe/index.php @@ -100,7 +100,7 @@ $auctionCount = $db->queryFirstField('SELECT count(`no`) FROM auction'); <?= $serverName ?>: 메인 - + @@ -122,9 +122,8 @@ $auctionCount = $db->queryFirstField('SELECT count(`no`) FROM auction'); - + - @@ -133,8 +132,8 @@ $auctionCount = $db->queryFirstField('SELECT count(`no`) FROM auction');
-
npcmode == 1) ?>
-
+
npcmode == 1) ?>
+
삼국지 모의전투 HiDCHe 기 ()
@@ -234,9 +233,9 @@ $auctionCount = $db->queryFirstField('SELECT count(`no`) FROM auction');
-
-
-
+
+
+
@@ -276,20 +275,20 @@ $auctionCount = $db->queryFirstField('SELECT count(`no`) FROM auction'); ;color:white;width:160px;font-size:13px;> -
+
-
-
+
+
-
+
장수 동향
-
+
개인 기록
@@ -310,15 +309,15 @@ $auctionCount = $db->queryFirstField('SELECT count(`no`) FROM auction');
내용 없이 '서신전달&갱신'을 누르면 메세지창이 갱신됩니다.
-
npcmode == 1) ?>
+
npcmode == 1) ?>
-
+
전체 메시지(최고99자)
-
+
국가 메시지(최고99자)
@@ -328,14 +327,14 @@ $auctionCount = $db->queryFirstField('SELECT count(`no`) FROM auction'); -
+
개인 메시지(최고99자)
-
+
외교 메시지(최고99자)
@@ -343,7 +342,7 @@ $auctionCount = $db->queryFirstField('SELECT count(`no`) FROM auction');
-
npcmode == 1) ?>
+
npcmode == 1) ?>
.buttonPlate { + grid-template-columns: repeat(8, 1fr); + } + + .buttonPlate>a { + display: block; + text-decoration: none; + } + + .commandButton { + width: 100%; + height: 30px; + font-weight: bold; + font-size: 13px; + margin: 0; + display: block; + } +} + +@include media-breakpoint-down(lg) { + .buttonPlate { + display: grid; + grid-template-columns: repeat(5, 1fr); + padding: 0; + } + + .toolbars>.buttonPlate { + grid-template-columns: repeat(4, 1fr); + } + + .buttonPlate>a { + display: block; + text-decoration: none; + } + + .commandButton { + width: 100%; + height: 30px; + font-weight: bold; + font-size: 13px; + margin: 0; + display: block; + } +} + +.toolbarButton { + float: left; + background-color: #225500; + color: white; + width: 100%; + height: 30px; + font-weight: bold; + font-size: 13px; + margin: 0; + display: block; +} + + + +.commandButton:disabled::before { + content: '【' +} + +.commandButton:disabled::after { + content: '】' +} + +.commandButton:disabled { + background-color: transparent !important; + color: gray !important; + border-color: transparent !important; +} + +.toolbarButton2 { + float: left; + background-color: #225500; + color: magenta; + width: 100%; + height: 30px; + font-weight: bold; + font-size: 13px; + margin: 0; + display: block; +} + +.nation_info td { + height: 18px; +} + +#generalTurnSelector { + width: 50px; + color: white; + background-color: black; + font-size: 13px; +} + +#sidebar { + position: fixed; + right: 0; + top: 50%; + transform: translateY(-50%); +} + +#sidebar button { + /*width:100px;*/ +} + +.turn_pad { + white-space: nowrap; + font-weight: lighter; + max-width: 162px; + width: 162px; + +} + +.turn_pad .turn_text { + display: inline-block; +} + +/*임시용 */ + +#container{ + /*width:1000px;*/ + margin:auto; + font-size:13px; +} +/*임시용 끝*/ + +#message_board{ + position:relative; +} +/* +#message_board section{ + overflow-y:auto; + overflow-x:hidden; +} +*/ +.msg_plate{ + width:100%; + outline-style:solid; + outline-width:1px; + outline-color: gray; + min-height:64px; + font-size:12px; + word-break:break-all; + color:white; +} + +.msg_plate_private{ + background-color:#5d1e1a; +} + +.msg_plate_private.msg_plate_dest{ + background-color:#5d461a; +} + +.msg_plate_public{ + background-color:#141c65; + +} + +.msg_plate_national, .msg_plate_diplomacy{ + background-color:#00582c; +} + +.msg_plate_national.msg_plate_dest, .msg_plate_diplomacy.msg_plate_dest { + background-color:#704615; +} + +.msg_plate_national.msg_plate_src, .msg_plate_diplomacy.msg_plate_src { + background-color:#70153b; +} + +.public_message{ + min-height:300px; +} + +.diplomacy_message{ + min-height:300px; +} + +.national_message{ + min-height:300px; +} + +.private_message{ + min-height:300px; +} + +.msg_icon{ + float:left; + width:64px; + height:64px; + border-right:solid 1px gray; +} + +.msg_time{ + font-size:0.75em; + font-weight:normal; +} + +.msg_header{ + font-weight: bold; + margin-bottom:3px; + color:white; + position: relative; +} + +.message_input_form{ + position:relative; +} + +#msg_input{ + color:white; + background-color:black; + font-size:12px; + margin:0 2px; + height:20px; + border:solid 1px gray; +} + +#msg_submit{ + position:absolute; + right:0; + margin-right:2px; +} + +#mailbox_list{ + float:left; + color:white; + background-color:black; + font-size:12px; + width:160px; + height:20px; +} + +.board_header{ + color:white; + outline-style:solid; + outline-width:1px; + outline-color: gray; +} +/* +.board_side{ + position:absolute; + height:1370px; + width:50%; + overflow-y: hidden; + outline-style:solid; + outline-width:1px; + outline-color: gray; + display: flex; + flex-wrap: wrap; + flex-direction: column; +} +.board_side > div{ + height: 1.2em; +} +*/ +.msg_invalid{ + color:rgba(255,255,255,0.5); +} + +.msg_body{ + padding-left:64px; +} + +.msg_target{ + margin:2px 2px 0 2px; + padding:2px 3px; + display:inline-block; + box-shadow: 2px 2px black; + border-radius: 3px; +} + +.btn-delete-msg{ + position: absolute; + right: 0; + top: 0; + margin:2px 2px 0 2px; + font-size:8px; +} + +/* +.public_message .msg_target{ + box-shadow: 2px 2px darkslategrey; +} +*/ + +.msg_target.msg_bright{ + color:black; +} + +.msg_target.msg_dark{ + color:white; +} + +.msg_from_to{ + display:inline-block; +} + +.msg_content{ + margin-left:10px; + margin-right:5px; + overflow:hidden; +} + +.msg_prompt{ + text-align:right; + margin-top:5px; + margin-right:5px; +} + +#mailbox_list option{ + color:white; + background-color:black; +} \ No newline at end of file diff --git a/hwe/templates/allButton.php b/hwe/templates/allButton.php index af1a4562..75d9c25d 100644 --- a/hwe/templates/allButton.php +++ b/hwe/templates/allButton.php @@ -1,22 +1,18 @@ + + + + + + + + + + + + + + + + +
\ No newline at end of file diff --git a/hwe/templates/commandButton.php b/hwe/templates/commandButton.php index a2770617..b0a1d02e 100644 --- a/hwe/templates/commandButton.php +++ b/hwe/templates/commandButton.php @@ -1,5 +1,4 @@ \ No newline at end of file diff --git a/hwe/ts/main.ts b/hwe/ts/main.ts index 28b390df..10d15a7e 100644 --- a/hwe/ts/main.ts +++ b/hwe/ts/main.ts @@ -17,6 +17,8 @@ import { joinYearMonth } from './util/joinYearMonth'; import { parseYearMonth } from './util/parseYearMonth'; exportWindow($, '$'); +import '../scss/main.scss'; + type TurnArg = { //TODO: 채울것 }