Skip to content

Commit a69f35a

Browse files
authored
Merge pull request #16 from appleple/fix/support-cms-7417
CMS-7417 の変更に合わせてスタイルをリファクタリング
2 parents 4f2e413 + b292866 commit a69f35a

File tree

21 files changed

+1029
-573
lines changed

21 files changed

+1029
-573
lines changed

bin/develop/develop.yaml

Lines changed: 601 additions & 47 deletions
Large diffs are not rendered by default.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@
3939
"themes/**develop**/**/*.{css,js,jsx,ts,tsx,twig}": [
4040
"npm --prefix themes/develop run format"
4141
],
42-
"themes/**develop**/**/*.{js,jsx,ts,tsx,vue,svelte}": [
42+
"themes/**develop**/src/js/**/*.{js,jsx,ts,tsx,vue,svelte}": [
4343
"npm --prefix themes/develop run eslint"
4444
],
45-
"themes/**develop**/**/*.{css,scss,sass,less,styl,vue,svelte}": [
45+
"themes/**develop**/src/style/**/*.{css,scss,sass,less,styl,vue,svelte}": [
4646
"npm --prefix themes/develop run stylelint"
4747
]
4848
}

themes/develop/include/unit/extend.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<!-- END unit#custom_unit_space -->
44

55
<!-- BEGIN unit#custom_outline -->
6-
<details class="p-4 rounded-md bg-gray-50 [&:not(:has(li))]:hidden [&[open]_span.label-open]:hidden [&:not([open])_span.label-close]:hidden [&_svg]:open:-rotate-180 mt-(--unit-margin-top) mb-(--unit-margin-bottom)" open>
6+
<details class="p-4 rounded-md bg-gray-50 [&:not(:has(li))]:hidden [&[open]_span.label-open]:hidden [&:not([open])_span.label-close]:hidden [&_svg]:open:-rotate-180 mb-[2em]" open>
77
<summary class="flex items-center gap-x-4">
88
<p class="not-prose font-bold">目次</p>
99
<p class="not-prose text-indigo-600 cursor-pointer">

themes/develop/src/style/_theme.css

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,10 @@
55
}
66

77
:root {
8-
--unit-margin-top: 0;
9-
--unit-margin-bottom: 1.5em;
108
--unit-gap-x: 1em;
119

12-
@media (width >= 520px) {
13-
--unit-margin-bottom: 2em;
10+
/* stylelint-disable-next-line media-query-no-invalid */
11+
@media (width >= theme(breakpoint.sm)) {
1412
--unit-gap-x: 2em;
1513
}
1614
}

themes/develop/src/style/editor.css

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
@import 'tailwindcss/theme.css' layer(theme);
77
@import 'tailwindcss/utilities.css' layer(utilities);
88
@import './_theme.css';
9-
@import './editor/index.css';
109

1110
@plugin "@tailwindcss/typography";
11+
12+
@config '../../tailwind.config.js';

themes/develop/src/style/editor/_base.css

Lines changed: 0 additions & 19 deletions
This file was deleted.

themes/develop/src/style/editor/_block-editor-layout.css

Lines changed: 0 additions & 73 deletions
This file was deleted.

themes/develop/src/style/editor/_unit-align.css

Lines changed: 0 additions & 11 deletions
This file was deleted.

themes/develop/src/style/editor/elements/_button.css

Lines changed: 0 additions & 41 deletions
This file was deleted.

themes/develop/src/style/editor/elements/_custom.css

Lines changed: 0 additions & 28 deletions
This file was deleted.

0 commit comments

Comments
 (0)