From bf048c2149df58514bb77308548b3913d571adae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tetsuaki=20Hamano=20/=20=E6=B5=9C=E9=87=8E=20=E5=93=B2?= =?UTF-8?q?=E6=98=8E?= Date: Sat, 7 Jan 2023 08:51:47 +0000 Subject: [PATCH 1/8] =?UTF-8?q?theme.json=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- theme.json | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 theme.json diff --git a/theme.json b/theme.json new file mode 100644 index 0000000..0da29ef --- /dev/null +++ b/theme.json @@ -0,0 +1,4 @@ +{ + "$schema": "https://schemas.wp.org/trunk/theme.json", + "version": 2 +} From 68c372072cfbbad404eab3d29b674db5e024b4a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tetsuaki=20Hamano=20/=20=E6=B5=9C=E9=87=8E=20=E5=93=B2?= =?UTF-8?q?=E6=98=8E?= Date: Sat, 7 Jan 2023 08:58:22 +0000 Subject: [PATCH 2/8] =?UTF-8?q?line-height=E3=81=A8spacing=E3=81=AE?= =?UTF-8?q?=E3=82=B5=E3=83=9D=E3=83=BC=E3=83=88=E3=82=92theme.json?= =?UTF-8?q?=E3=81=AB=E7=A7=BB=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- inc/theme_support.php | 3 --- theme.json | 10 +++++++++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/inc/theme_support.php b/inc/theme_support.php index 6b0c771..93ee882 100644 --- a/inc/theme_support.php +++ b/inc/theme_support.php @@ -33,9 +33,6 @@ function setup_theme() { add_theme_support( 'automatic-feed-links' ); // Gutenberg用 add_theme_support( 'align-wide' ); // 画像の全幅表示などを可能に - add_theme_support( 'custom-line-height' ); - add_theme_support( 'custom-units', 'px', 'rem', 'em', '%', 'vw', 'vh' ); - add_theme_support( 'custom-spacing' ); remove_theme_support( 'core-block-patterns' ); // html5サポート diff --git a/theme.json b/theme.json index 0da29ef..78674cb 100644 --- a/theme.json +++ b/theme.json @@ -1,4 +1,12 @@ { "$schema": "https://schemas.wp.org/trunk/theme.json", - "version": 2 + "version": 2, + "settings": { + "typography": { + "lineHeight": true + }, + "spacing": { + "padding": true + } + } } From 3ddf0fddfd428c5df705ce0adf367a497dddfd37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tetsuaki=20Hamano=20/=20=E6=B5=9C=E9=87=8E=20=E5=93=B2?= =?UTF-8?q?=E6=98=8E?= Date: Sat, 7 Jan 2023 09:51:04 +0000 Subject: [PATCH 3/8] =?UTF-8?q?=E3=82=B3=E3=83=B3=E3=83=86=E3=83=B3?= =?UTF-8?q?=E3=83=84=E5=B9=85=E3=81=B8=E3=81=AE=E4=BB=AE=E5=AF=BE=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/scss/object/utility/_alignwide.scss | 2 +- theme.json | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/scss/object/utility/_alignwide.scss b/src/scss/object/utility/_alignwide.scss index 488e9e7..cea893f 100644 --- a/src/scss/object/utility/_alignwide.scss +++ b/src/scss/object/utility/_alignwide.scss @@ -3,7 +3,7 @@ .alignwide { position: relative; left: calc(var(--ark-alignwide_ex_width) * -1); - width: calc(100% + var(--ark-alignwide_ex_width) * 2); + width: var(--wp--style--global--wide-size); max-width: unset !important; // embedなどのmax100%のものを上書き // div中の全幅は、内部に収まるように。（ネスト内でも広げたいケースはそれぞれにrevertで0を打ち消す） diff --git a/theme.json b/theme.json index 78674cb..53eb294 100644 --- a/theme.json +++ b/theme.json @@ -2,6 +2,10 @@ "$schema": "https://schemas.wp.org/trunk/theme.json", "version": 2, "settings": { + "layout": { + "contentSize": "var(--ark-block_width)", + "wideSize": "calc(100% + var(--ark-alignwide_ex_width)*2)" + }, "typography": { "lineHeight": true }, From 9296dda8b2de2c889fd8f670f0ef9f55207fc563 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tetsuaki=20Hamano=20/=20=E6=B5=9C=E9=87=8E=20=E5=93=B2?= =?UTF-8?q?=E6=98=8E?= Date: Sat, 7 Jan 2023 10:05:45 +0000 Subject: [PATCH 4/8] =?UTF-8?q?=E3=82=AB=E3=83=A9=E3=83=BC=E3=83=91?= =?UTF-8?q?=E3=83=AC=E3=83=83=E3=83=88=E7=94=A8CSS=E3=82=AF=E3=83=A9?= =?UTF-8?q?=E3=82=B9=E3=82=92=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../post_content/common/utility/_colors.scss | 48 ------------------- 1 file changed, 48 deletions(-) delete mode 100644 src/scss/post_content/common/utility/_colors.scss diff --git a/src/scss/post_content/common/utility/_colors.scss b/src/scss/post_content/common/utility/_colors.scss deleted file mode 100644 index 77d287c..0000000 --- a/src/scss/post_content/common/utility/_colors.scss +++ /dev/null @@ -1,48 +0,0 @@ - - -/* - テキストカラー - */ -.has-ark-main-color { - color: var(--ark-color--main) !important; -} - -.has-ark-text-color { - color: var(--ark-color--text) !important; -} - -.has-ark-link-color { - color: var(--ark-color--link) !important; -} - -.has-ark-bg-color { - color: var(--ark-color--bg) !important; -} - -.has-ark-gray-color { - color: var(--ark-color--gray) !important; -} - - -/* - 背景カラー - */ -.has-ark-main-background-color { - background-color: var(--ark-color--main) !important; -} - -.has-ark-text-background-color { - background-color: var(--ark-color--text) !important; -} - -.has-ark-link-background-color { - background-color: var(--ark-color--link) !important; -} - -.has-ark-bg-background-color { - background-color: var(--ark-color--bg) !important; -} - -.has-ark-gray-background-color { - background-color: var(--ark-color--gray) !important; -} From 6fbf16380990d382ea110d5d3d1e5118a08e521e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tetsuaki=20Hamano=20/=20=E6=B5=9C=E9=87=8E=20=E5=93=B2?= =?UTF-8?q?=E6=98=8E?= Date: Sat, 7 Jan 2023 10:10:42 +0000 Subject: [PATCH 5/8] =?UTF-8?q?=E3=83=95=E3=82=A9=E3=83=B3=E3=83=88?= =?UTF-8?q?=E3=82=B5=E3=82=A4=E3=82=BA=E7=94=A8CSS=E3=81=AE=E5=89=8A?= =?UTF-8?q?=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/scss/object/utility/_font-size.scss | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/src/scss/object/utility/_font-size.scss b/src/scss/object/utility/_font-size.scss index 463891f..75fa616 100644 --- a/src/scss/object/utility/_font-size.scss +++ b/src/scss/object/utility/_font-size.scss @@ -1,17 +1,14 @@ -.u-fz-xs, -.has-xsmall-font-size { +.u-fz-xs { font-size: var(--ark-fz--xs, .75em) !important; } -.u-fz-s, -.has-small-font-size { +.u-fz-s { font-size: var(--ark-fz--s, .9em) !important; } -.u-fz-n, -.has-normal-font-size { +.u-fz-n { font-size: var(--ark-fz--n, 1rem) !important; } @@ -19,21 +16,14 @@ font-size: var(--ark-fz--m, 1.1em) !important; } -.u-fz-l, -.has-large-font-size { +.u-fz-l { font-size: var(--ark-fz--l, 1.25em) !important; } -.u-fz-xl, -.has-xlarge-font-size { +.u-fz-xl { font-size: var(--ark-fz--xl, 1.5em) !important; } -.u-fz-xxl, -.has-xxlarge-font-size { +.u-fz-xxl { font-size: var(--ark-fz--xxl, 2em) !important; } - -.has-huge-font-size { - font-size: var(--ark-fz--huge, 2.75em) !important; -} From 95b48518b572cbcacaf59e15d8ca780a80e4f5d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tetsuaki=20Hamano=20/=20=E6=B5=9C=E9=87=8E=20=E5=93=B2?= =?UTF-8?q?=E6=98=8E?= Date: Sat, 7 Jan 2023 10:32:12 +0000 Subject: [PATCH 6/8] =?UTF-8?q?=E3=82=A8=E3=83=87=E3=82=A3=E3=82=BF?= =?UTF-8?q?=E3=83=BC=E5=81=B4=E3=81=AE=E3=82=B3=E3=83=B3=E3=83=86=E3=83=B3?= =?UTF-8?q?=E3=83=84=E3=81=AB=E5=B7=A6=E5=8F=B3padding=E3=82=92=E8=BF=BD?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/scss/post_content/_editor.scss | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/scss/post_content/_editor.scss b/src/scss/post_content/_editor.scss index 9f09bd7..4ed1333 100644 --- a/src/scss/post_content/_editor.scss +++ b/src/scss/post_content/_editor.scss @@ -3,6 +3,11 @@ .mce-content-body, .editor-styles-wrapper { + // theme.json を入れた事で消えるpaddingを追加 + &.editor-styles-wrapper { + padding: 8px; + } + @import "./post_content"; // エディターではどちらも表示させる（編集できるように） From b4ff264231b4f98d2506a36c5aec9b88519085b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tetsuaki=20Hamano=20/=20=E6=B5=9C=E9=87=8E=20=E5=93=B2?= =?UTF-8?q?=E6=98=8E?= Date: Sat, 7 Jan 2023 10:51:40 +0000 Subject: [PATCH 7/8] =?UTF-8?q?=E3=82=B9=E3=83=9A=E3=83=BC=E3=82=B7?= =?UTF-8?q?=E3=83=B3=E3=82=B0=E3=81=AE=E4=BB=AE=E5=AE=9A=E7=BE=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- theme.json | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/theme.json b/theme.json index 53eb294..6478006 100644 --- a/theme.json +++ b/theme.json @@ -10,7 +10,24 @@ "lineHeight": true }, "spacing": { - "padding": true + "padding": true, + "spacingSizes": [ + { + "name": "Small", + "slug": "s", + "size": "var(--ark-mt--s)" + }, + { + "name": "Normal", + "slug": "normal", + "size": "var(--ark-mt)" + }, + { + "name": "Normal", + "slug": "h", + "size": "var(--ark-h-mt--h)" + } + ] } } } From 0497c6daf8f08384a4a2331f81504106bf93b98b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tetsuaki=20Hamano=20/=20=E6=B5=9C=E9=87=8E=20=E5=93=B2?= =?UTF-8?q?=E6=98=8E?= Date: Sun, 8 Jan 2023 07:17:03 +0000 Subject: [PATCH 8/8] =?UTF-8?q?=E3=83=86=E3=83=BC=E3=83=9E=E3=82=B5?= =?UTF-8?q?=E3=83=9D=E3=83=BC=E3=83=88=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- theme.json | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/theme.json b/theme.json index 6478006..2680e5d 100644 --- a/theme.json +++ b/theme.json @@ -11,6 +11,7 @@ }, "spacing": { "padding": true, + "margin": true, "spacingSizes": [ { "name": "Small", @@ -28,6 +29,12 @@ "size": "var(--ark-h-mt--h)" } ] + }, + "border": { + "color": true, + "radius": true, + "style": true, + "width": true } } }