From bd42042a613305a2a00d9977ab67b6b84e264ee9 Mon Sep 17 00:00:00 2001 From: hide_d Date: Fri, 10 Dec 2021 21:45:02 +0900 Subject: [PATCH] =?UTF-8?q?refactor(WIP):=20scss,=20ts=20=EA=B3=B5?= =?UTF-8?q?=ED=86=B5=20=ED=8C=8C=EC=9D=BC=20=EB=AC=B6=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hwe/scss/{ => common}/bootstrap5.scss | 2 +- hwe/scss/{ => common}/bootstrap_sammo.scss | 0 hwe/scss/{ => common}/bootswatch_custom.scss | 0 .../{ => common}/bootswatch_custom_variables.scss | 0 hwe/scss/{ => common}/break_500px.scss | 0 hwe/scss/{ => common}/pretendard.scss | 0 hwe/scss/{ => common}/variables.scss | 0 hwe/scss/{ => common}/vue-multiselect.scss | 0 hwe/scss/common_legacy.scss | 2 +- hwe/scss/main.scss | 4 ++-- hwe/ts/Board.vue | 2 +- hwe/ts/Join.vue | 2 +- hwe/ts/NPCControl.vue | 2 +- hwe/ts/ReservedCommand.vue | 6 +++--- hwe/ts/gateway/common.ts | 2 +- hwe/ts/inheritPoint.vue | 2 +- hwe/ts/v_NPCControl.ts | 2 +- hwe/ts/v_board.ts | 2 +- hwe/ts/v_inheritPoint.ts | 2 +- hwe/ts/v_join.ts | 2 +- webpack.config.cjs | 14 ++++++++++++++ 21 files changed, 30 insertions(+), 16 deletions(-) rename hwe/scss/{ => common}/bootstrap5.scss (85%) rename hwe/scss/{ => common}/bootstrap_sammo.scss (100%) rename hwe/scss/{ => common}/bootswatch_custom.scss (100%) rename hwe/scss/{ => common}/bootswatch_custom_variables.scss (100%) rename hwe/scss/{ => common}/break_500px.scss (100%) rename hwe/scss/{ => common}/pretendard.scss (100%) rename hwe/scss/{ => common}/variables.scss (100%) rename hwe/scss/{ => common}/vue-multiselect.scss (100%) diff --git a/hwe/scss/bootstrap5.scss b/hwe/scss/common/bootstrap5.scss similarity index 85% rename from hwe/scss/bootstrap5.scss rename to hwe/scss/common/bootstrap5.scss index e7b4bb2f..1802b74b 100644 --- a/hwe/scss/bootstrap5.scss +++ b/hwe/scss/common/bootstrap5.scss @@ -9,7 +9,7 @@ $input-color: #303030; @import "./variables.scss"; @import "./bootswatch_custom_variables.scss"; -@import "../../node_modules/bootstrap/scss/bootstrap.scss"; +@import "/node_modules/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/bootstrap_sammo.scss b/hwe/scss/common/bootstrap_sammo.scss similarity index 100% rename from hwe/scss/bootstrap_sammo.scss rename to hwe/scss/common/bootstrap_sammo.scss diff --git a/hwe/scss/bootswatch_custom.scss b/hwe/scss/common/bootswatch_custom.scss similarity index 100% rename from hwe/scss/bootswatch_custom.scss rename to hwe/scss/common/bootswatch_custom.scss diff --git a/hwe/scss/bootswatch_custom_variables.scss b/hwe/scss/common/bootswatch_custom_variables.scss similarity index 100% rename from hwe/scss/bootswatch_custom_variables.scss rename to hwe/scss/common/bootswatch_custom_variables.scss diff --git a/hwe/scss/break_500px.scss b/hwe/scss/common/break_500px.scss similarity index 100% rename from hwe/scss/break_500px.scss rename to hwe/scss/common/break_500px.scss diff --git a/hwe/scss/pretendard.scss b/hwe/scss/common/pretendard.scss similarity index 100% rename from hwe/scss/pretendard.scss rename to hwe/scss/common/pretendard.scss diff --git a/hwe/scss/variables.scss b/hwe/scss/common/variables.scss similarity index 100% rename from hwe/scss/variables.scss rename to hwe/scss/common/variables.scss diff --git a/hwe/scss/vue-multiselect.scss b/hwe/scss/common/vue-multiselect.scss similarity index 100% rename from hwe/scss/vue-multiselect.scss rename to hwe/scss/common/vue-multiselect.scss diff --git a/hwe/scss/common_legacy.scss b/hwe/scss/common_legacy.scss index 3dda215b..1b0efaf5 100644 --- a/hwe/scss/common_legacy.scss +++ b/hwe/scss/common_legacy.scss @@ -1,4 +1,4 @@ -@import "./bootstrap5.scss"; +@import "./common/bootstrap5.scss"; html * { max-height: 1000000px; diff --git a/hwe/scss/main.scss b/hwe/scss/main.scss index 072d4872..bde2517a 100644 --- a/hwe/scss/main.scss +++ b/hwe/scss/main.scss @@ -1,5 +1,5 @@ -@import "./break_500px.scss"; -@import "./bootstrap5.scss"; +@import "./common/break_500px.scss"; +@import "./common/bootstrap5.scss"; body { color: white; diff --git a/hwe/ts/Board.vue b/hwe/ts/Board.vue index b33ba3f5..e3aa5e12 100644 --- a/hwe/ts/Board.vue +++ b/hwe/ts/Board.vue @@ -60,7 +60,7 @@