refac: bootstrap.scss 분리 후 별도 빌드

hwe/a_bestGeneral.php

@@ -34,6 +34,7 @@ $templates = new \League\Plates\Engine(__DIR__ . '/templates');
     <?= WebUtil::printCSS('../d_shared/common.css') ?>
     <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
     <?= WebUtil::printJS('../d_shared/common_path.js') ?>
+    <?= WebUtil::printDist('vue', [], true) ?>
     <?= WebUtil::printDist('ts', ['common', 'bestGeneral']) ?>
 </head>
 

hwe/b_currentCity.php

@@ -55,6 +55,7 @@ $templates = new \League\Plates\Engine('templates');
             font-size: x-small;
         }
     </style>
+    <?= WebUtil::printDist('vue', [], true) ?>
     <?= WebUtil::printDist('ts', ['common', 'currentCity']) ?>
 </head>
 

hwe/b_myPage.php

@@ -70,6 +70,7 @@ $use_auto_nation_turn = $me->getAuxVar('use_auto_nation_turn') ?? 1;
     <?= WebUtil::printCSS('../d_shared/common.css') ?>
     <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
     <?= WebUtil::printJS('../d_shared/common_path.js') ?>
+    <?= WebUtil::printDist('vue', [], true) ?>
     <?= WebUtil::printDist('ts', ['myPage']) ?>
 </head>
 

hwe/battle_simulator.php

@@ -54,6 +54,7 @@ if ($nationID) {
         var city = <?= Json::encode($city) ?>;
         var nation = <?= Json::encode($nation) ?>;
     </script>
+    <?= WebUtil::printDist('vue', [], true) ?>
     <?= WebUtil::printDist('ts', ['common', 'battle_simulator']) ?>
 </head>
 

hwe/scss/battleCenter.scss

@@ -1,4 +1,4 @@
-@import "./common/bootstrap5.scss";
+@import "./common/base.scss";
 @import "./common_legacy.scss";
 
 @include media-1000px{

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";

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";

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 "bootstrap/scss/functions";
-@import "break_500px.scss";
+@import "bootstrap/scss/variables";

hwe/scss/common/bootstrap5.scss

@@ -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";

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;
+  }
 }

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;

hwe/scss/common_legacy.scss

@@ -1,4 +1,4 @@
-@import "./common/bootstrap5.scss";
+@import "./common/base.scss";
 @import "./editor_component.scss";
 
 html * {

hwe/scss/hallOfFame.scss

@@ -1,4 +1,4 @@
-@import "./common/bootstrap5.scss";
+@import "./common/base.scss";
 @import "./common_legacy.scss";
 
 @include media-1000px{

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;
   }
 }
 

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;
 }

hwe/scss/myPage.scss

@@ -1,4 +1,4 @@
-@import "./common/bootstrap5.scss";
+@import "./common/base.scss";
 @import "./common_legacy.scss";
 
 @include media-1000px{

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";
 

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";
 

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";

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";

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";
 

hwe/t_diplomacy.php

@@ -47,6 +47,7 @@ if ($permission < 1) {
         var permissionLevel = <?= $permission ?>; //
     </script>
     <?= WebUtil::printJS('../d_shared/common_path.js') ?>
+    <?= WebUtil::printDist('vue', [], true) ?>
     <?= WebUtil::printDist('ts', ['common', 'diplomacy']) ?>
 
 </head>

hwe/ts/PageCachedMap.vue

@@ -75,7 +75,7 @@ onMounted(async () => {
 </script>
 
 <style lang="scss">
-@import "@/../scss/common/bootstrap5.scss";
+@import "@scss/common/base.scss";
 @include media-1000px {
   #container {
     width: 700px;

hwe/ts/PageChiefCenter.vue

@@ -94,7 +94,6 @@ declare const staticValues: {
 };
 </script>
 <script lang="ts" setup>
-import "@scss/common/bootstrap5.scss";
 import "@scss/game_bg.scss";
 import "../../css/config.css";
 

hwe/ts/PageInheritPoint.vue

@@ -254,7 +254,6 @@ declare const staticValues: {
 </script>
 <script lang="ts" setup>
 import { reactive, ref } from "vue";
-import "@scss/common/bootstrap5.scss";
 import "@scss/game_bg.scss";
 import TopBackBar from "@/components/TopBackBar.vue";
 import _ from "lodash";

hwe/ts/PageJoin.vue

@@ -272,7 +272,6 @@ declare const staticValues: {
 };
 </script>
 <script lang="ts" setup>
-import "@scss/common/bootstrap5.scss";
 import "@scss/game_bg.scss";
 
 import TopBackBar from "@/components/TopBackBar.vue";
@@ -538,7 +537,7 @@ watch(inheritTurnTimeSecond, (newValue: number) => {
 });
 </script>
 <style lang="scss">
-@import "@scss/common/bootstrap5.scss";
+@import "@scss/common/base.scss";
 @import "@scss/editor_component.scss";
 
 #container {

hwe/ts/PageNPCControl.vue

@@ -385,7 +385,6 @@ declare const staticValues: {
 };
 </script>
 <script setup lang="ts">
-import "@scss/common/bootstrap5.scss";
 import "@scss/game_bg.scss";
 
 import { ref } from "vue";

hwe/ts/components/TipTap.vue

@@ -326,7 +326,6 @@
 </template>
 
 <script lang="ts" setup>
-//import "@scss/common/bootstrap5.scss";
 import { onBeforeUnmount, onMounted, ref, watch } from "vue";
 import { Editor, EditorContent, BubbleMenu } from "@tiptap/vue-3";
 import { FontSize } from "@/tiptap-ext/FontSize";

hwe/ts/gateway/common.ts

@@ -1,3 +1,3 @@
 
 import 'bootstrap';
-import "@scss/common/bootstrap5.scss";
+import "@scss/bootstrap.scss";

hwe/ts/v_NPCControl.ts

@@ -1,5 +1,3 @@
-import "@scss/common/bootstrap5.scss";
-
 import { createApp } from 'vue'
 import NPCControl from '@/PageNPCControl.vue';
 import { BootstrapVue3, BToastPlugin } from 'bootstrap-vue-3'

hwe/ts/v_inheritPoint.ts

@@ -1,5 +1,3 @@
-import "@scss/common/bootstrap5.scss";
-
 import { createApp } from 'vue'
 import PageInheritPoint from '@/PageInheritPoint.vue';
 import BootstrapVue3 from 'bootstrap-vue-3'

src/sammo/WebUtil.php

@@ -205,7 +205,7 @@ class WebUtil
 
         $outputs = ["\n"];
 
-        foreach (["vendors", "common_ts", ...$entryName] as $moduleName) {
+        foreach (["vendors", "common_ts", "bootstrap", ...$entryName] as $moduleName) {
             foreach (['js', 'css'] as $ext) {
                 $checkPath = $basePath . "/{$moduleName}.{$ext}";
                 if (!file_exists($checkPath)) {