Merge remote-tracking branch 'origin/sub_laptop_6' into main_laptop_1

This commit is contained in:
2026-09-28 19:43:40 +09:00
7 changed files with 33 additions and 5 deletions
+11
View File
@@ -29,6 +29,8 @@
padding: 0 6px;
border: none;
border-right: 1px solid var(--color-border);
background: transparent;
color: inherit;
font: inherit;
outline: none;
}
@@ -50,6 +52,8 @@
padding: 4px 6px;
border: none;
border-left: 1px solid var(--color-border);
background: transparent;
color: inherit;
font: inherit;
line-height: 18px;
white-space: pre;
@@ -117,6 +121,7 @@
border: none;
border-right: 1px solid var(--color-border);
background: none;
color: inherit;
font: inherit;
cursor: pointer;
}
@@ -163,6 +168,8 @@
width: 180px;
padding: 2px 6px;
border: 1px solid var(--color-border);
background: var(--color-surface-raised);
color: var(--color-text-body);
font: inherit;
}
@@ -171,6 +178,7 @@
border: 1px solid var(--color-border);
border-radius: 4px;
background: var(--color-surface);
color: var(--color-text-body);
font: inherit;
cursor: pointer;
}
@@ -196,6 +204,7 @@
padding: 4px 6px;
border: 1px solid var(--color-warning);
background: color-mix(in srgb, var(--color-warning) 15%, var(--color-surface-raised));
color: var(--color-text-body);
font: inherit;
white-space: pre-wrap;
box-shadow: var(--shadow-sm);
@@ -222,6 +231,7 @@
padding: 2px 8px;
border: 1px solid var(--color-border);
background: var(--color-surface);
color: var(--color-text-body);
font: inherit;
cursor: pointer;
}
@@ -298,6 +308,7 @@
padding: 0;
border: 1px solid var(--color-border);
background: var(--color-surface);
color: var(--color-text-body);
font-size: 9px;
cursor: pointer;
}
@@ -183,5 +183,5 @@
}
.ss-errtip__item:hover {
background: var(--color-surface-sunken);
background: var(--color-mist-violet);
}
@@ -168,6 +168,7 @@ export function openTextToColumnsDialog(ctx: SpreadsheetContext): void {
let breaksText = "";
const modeSelect = el("select", {
className: "ss-toolbar__select",
children: [
el("option", { attrs: { value: "구분" }, text: TEXT.byDelimiter }),
el("option", { attrs: { value: "고정" }, text: TEXT.byFixedWidth }),
@@ -394,6 +395,7 @@ export function openFillSeriesDialog(ctx: SpreadsheetContext): void {
let stop: number | null = null;
const dirSelect = el("select", {
className: "ss-toolbar__select",
children: [
el("option", { attrs: { value: "열" }, text: TEXT.down }),
el("option", { attrs: { value: "행" }, text: TEXT.right }),
@@ -22,6 +22,7 @@ import {
type Category,
type NegStyle,
} from "./spreadsheet_format_code";
import { isAutoInk } from "./spreadsheet_cellstyle";
import { formatValue } from "./spreadsheet_numfmt";
import type { BorderLine, BorderSide, CellStyle, HAlign, VAlign } from "./spreadsheet_types";
import type { SpreadsheetContext } from "./spreadsheet_view_types";
@@ -87,7 +88,7 @@ function row(label: string, ...controls: HTMLElement[]): HTMLElement {
function borderCss(side?: BorderSide): string {
if (!side) return "none";
const color = side.색 ?? "#000000";
const color = isAutoInk(side.색) ? "var(--color-text-body)" : (side.색 as string);
const width = side.선 === "medium" ? 2 : side.선 === "thick" || side.선 === "double" ? 3 : 1;
const style = side.선 === "hair" ? "dotted" : side.선 === "double" ? "double" : side.선;
return `${width}px ${style} ${color}`;
@@ -302,7 +303,7 @@ export function openFormatDialog(ctx: SpreadsheetContext): void {
]
.filter(Boolean)
.join(" ");
sample.style.color = colorInput.value;
sample.style.color = isAutoInk(colorInput.value) ? "" : colorInput.value;
}
nameInput.addEventListener("input", () => {
draft.글꼴 = nameInput.value || undefined;
+3 -1
View File
@@ -77,6 +77,8 @@
padding: 4px 6px;
border: 1px solid var(--color-border);
border-radius: var(--radius-sm);
background: var(--color-canvas);
color: var(--color-text-body);
font: inherit;
}
@@ -101,7 +103,7 @@
}
.ss-links__row:hover {
background: var(--color-surface-sunken);
background: var(--color-mist-violet);
}
.ss-links__note {
@@ -55,6 +55,11 @@
color: inherit;
}
.ss-sort__row option {
background: var(--color-canvas);
color: var(--color-text-body);
}
.ss-sort__foot,
.ss-filter__foot {
justify-content: flex-end;
@@ -124,5 +129,5 @@
}
.ss-filter__link:hover {
background: var(--color-surface-sunken);
background: var(--color-mist-violet);
}
@@ -47,6 +47,11 @@
font-size: 0.8rem;
}
.ss-toolbar__select option {
background: var(--color-canvas);
color: var(--color-text-body);
}
.ss-toolbar__input {
height: 28px;
width: 72px;
@@ -221,6 +226,8 @@
width: 96px;
border: 1px solid var(--color-focus-ring);
border-radius: var(--radius-sm);
background: var(--color-canvas);
color: var(--color-text-body);
font: inherit;
}