Skip to content

Commit a71f5bc

Browse files
RintanRintan
committed
Change config structure
1 parent ca3f038 commit a71f5bc

File tree

7 files changed

+13
-12
lines changed

7 files changed

+13
-12
lines changed

‎docs/customization_guide.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
## Color and layout presets
88

99
There are two types of profiles, color presets to set color schemes and layout presets.
10-
You can configure color preset to edit the reference in `@forward '../color/v1-light'` in [`mastodon-material/config/_config_color.scss`](../src/mastodon-material/config/_config_color.scss).
11-
You can configure layout preset to edit the reference in `@forward '../layout/material-v1'` in [`mastodon-material/config/_config_layout.scss`](../src/mastodon-material/config/_config_layout.scss).
10+
You can configure color preset to edit the reference in `@forward '../../color/v1-light'` in [`mastodon-material/config/default/_config_color.scss`](../src/mastodon-material/config/default/_config_color.scss).
11+
You can configure layout preset to edit the reference in `@forward '../../layout/material-v1'` in [`mastodon-material/config/default/_config_layout.scss`](../src/mastodon-material/config/default/_config_layout.scss).
1212

1313
## Basic Settings
1414

15-
Please make reference to a base file, [`mastodon-material/theme/_config_basic.scss`](../src/mastodon-material/theme/_config_basic_.scss), and write your change in [`mastodon-material/config/_config_basic.scss`](../src/mastodon-material/config/_config_basic.scss). **DO NOT** edit the base file.
15+
Please make reference to a base file, [`mastodon-material/theme/_config_basic.scss`](../src/mastodon-material/theme/_config_basic_.scss), and write your change in [`mastodon-material/config/default/_config_basic.scss`](../src/mastodon-material/config/default/_config_basic.scss). **DO NOT** edit the base file.
1616

1717
### Float search bar when cursor hovers
1818

‎docs/customization_guide_ja.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
## 配色とレイアウトのプリセット
88

99
配色を設定するカラープリセットとレイアウトプリセットの2種類があります。
10-
カラープリセットは[`mastodon-material/config/_config_color.scss`](../src/mastodon-material/config/_config_color.scss)の`@forward '../color/v1-light'`で参照するファイルを設定します。
11-
レイアウトプリセットは[`mastodon-material/config/_config_layout.scss`](../src/mastodon-material/config/_config_layout.scss)の`@forward '../layout/material-v1'`で参照するファイルを設定します。
10+
カラープリセットは[`mastodon-material/config/default/_config_color.scss`](../src/mastodon-material/config/default/_config_color.scss)の`@forward '../../color/v1-light'`で参照するファイルを設定します。
11+
レイアウトプリセットは[`mastodon-material/config/default/_config_layout.scss`](../src/mastodon-material/config/default/_config_layout.scss)の`@forward '../../layout/material-v1'`で参照するファイルを設定します。
1212

1313
## 基本設定
1414

15-
[`mastodon-material/config/_config_basic.scss`](../src/mastodon-material/config/_config_basic.scss)に記述します。ベースファイルである[`mastodon-material/theme/_config_basic.scss`](../src/mastodon-material/theme/_config_basic_.scss)を参考にしてください。ただし、ベースファイルは**編集しないでください**。
15+
[`mastodon-material/config/default/_config_basic.scss`](../src/mastodon-material/config/default/_config_basic.scss)に記述します。ベースファイルである[`mastodon-material/theme/_config_basic.scss`](../src/mastodon-material/theme/_config_basic_.scss)を参考にしてください。ただし、ベースファイルは**編集しないでください**。
1616

1717
### 検索バーをホバー時に浮き上がらせる
1818

‎src/mastodon-material/config/_index.scss‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
1-
@forward 'config_basic';
2-
@forward 'config_color';
3-
@forward 'config_layout';
1+
@forward 'default'

src/mastodon-material/config/_config_basic.scss renamed to src/mastodon-material/config/default/_config_basic.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Basic config
22

33
// Uncomment from line 5 to the end and add custom config. Line 6 is an example.
4-
@forward '../theme/config_basic'
4+
@forward '../../theme/config_basic'
55
//with (
66
// $search-bar-hover: false,
77
//)

src/mastodon-material/config/_config_color.scss renamed to src/mastodon-material/config/default/_config_color.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Color profile
22

33
// Uncomment from line 5 to the end and add custom config. Line 6 is an example.
4-
@forward '../color/v1-light'
4+
@forward '../../color/v1-light'
55
//with (
66
// $primary-color: #4285f4,
77
//)

src/mastodon-material/config/_config_layout.scss renamed to src/mastodon-material/config/default/_config_layout.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Layout profile
22

33
// Uncomment from line 5 to the end and add custom config. Line 6 is an example.
4-
@forward '../layout/material-v1'
4+
@forward '../../layout/material-v1'
55
//with (
66
// $nav-bar-radius: 2px,
77
//)

‎src/mastodon-material/config/default/_index.scss‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
@forward 'config_basic';
2+
@forward 'config_color';
3+
@forward 'config_layout';

0 commit comments

Comments
 (0)