From 70c3773f9814cc117f5aebabe8af4d9c6ade036c Mon Sep 17 00:00:00 2001 From: Yusaku Sato Date: Thu, 14 May 2026 16:30:56 +0900 Subject: [PATCH 1/3] refactor(scaffold): unnest .c-content-main wrapper from burger-editor css --- .../bge-container/bge-container.css | 64 +++++++++---------- .../burger-editor/bge-item/bgi-button.css | 26 ++++---- .../bge-item/bgi-download-file.css | 26 ++++---- .../style/burger-editor/bge-item/bgi-hr.css | 30 ++++----- .../burger-editor/bge-item/bgi-table.css | 20 +++--- .../burger-editor/bge-item/bgi-wysiwyg.css | 20 +++--- .../style/burger-editor/bge-item/bgi.css | 16 ++--- 7 files changed, 94 insertions(+), 108 deletions(-) diff --git a/packages/@d-zero/scaffold/__assets/_libs/style/burger-editor/bge-container/bge-container.css b/packages/@d-zero/scaffold/__assets/_libs/style/burger-editor/bge-container/bge-container.css index e5a5e0ef..2aeadea2 100644 --- a/packages/@d-zero/scaffold/__assets/_libs/style/burger-editor/bge-container/bge-container.css +++ b/packages/@d-zero/scaffold/__assets/_libs/style/burger-editor/bge-container/bge-container.css @@ -1,47 +1,45 @@ -.c-content-main { - @container bge-container (width < 768px) { - [data-bge-container='grid:1'], - [data-bge-container^='grid:1:'] { - [data-bge-container-frame] { - --bge-grid-col: 1; - } +@container bge-container (width < 768px) { + [data-bge-container='grid:1'], + [data-bge-container^='grid:1:'] { + [data-bge-container-frame] { + --bge-grid-col: 1; } + } - [data-bge-container='grid:2'], - [data-bge-container^='grid:2:'] { - [data-bge-container-frame] { - --bge-grid-col: 2; - } + [data-bge-container='grid:2'], + [data-bge-container^='grid:2:'] { + [data-bge-container-frame] { + --bge-grid-col: 2; } + } - [data-bge-container='grid:3'], - [data-bge-container^='grid:3:'] { - [data-bge-container-frame] { - --bge-grid-col: 2; + [data-bge-container='grid:3'], + [data-bge-container^='grid:3:'] { + [data-bge-container-frame] { + --bge-grid-col: 2; - /* 最後の要素を2列分にする */ - > :nth-child(2n + 1):last-child { - grid-column: span 2; - } + /* 最後の要素を2列分にする */ + > :nth-child(2n + 1):last-child { + grid-column: span 2; } } + } - [data-bge-container='grid:4'], - [data-bge-container^='grid:4:'] { - [data-bge-container-frame] { - --bge-grid-col: 2; - } + [data-bge-container='grid:4'], + [data-bge-container^='grid:4:'] { + [data-bge-container-frame] { + --bge-grid-col: 2; } + } - [data-bge-container='grid:5'], - [data-bge-container^='grid:5:'] { - [data-bge-container-frame] { - --bge-grid-col: 2; + [data-bge-container='grid:5'], + [data-bge-container^='grid:5:'] { + [data-bge-container-frame] { + --bge-grid-col: 2; - /* 最後の要素を2列分にする */ - > :nth-child(2n + 1):last-child { - grid-column: span 2; - } + /* 最後の要素を2列分にする */ + > :nth-child(2n + 1):last-child { + grid-column: span 2; } } } diff --git a/packages/@d-zero/scaffold/__assets/_libs/style/burger-editor/bge-item/bgi-button.css b/packages/@d-zero/scaffold/__assets/_libs/style/burger-editor/bge-item/bgi-button.css index 412223eb..e8579307 100644 --- a/packages/@d-zero/scaffold/__assets/_libs/style/burger-editor/bge-item/bgi-button.css +++ b/packages/@d-zero/scaffold/__assets/_libs/style/burger-editor/bge-item/bgi-button.css @@ -1,16 +1,14 @@ -.c-content-main { - [data-bgi='button'] { - a { - display: block flex; - justify-content: center; - min-inline-size: 10em; - max-inline-size: 20em; - padding-block: 0.5em; - padding-inline: 1em; - color: inherit; - text-decoration: none; - border: 1px solid currentcolor; - border-radius: calc(infinity * 1px); - } +[data-bgi='button'] { + a { + display: block flex; + justify-content: center; + min-inline-size: 10em; + max-inline-size: 20em; + padding-block: 0.5em; + padding-inline: 1em; + color: inherit; + text-decoration: none; + border: 1px solid currentcolor; + border-radius: calc(infinity * 1px); } } diff --git a/packages/@d-zero/scaffold/__assets/_libs/style/burger-editor/bge-item/bgi-download-file.css b/packages/@d-zero/scaffold/__assets/_libs/style/burger-editor/bge-item/bgi-download-file.css index 3a300e08..9f6f91f7 100644 --- a/packages/@d-zero/scaffold/__assets/_libs/style/burger-editor/bge-item/bgi-download-file.css +++ b/packages/@d-zero/scaffold/__assets/_libs/style/burger-editor/bge-item/bgi-download-file.css @@ -1,16 +1,14 @@ -.c-content-main { - [data-bgi='download-file'] { - a { - display: block flex; - justify-content: center; - min-inline-size: 10em; - max-inline-size: 20em; - padding-block: 0.5em; - padding-inline: 1em; - color: inherit; - text-decoration: none; - border: 1px solid currentcolor; - border-radius: calc(infinity * 1px); - } +[data-bgi='download-file'] { + a { + display: block flex; + justify-content: center; + min-inline-size: 10em; + max-inline-size: 20em; + padding-block: 0.5em; + padding-inline: 1em; + color: inherit; + text-decoration: none; + border: 1px solid currentcolor; + border-radius: calc(infinity * 1px); } } diff --git a/packages/@d-zero/scaffold/__assets/_libs/style/burger-editor/bge-item/bgi-hr.css b/packages/@d-zero/scaffold/__assets/_libs/style/burger-editor/bge-item/bgi-hr.css index 92f291b7..859e0e09 100644 --- a/packages/@d-zero/scaffold/__assets/_libs/style/burger-editor/bge-item/bgi-hr.css +++ b/packages/@d-zero/scaffold/__assets/_libs/style/burger-editor/bge-item/bgi-hr.css @@ -1,22 +1,20 @@ -.c-content-main { - [data-bgi='hr'] { - --border-color: currentcolor; - --border-width: 3px; +[data-bgi='hr'] { + --border-color: currentcolor; + --border-width: 3px; - [data-bgi-hr-kind='dashed'] { - --border-kind: dashed; - } + [data-bgi-hr-kind='dashed'] { + --border-kind: dashed; + } - [data-bgi-hr-kind='bold'] { - --border-width: 5px; - } + [data-bgi-hr-kind='bold'] { + --border-width: 5px; + } - [data-bgi-hr-kind='narrow'] { - --border-width: 1px; - } + [data-bgi-hr-kind='narrow'] { + --border-width: 1px; + } - [data-bgi-hr-kind='short'] { - --inline-size: 50%; - } + [data-bgi-hr-kind='short'] { + --inline-size: 50%; } } diff --git a/packages/@d-zero/scaffold/__assets/_libs/style/burger-editor/bge-item/bgi-table.css b/packages/@d-zero/scaffold/__assets/_libs/style/burger-editor/bge-item/bgi-table.css index aad53c0a..bdad9a2a 100644 --- a/packages/@d-zero/scaffold/__assets/_libs/style/burger-editor/bge-item/bgi-table.css +++ b/packages/@d-zero/scaffold/__assets/_libs/style/burger-editor/bge-item/bgi-table.css @@ -1,15 +1,13 @@ -.c-content-main { - [data-bgi='table'] { - table { - inline-size: 100%; - border-spacing: 0; - border-collapse: collapse; +[data-bgi='table'] { + table { + inline-size: 100%; + border-spacing: 0; + border-collapse: collapse; - th, - td { - padding: 1.5em; - border: 1px solid currentcolor; - } + th, + td { + padding: 1.5em; + border: 1px solid currentcolor; } } } diff --git a/packages/@d-zero/scaffold/__assets/_libs/style/burger-editor/bge-item/bgi-wysiwyg.css b/packages/@d-zero/scaffold/__assets/_libs/style/burger-editor/bge-item/bgi-wysiwyg.css index 7dd98cec..6f3ef472 100644 --- a/packages/@d-zero/scaffold/__assets/_libs/style/burger-editor/bge-item/bgi-wysiwyg.css +++ b/packages/@d-zero/scaffold/__assets/_libs/style/burger-editor/bge-item/bgi-wysiwyg.css @@ -1,15 +1,13 @@ -.c-content-main { - [data-bgi='wysiwyg'] { - table { - inline-size: 100%; - border-spacing: 0; - border-collapse: collapse; +[data-bgi='wysiwyg'] { + table { + inline-size: 100%; + border-spacing: 0; + border-collapse: collapse; - th, - td { - padding: 1.5em; - border: 1px solid currentcolor; - } + th, + td { + padding: 1.5em; + border: 1px solid currentcolor; } } } diff --git a/packages/@d-zero/scaffold/__assets/_libs/style/burger-editor/bge-item/bgi.css b/packages/@d-zero/scaffold/__assets/_libs/style/burger-editor/bge-item/bgi.css index ab283cc3..2e6b6258 100644 --- a/packages/@d-zero/scaffold/__assets/_libs/style/burger-editor/bge-item/bgi.css +++ b/packages/@d-zero/scaffold/__assets/_libs/style/burger-editor/bge-item/bgi.css @@ -1,13 +1,11 @@ -.c-content-main { - [data-bgi] { - :where(&, & > div) { - :where(& > :first-child) { - margin-block-start: 0; - } +[data-bgi] { + :where(&, & > div) { + :where(& > :first-child) { + margin-block-start: 0; + } - :where(& > :last-child) { - margin-block-end: 0; - } + :where(& > :last-child) { + margin-block-end: 0; } } } From b423b183fd9485df69d3bbd9d22c5ae21f1eb17b Mon Sep 17 00:00:00 2001 From: Yusaku Sato Date: Thu, 14 May 2026 17:16:09 +0900 Subject: [PATCH 2/3] refactor(scaffold): move c-content-main element styles into bgi-wysiwyg --- .../burger-editor/bge-item/bgi-wysiwyg.css | 42 +++++++++++++- .../_libs/style/c-content-main/element.css | 56 ------------------- .../_libs/style/c-content-main/index.css | 1 - 3 files changed, 39 insertions(+), 60 deletions(-) delete mode 100644 packages/@d-zero/scaffold/__assets/_libs/style/c-content-main/element.css diff --git a/packages/@d-zero/scaffold/__assets/_libs/style/burger-editor/bge-item/bgi-wysiwyg.css b/packages/@d-zero/scaffold/__assets/_libs/style/burger-editor/bge-item/bgi-wysiwyg.css index 6f3ef472..11fd1fa2 100644 --- a/packages/@d-zero/scaffold/__assets/_libs/style/burger-editor/bge-item/bgi-wysiwyg.css +++ b/packages/@d-zero/scaffold/__assets/_libs/style/burger-editor/bge-item/bgi-wysiwyg.css @@ -1,11 +1,47 @@ [data-bgi='wysiwyg'] { - table { + :where(h2, h3, h4, h5, h6, p) { + margin-block-end: 1rem; + } + + :where(ul, ol, table, blockquote) { + margin-block-end: 2rem; + } + + :where(h2) { + font-size: var(--font-size-h2); + } + + :where(h3) { + font-size: var(--font-size-h3); + } + + :where(h4) { + font-size: var(--font-size-h4); + } + + :where(h5) { + font-size: var(--font-size-h5); + } + + :where(h6) { + font-size: var(--font-size-h6); + } + + :where(ul, ol) { + list-style-position: inside; + } + + :where(blockquote) { + padding-inline: 1rem; + border-inline-start: 3px solid var(--border-color); + } + + :where(table) { inline-size: 100%; border-spacing: 0; border-collapse: collapse; - th, - td { + :where(th, td) { padding: 1.5em; border: 1px solid currentcolor; } diff --git a/packages/@d-zero/scaffold/__assets/_libs/style/c-content-main/element.css b/packages/@d-zero/scaffold/__assets/_libs/style/c-content-main/element.css deleted file mode 100644 index 43ea7cab..00000000 --- a/packages/@d-zero/scaffold/__assets/_libs/style/c-content-main/element.css +++ /dev/null @@ -1,56 +0,0 @@ -/* 🃏 このファイルのStylelintルールはoverridesによって特別に変更されています */ - -/* メインコンテンツ（content-mainコンポーネント）の内容はCMSなどで管理されるHTMLを含んだり、 - * ページ独自のスタイルを扱うことが多いので例外的に専用のルールを設ける。 - * - * メインコンテンツのエレメントは基本的に自由である。 - * ただし、クラス名は`c-`で開始してはいけない。もちろん 【`c-` + `コンポーネント名` + `__` + `エレメント名`】 という規則でクラス名をつけない。 - * さらにそのルールに従って、メインコンテンツの中にコンポーネントを内包してはいけない。 */ -.c-content-main { - :where(h2, h3, h4, h5, h6, p) { - margin-block-end: 1rem; - } - - :where(ul, ol, table, blockquote) { - margin-block-end: 2rem; - } - - :where(h2) { - font-size: var(--font-size-h2); - } - - :where(h3) { - font-size: var(--font-size-h3); - } - - :where(h4) { - font-size: var(--font-size-h4); - } - - :where(h5) { - font-size: var(--font-size-h5); - } - - :where(h6) { - font-size: var(--font-size-h6); - } - - :where(ul, ol) { - list-style-position: inside; - } - - :where(blockquote) { - padding-inline: 1rem; - border-inline-start: 3px solid var(--border-color); - } - - :where(table) { - inline-size: 100%; - border-collapse: collapse; - } - - :where(th, td) { - padding: 1rem; - border: 1px solid var(--border-color); - } -} diff --git a/packages/@d-zero/scaffold/__assets/_libs/style/c-content-main/index.css b/packages/@d-zero/scaffold/__assets/_libs/style/c-content-main/index.css index c30da9ec..ac18e132 100644 --- a/packages/@d-zero/scaffold/__assets/_libs/style/c-content-main/index.css +++ b/packages/@d-zero/scaffold/__assets/_libs/style/c-content-main/index.css @@ -1,2 +1 @@ -@import './element.css'; @import './cc-form.css'; From 99956869032f76ad10750b15808f227ffd92bb6e Mon Sep 17 00:00:00 2001 From: Yusaku Sato Date: Thu, 14 May 2026 17:19:35 +0900 Subject: [PATCH 3/3] test(create-frontend): drop element.css from expected scaffold files --- packages/@d-zero/create-frontend/index.spec.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/packages/@d-zero/create-frontend/index.spec.js b/packages/@d-zero/create-frontend/index.spec.js index f8381da6..ab40708f 100644 --- a/packages/@d-zero/create-frontend/index.spec.js +++ b/packages/@d-zero/create-frontend/index.spec.js @@ -90,7 +90,6 @@ function expectedBasercms4(dir) { `✔ ++ ${dir}/__assets/_libs/style/burger-editor/bge-item/bgi.css`, `✔ ++ ${dir}/__assets/_libs/style/burger-editor/index.css`, `✔ ++ ${dir}/__assets/_libs/style/c-content-main/cc-form.css`, - `✔ ++ ${dir}/__assets/_libs/style/c-content-main/element.css`, `✔ ++ ${dir}/__assets/_libs/style/c-content-main/index.css`, `✔ ++ ${dir}/__assets/_libs/style/general/all.css`, `✔ ++ ${dir}/__assets/_libs/style/general/body.css`, @@ -272,7 +271,6 @@ describe('CLI', () => { `✔ ++ ${dir}/__assets/_libs/style/burger-editor/bge-item/bgi.css`, `✔ ++ ${dir}/__assets/_libs/style/burger-editor/index.css`, `✔ ++ ${dir}/__assets/_libs/style/c-content-main/cc-form.css`, - `✔ ++ ${dir}/__assets/_libs/style/c-content-main/element.css`, `✔ ++ ${dir}/__assets/_libs/style/c-content-main/index.css`, `✔ ++ ${dir}/__assets/_libs/style/general/all.css`, `✔ ++ ${dir}/__assets/_libs/style/general/body.css`, @@ -378,7 +376,6 @@ describe('CLI', () => { `✔ ++ ${dir}/__assets/_libs/style/burger-editor/bge-item/bgi.css`, `✔ ++ ${dir}/__assets/_libs/style/burger-editor/index.css`, `✔ ++ ${dir}/__assets/_libs/style/c-content-main/cc-form.css`, - `✔ ++ ${dir}/__assets/_libs/style/c-content-main/element.css`, `✔ ++ ${dir}/__assets/_libs/style/c-content-main/index.css`, `✔ ++ ${dir}/__assets/_libs/style/general/all.css`, `✔ ++ ${dir}/__assets/_libs/style/general/body.css`,