Skip to content

refactor(scaffold): rename c-page-* to l-* and add p-* page styles #881

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
yusasa16 wants to merge 6 commits into
base: dev
Choose a base branch
from
Draft

refactor(scaffold): rename c-page-* to l-* and add p-* page styles #881

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
64daa3a
refactor(scaffold): rename c-page-* to l-* and add p-* page styles
yusasa16 Mar 10, 2026
73c96d6
test(create-frontend): update expected files for scaffold layout refa…
yusasa16 Mar 10, 2026
91a4a09
refactor(scaffold): drop c-categories component and p-blog-index__cat…
yusasa16 May 13, 2026
bebaa08
test(create-frontend): drop c-categories from expected files
yusasa16 May 13, 2026
84922cf
Merge remote-tracking branch 'origin/dev' into refactor/scaffold-layo…
yusasa16 May 13, 2026
a285ae5
test(create-frontend): update snapshot for scaffold layout refactor
yusasa16 May 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 24 additions & 12 deletions packages/@d-zero/create-frontend/__snapshots__/index.spec.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ exports[`CLI > interactive basercms4 1`] = `
"✔ ++ <tmpDir>/__assets/_libs/component/c-card-list.css",
"✔ ++ <tmpDir>/__assets/_libs/component/c-card.css",
"✔ ++ <tmpDir>/__assets/_libs/component/c-card.pug",
"✔ ++ <tmpDir>/__assets/_libs/component/c-content-index.css",
"✔ ++ <tmpDir>/__assets/_libs/component/c-content-main.css",
"✔ ++ <tmpDir>/__assets/_libs/component/c-footer.css",
"✔ ++ <tmpDir>/__assets/_libs/component/c-footer.pug",
Expand All @@ -44,12 +43,16 @@ exports[`CLI > interactive basercms4 1`] = `
"✔ ++ <tmpDir>/__assets/_libs/component/c-nav-global.pug",
"✔ ++ <tmpDir>/__assets/_libs/component/c-nav-sitemap.css",
"✔ ++ <tmpDir>/__assets/_libs/component/c-nav-sitemap.pug",
"✔ ++ <tmpDir>/__assets/_libs/component/c-page-home.css",
"✔ ++ <tmpDir>/__assets/_libs/component/c-page-sub.css",
"✔ ++ <tmpDir>/__assets/_libs/component/c-pagination.css",
"✔ ++ <tmpDir>/__assets/_libs/component/c-pagination.pug",
"✔ ++ <tmpDir>/__assets/_libs/component/c-title-page.css",
"✔ ++ <tmpDir>/__assets/_libs/component/c-title-page.pug",
"✔ ++ <tmpDir>/__assets/_libs/component/l-home.css",
"✔ ++ <tmpDir>/__assets/_libs/component/l-sub.css",
"✔ ++ <tmpDir>/__assets/_libs/component/p-blog-index.css",
"✔ ++ <tmpDir>/__assets/_libs/component/p-form.css",
"✔ ++ <tmpDir>/__assets/_libs/component/p-home.css",
"✔ ++ <tmpDir>/__assets/_libs/component/p-sub-default.css",
"✔ ++ <tmpDir>/__assets/_libs/data/.markuplintrc",
"✔ ++ <tmpDir>/__assets/_libs/data/bge-blocks-v2.html",
"✔ ++ <tmpDir>/__assets/_libs/data/bge-blocks.html",
Expand Down Expand Up @@ -134,7 +137,6 @@ exports[`CLI > npx --type basercms4 1`] = `
"✔ ++ <tmpDir>/__assets/_libs/component/c-card-list.css",
"✔ ++ <tmpDir>/__assets/_libs/component/c-card.css",
"✔ ++ <tmpDir>/__assets/_libs/component/c-card.pug",
"✔ ++ <tmpDir>/__assets/_libs/component/c-content-index.css",
"✔ ++ <tmpDir>/__assets/_libs/component/c-content-main.css",
"✔ ++ <tmpDir>/__assets/_libs/component/c-footer.css",
"✔ ++ <tmpDir>/__assets/_libs/component/c-footer.pug",
Expand All @@ -149,12 +151,16 @@ exports[`CLI > npx --type basercms4 1`] = `
"✔ ++ <tmpDir>/__assets/_libs/component/c-nav-global.pug",
"✔ ++ <tmpDir>/__assets/_libs/component/c-nav-sitemap.css",
"✔ ++ <tmpDir>/__assets/_libs/component/c-nav-sitemap.pug",
"✔ ++ <tmpDir>/__assets/_libs/component/c-page-home.css",
"✔ ++ <tmpDir>/__assets/_libs/component/c-page-sub.css",
"✔ ++ <tmpDir>/__assets/_libs/component/c-pagination.css",
"✔ ++ <tmpDir>/__assets/_libs/component/c-pagination.pug",
"✔ ++ <tmpDir>/__assets/_libs/component/c-title-page.css",
"✔ ++ <tmpDir>/__assets/_libs/component/c-title-page.pug",
"✔ ++ <tmpDir>/__assets/_libs/component/l-home.css",
"✔ ++ <tmpDir>/__assets/_libs/component/l-sub.css",
"✔ ++ <tmpDir>/__assets/_libs/component/p-blog-index.css",
"✔ ++ <tmpDir>/__assets/_libs/component/p-form.css",
"✔ ++ <tmpDir>/__assets/_libs/component/p-home.css",
"✔ ++ <tmpDir>/__assets/_libs/component/p-sub-default.css",
"✔ ++ <tmpDir>/__assets/_libs/data/.markuplintrc",
"✔ ++ <tmpDir>/__assets/_libs/data/bge-blocks-v2.html",
"✔ ++ <tmpDir>/__assets/_libs/data/bge-blocks.html",
Expand Down Expand Up @@ -239,7 +245,6 @@ exports[`CLI > npx --type static 1`] = `
"✔ ++ <tmpDir>/__assets/_libs/component/c-card-list.css",
"✔ ++ <tmpDir>/__assets/_libs/component/c-card.css",
"✔ ++ <tmpDir>/__assets/_libs/component/c-card.pug",
"✔ ++ <tmpDir>/__assets/_libs/component/c-content-index.css",
"✔ ++ <tmpDir>/__assets/_libs/component/c-content-main.css",
"✔ ++ <tmpDir>/__assets/_libs/component/c-footer.css",
"✔ ++ <tmpDir>/__assets/_libs/component/c-footer.pug",
Expand All @@ -254,12 +259,16 @@ exports[`CLI > npx --type static 1`] = `
"✔ ++ <tmpDir>/__assets/_libs/component/c-nav-global.pug",
"✔ ++ <tmpDir>/__assets/_libs/component/c-nav-sitemap.css",
"✔ ++ <tmpDir>/__assets/_libs/component/c-nav-sitemap.pug",
"✔ ++ <tmpDir>/__assets/_libs/component/c-page-home.css",
"✔ ++ <tmpDir>/__assets/_libs/component/c-page-sub.css",
"✔ ++ <tmpDir>/__assets/_libs/component/c-pagination.css",
"✔ ++ <tmpDir>/__assets/_libs/component/c-pagination.pug",
"✔ ++ <tmpDir>/__assets/_libs/component/c-title-page.css",
"✔ ++ <tmpDir>/__assets/_libs/component/c-title-page.pug",
"✔ ++ <tmpDir>/__assets/_libs/component/l-home.css",
"✔ ++ <tmpDir>/__assets/_libs/component/l-sub.css",
"✔ ++ <tmpDir>/__assets/_libs/component/p-blog-index.css",
"✔ ++ <tmpDir>/__assets/_libs/component/p-form.css",
"✔ ++ <tmpDir>/__assets/_libs/component/p-home.css",
"✔ ++ <tmpDir>/__assets/_libs/component/p-sub-default.css",
"✔ ++ <tmpDir>/__assets/_libs/data/.markuplintrc",
"✔ ++ <tmpDir>/__assets/_libs/data/bge-blocks-v2.html",
"✔ ++ <tmpDir>/__assets/_libs/data/bge-blocks.html",
Expand Down Expand Up @@ -327,7 +336,6 @@ exports[`CLI > npx 1`] = `
"✔ ++ <tmpDir>/__assets/_libs/component/c-card-list.css",
"✔ ++ <tmpDir>/__assets/_libs/component/c-card.css",
"✔ ++ <tmpDir>/__assets/_libs/component/c-card.pug",
"✔ ++ <tmpDir>/__assets/_libs/component/c-content-index.css",
"✔ ++ <tmpDir>/__assets/_libs/component/c-content-main.css",
"✔ ++ <tmpDir>/__assets/_libs/component/c-footer.css",
"✔ ++ <tmpDir>/__assets/_libs/component/c-footer.pug",
Expand All @@ -342,12 +350,16 @@ exports[`CLI > npx 1`] = `
"✔ ++ <tmpDir>/__assets/_libs/component/c-nav-global.pug",
"✔ ++ <tmpDir>/__assets/_libs/component/c-nav-sitemap.css",
"✔ ++ <tmpDir>/__assets/_libs/component/c-nav-sitemap.pug",
"✔ ++ <tmpDir>/__assets/_libs/component/c-page-home.css",
"✔ ++ <tmpDir>/__assets/_libs/component/c-page-sub.css",
"✔ ++ <tmpDir>/__assets/_libs/component/c-pagination.css",
"✔ ++ <tmpDir>/__assets/_libs/component/c-pagination.pug",
"✔ ++ <tmpDir>/__assets/_libs/component/c-title-page.css",
"✔ ++ <tmpDir>/__assets/_libs/component/c-title-page.pug",
"✔ ++ <tmpDir>/__assets/_libs/component/l-home.css",
"✔ ++ <tmpDir>/__assets/_libs/component/l-sub.css",
"✔ ++ <tmpDir>/__assets/_libs/component/p-blog-index.css",
"✔ ++ <tmpDir>/__assets/_libs/component/p-form.css",
"✔ ++ <tmpDir>/__assets/_libs/component/p-home.css",
"✔ ++ <tmpDir>/__assets/_libs/component/p-sub-default.css",
"✔ ++ <tmpDir>/__assets/_libs/data/.markuplintrc",
"✔ ++ <tmpDir>/__assets/_libs/data/bge-blocks-v2.html",
"✔ ++ <tmpDir>/__assets/_libs/data/bge-blocks.html",
Expand Down
8 changes: 0 additions & 8 deletions packages/@d-zero/scaffold/__assets/_libs/component/c-content-index.css
View file
Open in desktop

This file was deleted.

14 changes: 7 additions & 7 deletions .../__assets/_libs/component/c-page-home.css → ...ffold/__assets/_libs/component/l-home.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
.c-page-home {
.l-home {
inline-size: 100%;
block-size: 100%;
}

.c-page-home__base {
.l-home__base {
display: block grid;
grid-template:
'header' auto
Expand All @@ -16,15 +16,15 @@
block-size: 100%;
}

.c-page-home__header {
.l-home__header {
grid-area: header;
}

.c-page-home__nav-global {
.l-home__nav-global {
grid-area: nav-global;
}

.c-page-home__main {
.l-home__main {
grid-area: main;

> * {
Expand All @@ -34,10 +34,10 @@
}
}

.c-page-home__nav-sitemap {
.l-home__nav-sitemap {
grid-area: nav-sitemap;
}

.c-page-home__footer {
.l-home__footer {
grid-area: footer;
}
24 changes: 12 additions & 12 deletions ...d/__assets/_libs/component/c-page-sub.css → ...affold/__assets/_libs/component/l-sub.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
.c-page-sub {
.l-sub {
inline-size: 100%;
block-size: 100%;
}

.c-page-sub__base {
.l-sub__base {
display: block grid;
grid-template:
'header' auto
Expand All @@ -15,49 +15,49 @@
block-size: 100%;
}

.c-page-sub__header {
.l-sub__header {
grid-area: header;
}

.c-page-sub__nav-global {
.l-sub__nav-global {
grid-area: nav-global;
}

.c-page-sub__main {
.l-sub__main {
grid-area: main;
}

.c-page-sub__nav-sitemap {
.l-sub__nav-sitemap {
grid-area: nav-sitemap;
}

.c-page-sub__footer {
.l-sub__footer {
grid-area: footer;
}

.c-page-sub__content {
.l-sub__content {
padding-inline: 2em;
}

.c-page-sub__title-page {
.l-sub__title-page {
max-inline-size: var(--wide-layout-width);
margin-block-end: 1em;
margin-inline: auto;
}

.c-page-sub__nav-breadcrumb {
.l-sub__nav-breadcrumb {
max-inline-size: var(--wide-layout-width);
margin-block-end: 2em;
margin-inline: auto;
}

.c-page-sub__content-index {
.l-sub__content-index {
max-inline-size: var(--content-width);
padding-block-end: calc(60 / 17 * 1em);
margin-inline: auto;
}

.c-page-sub__content-main {
.l-sub__content-main {
max-inline-size: var(--content-width);
margin-inline: auto;
}
4 changes: 4 additions & 0 deletions packages/@d-zero/scaffold/__assets/_libs/component/p-blog-index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
.p-blog-index {
display: block grid;
gap: 2rem;
}
10 changes: 10 additions & 0 deletions packages/@d-zero/scaffold/__assets/_libs/component/p-form.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
.p-form {
display: block grid;
grid-template:
'main' 1fr
/ 1fr;
}

.p-form__main {
grid-area: main;
}
10 changes: 10 additions & 0 deletions packages/@d-zero/scaffold/__assets/_libs/component/p-home.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
.p-home {
display: block grid;
grid-template:
'main' 1fr
/ 1fr;
}

.p-home__main {
grid-area: main;
}
10 changes: 10 additions & 0 deletions packages/@d-zero/scaffold/__assets/_libs/component/p-sub-default.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
.p-sub-default {
display: block grid;
grid-template:
'main' 1fr
/ 1fr;
}

.p-sub-default__main {
grid-area: main;
}
14 changes: 7 additions & 7 deletions packages/@d-zero/scaffold/__assets/_libs/layouts/home.pug
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@ doctype html
html(lang=lang || "ja")
head
include /mixin/meta.pug
body.c-page-home
.c-page-home__base
.c-page-home__header
body.l-home
.l-home__base
.l-home__header
- const isHome = true;
include /component/c-header.pug
.c-page-home__nav-global
.l-home__nav-global
include /component/c-nav-global.pug
.c-page-home__main
.l-home__main
main !{ content }
.c-page-home__nav-sitemap
.l-home__nav-sitemap
include /component/c-nav-sitemap.pug
.c-page-home__footer
.l-home__footer
include /component/c-footer.pug
24 changes: 12 additions & 12 deletions packages/@d-zero/scaffold/__assets/_libs/layouts/sub.pug
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,24 @@ doctype html
html(lang=lang || "ja")
head
include /mixin/meta.pug
body.c-page-sub
.c-page-sub__base
.c-page-sub__header
body.l-sub
.l-sub__base
.l-sub__header
include /component/c-header.pug
.c-page-sub__nav-global
.l-sub__nav-global
include /component/c-nav-global.pug
.c-page-sub__main
.l-sub__main
main
article.c-page-sub__content
.c-page-sub__title-page
article.l-sub__content
.l-sub__title-page
include /component/c-title-page.pug
.c-page-sub__nav-breadcrumb
.l-sub__nav-breadcrumb
include /component/c-nav-breadcrumb.pug
.c-page-sub__content-body !{ content }
.l-sub__content-body !{ content }
if hasPagination
.c-page-sub__pagination
.l-sub__pagination
include /component/c-pagination.pug
.c-page-sub__nav-sitemap
.l-sub__nav-sitemap
include /component/c-nav-sitemap.pug
.c-page-sub__footer
.l-sub__footer
include /component/c-footer.pug
6 changes: 4 additions & 2 deletions packages/@d-zero/scaffold/__assets/htdocs/__tmpl/000_home.pug
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
h2 トップページ
div トップページ内容
.p-home
.p-home__main
h2 トップページ
div トップページ内容
4 changes: 3 additions & 1 deletion packages/@d-zero/scaffold/__assets/htdocs/__tmpl/100_sub.pug
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
.c-content-main !{ blocks }
.p-sub-default
.p-sub-default__main
.c-content-main !{ blocks }
21 changes: 10 additions & 11 deletions packages/@d-zero/scaffold/__assets/htdocs/__tmpl/200_blog_index.pug
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
.c-content-index
.c-content-index__categories
// ⚠️ CMS要件:
// - ページがカテゴリーインデックスの場合は aria-current="page" を付加する
// - カテゴリーインデックスではなく、カテゴリーに属するページでは aria-current="page" は付加しない
ul
li: a(href="__PATH_TO__"): span ALL
li: a(href="__PATH_TO__" aria-current="page"): span カテゴリー1
li: a(href="__PATH_TO__"): span カテゴリー2
li: a(href="__PATH_TO__"): span カテゴリー3
.c-content-index__body
.p-blog-index
// ⚠️ CMS要件:
// - ページがカテゴリーインデックスの場合は aria-current="page" を付加する
// - カテゴリーインデックスではなく、カテゴリーに属するページでは aria-current="page" は付加しない
ul
li: a(href="__PATH_TO__"): span ALL
li: a(href="__PATH_TO__" aria-current="page"): span カテゴリー1
li: a(href="__PATH_TO__"): span カテゴリー2
li: a(href="__PATH_TO__"): span カテゴリー3
.p-blog-index__body
.c-media-list
each article in data.articles
include /component/c-media.pug
21 changes: 10 additions & 11 deletions packages/@d-zero/scaffold/__assets/htdocs/__tmpl/210_blog_index.pug
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
.c-content-index
.c-content-index__categories
// ⚠️ CMS要件:
// - ページがカテゴリーインデックスの場合は aria-current="page" を付加する
// - カテゴリーインデックスではなく、カテゴリーに属するページでは aria-current="page" は付加しない
ul
li: a(href="__PATH_TO__"): span ALL
li: a(href="__PATH_TO__" aria-current="page"): span カテゴリー1
li: a(href="__PATH_TO__"): span カテゴリー2
li: a(href="__PATH_TO__"): span カテゴリー3
.c-content-index__body
.p-blog-index
// ⚠️ CMS要件:
// - ページがカテゴリーインデックスの場合は aria-current="page" を付加する
// - カテゴリーインデックスではなく、カテゴリーに属するページでは aria-current="page" は付加しない
ul
li: a(href="__PATH_TO__"): span ALL
li: a(href="__PATH_TO__" aria-current="page"): span カテゴリー1
li: a(href="__PATH_TO__"): span カテゴリー2
li: a(href="__PATH_TO__"): span カテゴリー3
.p-blog-index__body
.c-card-list
each article in data.articles
include /component/c-card.pug
Loading