diff --git a/hwe/a_bestGeneral.php b/hwe/a_bestGeneral.php index 69bd6a87..219a5f00 100644 --- a/hwe/a_bestGeneral.php +++ b/hwe/a_bestGeneral.php @@ -34,6 +34,7 @@ $templates = new \League\Plates\Engine(__DIR__ . '/templates'); + diff --git a/hwe/b_currentCity.php b/hwe/b_currentCity.php index 12cc78b8..8a3ddf7d 100644 --- a/hwe/b_currentCity.php +++ b/hwe/b_currentCity.php @@ -55,6 +55,7 @@ $templates = new \League\Plates\Engine('templates'); font-size: x-small; } + diff --git a/hwe/b_myPage.php b/hwe/b_myPage.php index 8517d91e..26eb2f34 100644 --- a/hwe/b_myPage.php +++ b/hwe/b_myPage.php @@ -70,6 +70,7 @@ $use_auto_nation_turn = $me->getAuxVar('use_auto_nation_turn') ?? 1; + diff --git a/hwe/battle_simulator.php b/hwe/battle_simulator.php index 5bdf7379..fc8491cb 100644 --- a/hwe/battle_simulator.php +++ b/hwe/battle_simulator.php @@ -54,6 +54,7 @@ if ($nationID) { var city = ; var nation = ; + diff --git a/hwe/scss/battleCenter.scss b/hwe/scss/battleCenter.scss index 38b39304..64ce7dab 100644 --- a/hwe/scss/battleCenter.scss +++ b/hwe/scss/battleCenter.scss @@ -1,4 +1,4 @@ -@import "./common/bootstrap5.scss"; +@import "./common/base.scss"; @import "./common_legacy.scss"; @include media-1000px{ diff --git a/hwe/scss/board.scss b/hwe/scss/board.scss index caa657ef..55666835 100644 --- a/hwe/scss/board.scss +++ b/hwe/scss/board.scss @@ -1,4 +1,4 @@ -@import "./common/bootstrap5.scss"; +@import "./common/base.scss"; @import "@scss/game_bg.scss"; @import "./common_legacy.scss"; @import "../../css/config.css"; diff --git a/hwe/scss/bootstrap.scss b/hwe/scss/bootstrap.scss index 4f17c13b..3d74b613 100644 --- a/hwe/scss/bootstrap.scss +++ b/hwe/scss/bootstrap.scss @@ -1,16 +1,16 @@ -@import "./common/pretendard.scss"; +@import "./common/variables.scss"; +@import "./common/break_500px.scss"; $body-bg: #000; $input-bg: #ddd; $input-color: #303030; -@import url("https://cdn.jsdelivr.net/npm/bootstrap-icons/font/bootstrap-icons.css"); - -@import "./common/break_500px.scss"; -@import "./common/variables.scss"; @import "./common/bootswatch_custom_variables.scss"; @import "bootstrap/scss/bootstrap.scss"; @import "./common/bootswatch_custom.scss"; @import "./common/bootstrap_sammo.scss"; @import "./common/vue-multiselect.scss"; + +@import url("https://cdn.jsdelivr.net/npm/bootstrap-icons/font/bootstrap-icons.css"); +@import "./common/pretendard.scss"; \ No newline at end of file diff --git a/hwe/scss/common/base.scss b/hwe/scss/common/base.scss index 200b049c..c9ff7f76 100644 --- a/hwe/scss/common/base.scss +++ b/hwe/scss/common/base.scss @@ -1,4 +1,5 @@ @import "./variables.scss"; +@import "break_500px.scss"; $body-bg: #000; @@ -6,5 +7,5 @@ $input-bg: #ddd; $input-color: #303030; @import "./bootswatch_custom_variables.scss"; -@import "bootstrap/scss/bootstrap-utilities.scss"; -@import "break_500px.scss"; \ No newline at end of file +@import "bootstrap/scss/functions"; +@import "bootstrap/scss/variables"; diff --git a/hwe/scss/common/bootstrap5.scss b/hwe/scss/common/bootstrap5.scss deleted file mode 100644 index 03b4fa42..00000000 --- a/hwe/scss/common/bootstrap5.scss +++ /dev/null @@ -1,16 +0,0 @@ -@import "./pretendard.scss"; - -$body-bg: #000; - -$input-bg: #ddd; -$input-color: #303030; - -@import url("https://cdn.jsdelivr.net/npm/bootstrap-icons/font/bootstrap-icons.css"); - -@import "./break_500px.scss"; -@import "./variables.scss"; -@import "./bootswatch_custom_variables.scss"; -@import "bootstrap/scss/bootstrap.scss"; -@import "./bootswatch_custom.scss"; -@import "./bootstrap_sammo.scss"; -@import "./vue-multiselect.scss"; \ No newline at end of file diff --git a/hwe/scss/common/bootstrap_sammo.scss b/hwe/scss/common/bootstrap_sammo.scss index b817a50a..8f7845c4 100644 --- a/hwe/scss/common/bootstrap_sammo.scss +++ b/hwe/scss/common/bootstrap_sammo.scss @@ -69,4 +69,37 @@ $color in $sammoColors { border-color: shade-color($color, 10%); } } +} + + +.buttonPlate { + .toolbarButton { + @extend .btn; + @extend .btn-sammo-base2; + width: 100%; + font-weight: bold; + font-size: 14px; + } + + .toolbarButton2 { + @extend .btn; + @extend .btn-sammo-base2; + color: magenta; + width: 100%; + font-weight: bold; + font-size: 14px; + + &:hover, + &:focus, + &:active { + color: magenta; + } + } + + .commandButton { + width: 100%; + font-weight: bold; + font-size: 14px; + display: block; + } } \ No newline at end of file diff --git a/hwe/scss/common/vue-multiselect.scss b/hwe/scss/common/vue-multiselect.scss index acbe7415..f2b302cc 100644 --- a/hwe/scss/common/vue-multiselect.scss +++ b/hwe/scss/common/vue-multiselect.scss @@ -308,7 +308,6 @@ fieldset[disabled] .multiselect { line-height: $vue-multiselect-min-height / 2; text-decoration: none; text-transform: none; - vertical-align: middle; position: relative; cursor: pointer; white-space: nowrap; diff --git a/hwe/scss/common_legacy.scss b/hwe/scss/common_legacy.scss index 85fe1bc2..2922fe34 100644 --- a/hwe/scss/common_legacy.scss +++ b/hwe/scss/common_legacy.scss @@ -1,4 +1,4 @@ -@import "./common/bootstrap5.scss"; +@import "./common/base.scss"; @import "./editor_component.scss"; html * { diff --git a/hwe/scss/hallOfFame.scss b/hwe/scss/hallOfFame.scss index cc44d043..0f7c43dc 100644 --- a/hwe/scss/hallOfFame.scss +++ b/hwe/scss/hallOfFame.scss @@ -1,4 +1,4 @@ -@import "./common/bootstrap5.scss"; +@import "./common/base.scss"; @import "./common_legacy.scss"; @include media-1000px{ diff --git a/hwe/scss/history.scss b/hwe/scss/history.scss index e676dc39..bce9d928 100644 --- a/hwe/scss/history.scss +++ b/hwe/scss/history.scss @@ -1,4 +1,4 @@ -@import "./common/bootstrap5.scss"; +@import "./common/base.scss"; @import "./editor_component.scss"; @import "./util.scss"; @@ -15,12 +15,12 @@ .map_position { flex: 0 0 auto; - width: 700px; + width: 700px !important; } .nation_position { flex: 0 0 auto; - width: 300px; + width: 300px !important; } } diff --git a/hwe/scss/main.scss b/hwe/scss/main.scss index e9731da4..00f01fdd 100644 --- a/hwe/scss/main.scss +++ b/hwe/scss/main.scss @@ -1,6 +1,7 @@ -@import "./common/bootstrap5.scss"; +@import "./common/base.scss"; @import "./editor_component.scss"; @import "./util.scss"; + body { color: white; background-color: black; @@ -314,38 +315,6 @@ body { } } -.buttonPlate { - .toolbarButton { - @extend .btn; - @extend .btn-sammo-base2; - width: 100%; - font-weight: bold; - font-size: 14px; - } - - .toolbarButton2 { - @extend .btn; - @extend .btn-sammo-base2; - color: magenta; - width: 100%; - font-weight: bold; - font-size: 14px; - - &:hover, - &:focus, - &:active { - color: magenta; - } - } - - .commandButton { - width: 100%; - font-weight: bold; - font-size: 14px; - display: block; - } -} - .nation_info td { height: 18px; } diff --git a/hwe/scss/myPage.scss b/hwe/scss/myPage.scss index 78b17b45..850a05ec 100644 --- a/hwe/scss/myPage.scss +++ b/hwe/scss/myPage.scss @@ -1,4 +1,4 @@ -@import "./common/bootstrap5.scss"; +@import "./common/base.scss"; @import "./common_legacy.scss"; @include media-1000px{ diff --git a/hwe/scss/nationBetting.scss b/hwe/scss/nationBetting.scss index 831b1325..74bf4b6f 100644 --- a/hwe/scss/nationBetting.scss +++ b/hwe/scss/nationBetting.scss @@ -1,4 +1,4 @@ -@import '@scss/common/bootstrap5.scss'; +@import "./common/base.scss"; @import "@scss/game_bg.scss"; @import "@scss/util.scss"; diff --git a/hwe/scss/nationGeneral.scss b/hwe/scss/nationGeneral.scss index df8b6b0a..267d2d66 100644 --- a/hwe/scss/nationGeneral.scss +++ b/hwe/scss/nationGeneral.scss @@ -1,4 +1,4 @@ -@import '@scss/common/bootstrap5.scss'; +@import "./common/base.scss"; @import "@scss/game_bg.scss"; @import "@scss/util.scss"; diff --git a/hwe/scss/nationStratFinan.scss b/hwe/scss/nationStratFinan.scss index eac1d1f9..698d3955 100644 --- a/hwe/scss/nationStratFinan.scss +++ b/hwe/scss/nationStratFinan.scss @@ -1,4 +1,4 @@ -@import '@scss/common/bootstrap5.scss'; +@import "./common/base.scss"; @import "@scss/game_bg.scss"; @import "@scss/util.scss"; @import "@scss/editor_component.scss"; diff --git a/hwe/scss/processing.scss b/hwe/scss/processing.scss index ff426041..f7b30cc0 100644 --- a/hwe/scss/processing.scss +++ b/hwe/scss/processing.scss @@ -1,4 +1,4 @@ -@import "./common/bootstrap5.scss"; +@import "./common/base.scss"; @import "./editor_component.scss"; @import "./common_legacy.scss"; @import "./util.scss"; diff --git a/hwe/scss/vote.scss b/hwe/scss/vote.scss index 6422943b..4e0d058a 100644 --- a/hwe/scss/vote.scss +++ b/hwe/scss/vote.scss @@ -1,4 +1,4 @@ -@import '@scss/common/bootstrap5.scss'; +@import "./common/base.scss"; @import "@scss/game_bg.scss"; @import "@scss/util.scss"; diff --git a/hwe/t_diplomacy.php b/hwe/t_diplomacy.php index 95948cc9..2b2f67da 100644 --- a/hwe/t_diplomacy.php +++ b/hwe/t_diplomacy.php @@ -47,6 +47,7 @@ if ($permission < 1) { var permissionLevel = ; // + diff --git a/hwe/ts/PageCachedMap.vue b/hwe/ts/PageCachedMap.vue index 668cb642..b585be0b 100644 --- a/hwe/ts/PageCachedMap.vue +++ b/hwe/ts/PageCachedMap.vue @@ -75,7 +75,7 @@ onMounted(async () => {