Skip to content

Commit 9ca17a1

Browse files
authored
Merge pull request #28 from appleple/develop
v1.0.7
2 parents 36aba6a + da09d4b commit 9ca17a1

8 files changed

Lines changed: 134 additions & 82 deletions

File tree

themes/develop/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# テーマ「develop」Ver.1.0.6
1+
# テーマ「develop」Ver.1.0.7
22

33
## バンドル環境の使い方
44

themes/develop/include/body-end.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{% set blogField = module('V2_Blog_Field', null, { bid: RBID }) %}
22

3-
{{ blogField.fields.script_body_end|raw }}
3+
{{ blogField.fields.script_body_end.value|raw }}
44

55
<!-- iOS Chromeの対応 -->
66
<script>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{% set blogField = module('V2_Blog_Field', null, { bid: RBID }) %}
22

3-
{{ blogField.fields.script_body_start|raw }}
3+
{{ blogField.fields.script_body_start.value|raw }}

themes/develop/include/entry/body.twig

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,3 @@
118118
</div>
119119
</div>
120120
{% endif %}
121-
122-
<!-- 編集画面 -->
123-
{{ include('/admin/entry/edit.twig', { body: entryBody }) }}

themes/develop/include/head/meta.twig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@
3939
{% if ogp.image %}
4040
<meta name="twitter:image" content="{{ ogp.image }}" />
4141
{% endif %}
42-
{% if blogField.fields.twitter_creator %}
42+
{% if blogField.fields.twitter_creator.value %}
4343
<meta name="twitter:creator" content="@{{ blogField.fields.twitter_creator.value }}" />
4444
{% endif %}
4545

46-
{% if blogField.fields.google_site_verification %}
46+
{% if blogField.fields.google_site_verification.value %}
4747
<meta name="google-site-verification" content="{{ blogField.fields.google_site_verification.value }}" />
4848
{% endif %}

themes/develop/include/head/robots.twig

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
{% set categoryField = module('V2_Category_Field', null, { cid: CID }) %}
33
{% set entryField = module('V2_Entry_Field', null, { eid: EID }) %}
44

5-
{% set isNoindexBlog = blogField.fields and blogField.fields.blog_meta_robots == 'noindex' %}
6-
{% set isNoindexCategory = categoryField.fields and categoryField.fields.category_meta_robots == 'noindex' %}
7-
{% set isNoindexEntry = entryField.fields and entryField.fields.entry_meta_robots == 'noindex' %}
5+
{% set isNoindexBlog = blogField.fields and blogField.fields.blog_meta_robots.value == 'noindex' %}
6+
{% set isNoindexCategory = categoryField.fields and categoryField.fields.category_meta_robots.value == 'noindex' %}
7+
{% set isNoindexEntry = entryField.fields and entryField.fields.entry_meta_robots.value == 'noindex' %}
88
{% set isTagPage = TAG is not empty %}
99
{% set isKeywordPage = KEYWORD is not empty %}
1010
{% set isDatePage = DATE is not empty %}

themes/develop/package-lock.json

Lines changed: 120 additions & 69 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

themes/develop/package.json

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
{
22
"name": "develop",
3-
"version": "1.0.6",
3+
"version": "1.0.7",
44
"description": "Webサイト制作プロジェクト",
55
"type": "module",
66
"main": "index.js",
7+
"browserslist": [
8+
"baseline widely available"
9+
],
710
"scripts": {
811
"test": "echo \"Error: no test specified\" && exit 1",
912
"dev": "vite",
@@ -22,6 +25,7 @@
2225
"@tailwindcss/typography": "^0.5.19",
2326
"@tailwindcss/vite": "^4.1.18",
2427
"@zackad/prettier-plugin-twig": "^0.16.2",
28+
"browserslist": "^4.28.1",
2529
"eslint": "^9.39.2",
2630
"globals": "^17.0.0",
2731
"prettier": "^3.7.4",
@@ -31,7 +35,7 @@
3135
"stylelint-config-standard": "^39.0.1",
3236
"stylelint-order": "^7.0.1",
3337
"tailwindcss": "^4.1.18",
34-
"vite": "^7.3.2",
38+
"vite": "^7.3.0",
3539
"vite-plugin-eslint2": "^5.0.4",
3640
"vite-plugin-static-copy": "^3.1.4",
3741
"vite-plugin-stylelint": "^6.0.2"

0 commit comments

Comments
 (0)