diff --git a/hwe/css/common.css b/hwe/css/common.css index 664b4c21..0dfca57d 100644 --- a/hwe/css/common.css +++ b/hwe/css/common.css @@ -1,7 +1,3 @@ -@charset "UTF-8"; - -/* font-boostring Block */ - html * { max-height: 1000000px; } diff --git a/hwe/index.php b/hwe/index.php index 938606dc..c0001976 100644 --- a/hwe/index.php +++ b/hwe/index.php @@ -122,7 +122,7 @@ $auctionCount = $db->queryFirstField('SELECT count(`no`) FROM auction'); }); - + diff --git a/hwe/scss/common_legacy.scss b/hwe/scss/common_legacy.scss new file mode 100644 index 00000000..9520d2af --- /dev/null +++ b/hwe/scss/common_legacy.scss @@ -0,0 +1,286 @@ +@import "./bootstrap5.scss"; + +html * { + max-height: 1000000px; +} + +html, +body { + background-color: black; + color: white; + line-height: 1.3; + font-family: '맑은 고딕'; + font-size: 13px; +} + +table { + font-family: '맑은 고딕'; +} + +font { + font-family: '맑은 고딕'; +} + +input { + font-family: '맑은 고딕'; + font-size: 13px; +} + +select { + font-family: '굴림'; + line-height: 100%; +} + +.center { + text-align: center; +} + +table.mimic_flex { + border-collapse: collapse; + border: none; + padding: 0; +} + +.mimic_flex td, +.mimic_flex th { + border: none !important; + padding: 0px; + word-break: break-all; +} + +table.tb_layout { + border-collapse: collapse; + padding: 0px; + font-size: 13px; + word-break: break-all; + font-family: '맑은 고딕'; +} + +.tb_layout td, +.tb_layout th { + border: solid 1px gray; + padding: 0px; + word-break: break-all; + font-family: '맑은 고딕'; + ; +} + +div.bar_out { + position: relative; + border-top: solid 1px #888888; + border-bottom: solid 1px #333333; + padding: 0; + margin: 0; + width: 100%; + overflow: hidden; +} + +div.bar_out div { + position: absolute; + left: 0; + top: 0; + height: 100%; +} + +div.bar_out div.bar_in { + width: 100%; +} + + +/* */ + +.ev_warning { + color: orangered; +} + +.ev_notice { + color: orangered; +} + +.ev_succes { + color: lightgreen; +} + +.ev_sell { + color: orange; +} + +.ev_failed { + color: orangered; +} + +.ev_highlight { + color: orangered; +} + + +/* TODO: 색상값이 아니라 의미에 따라 클래스 지정 */ + +.o_bullet::before { + color: cyan; + content: "●"; +} + +.o_diamond::before { + color: orangered; + content: "◆"; +} + +.small_war_log { + display: inline-block; +} + +.small_war_log .war_type_attack { + color: cyan; +} + +.small_war_log .war_type_defense { + color: magenta; +} + +.small_war_log .war_type_siege { + color: white; +} + +.small_war_log .name_plate { + font-size: 0.75em; +} + +.small_war_log .name_plate_cover { + color: yellow; +} + +.small_war_log .crew_plate { + color: orangered; + font-size: 90%; +} + +.t_date { + font-size: 0.75em; +} + +.t_red { + color: red; +} + +.t_blue { + color: blue; +} + +.t_green { + color: green; +} + +.t_magenta { + color: magenta; +} + +.t_cyan { + color: cyan; +} + +.t_limegreen { + color: limegreen; +} + +.t_skyblue { + color: skyblue; +} + +.t_orangered { + color: orangered; +} + +.t_yellow { + color: yellow; +} + +.t_white { + color: white; +} + +.float_left { + float: left; +} + +.tooltip { + font-size: 12px; + font-family: '맑은 고딕'; +} + +.tooltip_copyable_info .tooltiptext { + display: inline; + color: rgba(0, 0, 0, 0); + font-size: 0; +} + +.tooltiptext { + display: none; +} + +.hidden_but_copyable { + color: rgba(0, 0, 0, 0); + font-size: 0; +} + +.btn-group-xs>.btn, +.btn-xs { + padding: .25rem .4rem; + font-size: .875rem; + line-height: .5; + border-radius: .2rem; +} + +.edit_form.viewer { + max-height: 200px; + overflow-y: auto; +} + +.trumbowyg-box { + margin: 0; + border-left: none; + border-right: none; +} + +.edit_form.trumbowyg-editor { + margin: 0; + padding: 0; +} + +.commandBasic { + background-color: black; + color: white; +} + +.compensatePositive { + color: skyblue; +} + +.compensateNegative { + color: orange; +} + +.compensateNeutral { + color: white; +} + +.commandBasic.commandImpossible { + background-color: red; + color: white; +} + +.select2-selection--single.simple-select2-align-center .select2-selection__rendered { + text-align: center; +} + +.select2-dropdown.simple-select2-align-center li.select2-results__option { + text-align: center; +} + +.select2-container--bootstrap4 .select2-selection--single.text-secondary .select2-selection__rendered { + color: white; +} + +.select2-container--bootstrap4 .text-secondary .select2-results__option[aria-selected=false] { + color: white; +} \ No newline at end of file diff --git a/hwe/scss/game_bg.scss b/hwe/scss/game_bg.scss index 716bcecd..5bde826d 100644 --- a/hwe/scss/game_bg.scss +++ b/hwe/scss/game_bg.scss @@ -1,5 +1,3 @@ -@charset "UTF-8"; - @import url('https://fonts.googleapis.com/css2?family=Nanum+Gothic:wght@400;700&display=swap'); @import '../../d_shared/common.css'; diff --git a/hwe/scss/main.scss b/hwe/scss/main.scss index 2c499f84..420b599e 100644 --- a/hwe/scss/main.scss +++ b/hwe/scss/main.scss @@ -1,5 +1,3 @@ -@charset "UTF-8"; - @import "./bootstrap5.scss"; body { diff --git a/hwe/scss/troop.scss b/hwe/scss/troop.scss index d86a7477..060d2d1c 100644 --- a/hwe/scss/troop.scss +++ b/hwe/scss/troop.scss @@ -1,5 +1,3 @@ -@charset "UTF-8"; - #troop_list .cityText{ display:none; } diff --git a/hwe/ts/common_deprecated.ts b/hwe/ts/common_deprecated.ts index bd161546..35852e94 100644 --- a/hwe/ts/common_deprecated.ts +++ b/hwe/ts/common_deprecated.ts @@ -11,6 +11,8 @@ import Popper from 'popper.js'; exportWindow(Popper, 'Popper');//XXX: 왜 popper를 이렇게 불러야 하는가? import 'bootstrap'; +import "../scss/common_legacy.scss"; + exportWindow(jQuery, '$'); exportWindow(jQuery, 'jQuery'); diff --git a/hwe/ts/common_legacy.ts b/hwe/ts/common_legacy.ts index 5a686eda..35a2d316 100644 --- a/hwe/ts/common_legacy.ts +++ b/hwe/ts/common_legacy.ts @@ -1,7 +1,6 @@ import $ from "jquery"; import axios from "axios"; -axios.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest'; /** * object의 array를 id를 key로 삼는 object로 재 변환 */