From 6441fc09e43331e75ca17792fc7462ead391125b Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Sat, 11 Dec 2021 12:12:16 +0900
Subject: [PATCH] =?UTF-8?q?misc:=20scss=20=ED=8C=8C=EC=9D=BC=20=EC=A0=95?=
 =?UTF-8?q?=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/scss/main.scss               | 2 +-
 hwe/ts/components/TopBackBar.vue | 2 +-
 hwe/ts/gateway/login.ts          | 4 ++--
 hwe/ts/troop.ts                  | 4 ++--
 hwe/ts/v_NPCControl.ts           | 4 ++--
 hwe/ts/v_inheritPoint.ts         | 5 +++--
 hwe/ts/v_main.ts                 | 4 ++--
 7 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/hwe/scss/main.scss b/hwe/scss/main.scss
index 735d8d69..0eeb1e8f 100644
--- a/hwe/scss/main.scss
+++ b/hwe/scss/main.scss
@@ -1,5 +1,5 @@
-@import "./common/break_500px.scss";
 @import "./common/bootstrap5.scss";
+@import "./common/break_500px.scss";
 
 body {
     color: white;
diff --git a/hwe/ts/components/TopBackBar.vue b/hwe/ts/components/TopBackBar.vue
index 040f74a1..62e340c0 100644
--- a/hwe/ts/components/TopBackBar.vue
+++ b/hwe/ts/components/TopBackBar.vue
@@ -8,8 +8,8 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, PropType } from "vue";
 import "@scss/game_bg.scss";
+import { defineComponent, PropType } from "vue";
 
 export default defineComponent({
   name: "TopBackBar",
diff --git a/hwe/ts/gateway/login.ts b/hwe/ts/gateway/login.ts
index 3e01b8c8..b1ca1860 100644
--- a/hwe/ts/gateway/login.ts
+++ b/hwe/ts/gateway/login.ts
@@ -1,3 +1,5 @@
+import '@scss/gateway/login.scss';
+
 import $ from 'jquery';
 import { JQValidateForm, NamedRules } from '@util/jqValidateForm';
 import axios from 'axios';
@@ -11,8 +13,6 @@ import { delay } from '@util/delay';
 import { Modal } from 'bootstrap';
 import '@/gateway/common';
 
-import '@scss/gateway/login.scss';
-
 type LoginResponse = {
     result: true,
     nextToken: [number, string] | undefined,
diff --git a/hwe/ts/troop.ts b/hwe/ts/troop.ts
index 4f8c9ad6..2ccd6f54 100644
--- a/hwe/ts/troop.ts
+++ b/hwe/ts/troop.ts
@@ -1,9 +1,9 @@
+import "@scss/troop.scss";
+
 import { errUnknown } from "@/common_legacy";
 import { launchTroopPlugin } from "@/extPluginTroop";
 import jQuery from "jquery";
 
-import "@scss/troop.scss";
-
 jQuery(function($){
     //btnJoinTroop, btnLeaveTroop, btnKickTroop, btnCreateTroop, btnChangeTroopName
     $('#btnLeaveTroop').click(function(){
diff --git a/hwe/ts/v_NPCControl.ts b/hwe/ts/v_NPCControl.ts
index d690146b..6827386e 100644
--- a/hwe/ts/v_NPCControl.ts
+++ b/hwe/ts/v_NPCControl.ts
@@ -1,8 +1,8 @@
+import "@scss/common/bootstrap5.scss";
+
 import { createApp } from 'vue'
 import NPCControl from '@/NPCControl.vue';
 import BootstrapVue3 from 'bootstrap-vue-3'
-import "@scss/common/bootstrap5.scss";
-import 'bootstrap-vue-3/dist/bootstrap-vue-3.css'
 import { setAxiosXMLHttpRequest } from '@util/setAxiosXMLHttpRequest';
 
 setAxiosXMLHttpRequest();
diff --git a/hwe/ts/v_inheritPoint.ts b/hwe/ts/v_inheritPoint.ts
index 15e0c862..fc5f9372 100644
--- a/hwe/ts/v_inheritPoint.ts
+++ b/hwe/ts/v_inheritPoint.ts
@@ -1,6 +1,7 @@
+import "@scss/common/bootstrap5.scss";
+
 import { createApp } from 'vue'
 import InheritPoint from '@/inheritPoint.vue';
 import BootstrapVue3 from 'bootstrap-vue-3'
-import "@scss/common/bootstrap5.scss";
-import 'bootstrap-vue-3/dist/bootstrap-vue-3.css'
+
 createApp(InheritPoint).use(BootstrapVue3).mount('#app');
\ No newline at end of file
diff --git a/hwe/ts/v_main.ts b/hwe/ts/v_main.ts
index 8287562a..d20f92e7 100644
--- a/hwe/ts/v_main.ts
+++ b/hwe/ts/v_main.ts
@@ -1,3 +1,5 @@
+import '@scss/main.scss';
+
 exportWindow(scrollHardTo, 'scrollHardTo');
 
 import { exportWindow } from '@util/exportWindow';
@@ -11,8 +13,6 @@ import Multiselect from 'vue-multiselect';
 import "@/legacy/main";
 import { auto500px } from './util/auto500px';
 
-import '@scss/main.scss';
-
 setAxiosXMLHttpRequest();
 
 createApp(ReservedCommand).use(BootstrapVue3).component('v-multiselect', Multiselect).mount('#reservedCommandList');