Merge remote-tracking branch 'origin/dev' into sub_laptop_7

# Conflicts:
#	M02_MasterTemplete/M02_MasterTemplete_UI_Side.ts

M01_MasterData/M01_MasterData_UI_Combo_Pick.ts

@@ -18,6 +18,7 @@ import {
   type SubBrief,
 } from "./M01_MasterData_UI_Logic_Api";
 import { tc } from "./M01_MasterData_UI_Combo_Text";
+import "./M01_MasterData_UI_Logic_Style.css"; // 창 겉틀 — M02 에서 열 때도 이 모듈이 불러옴
 import "./M01_MasterData_UI_Combo.css";
 
 const opts = (values: string[]): { value: string; text: string }[] =>

M01_MasterData/M01_MasterData_UI_Combo_Preview.ts

@@ -37,7 +37,7 @@ function inputCell(
   const choices = input.고르기?.map((v) => ({ value: String(v), text: String(v) }));
   const field = choices
     ? createSelectField({ options: choices, value, compact: true, label: input.이름 })
-    : createInputField({ type: "text", label: input.이름 });
+    : createInputField({ type: "text", label: input.이름, compact: true });
   const control = "select" in field ? field.select : field.input;
   control.value = value;
   control.setAttribute("data-input", `${key}|${input.이름}`);

M01_MasterData/M01_MasterData_UI_Logic_Style.css

@@ -121,6 +121,11 @@
   font-size: var(--text-body-sm);
 }
 
+/* 한 줄 칸은 작은 고르기칸과 같은 높이 */
+input.m01-logic__input {
+  height: var(--control-height-sm);
+}
+
 .m01-logic__note {
   min-height: 48px;
   resize: vertical;