Skip to content

Commit 4915fe7

Browse files
authored
Merge pull request #214 from craftcms/5.7
5.7 Upgrade
2 parents 537c6fc + 7e6fceb commit 4915fe7

File tree

36 files changed

+848
-790
lines changed

36 files changed

+848
-790
lines changed

README.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,13 @@ This blog starter project is for developers who are new to Craft CMS and want to
77

88
### Topics, features, and implementations:
99

10-
- Using a [Matrix field](https://craftcms.com/docs/4.x/matrix-fields.html) as a page-builder;
11-
- [Templating fundamentals](https://craftcms.com/docs/4.x/dev/twig-primer.html#dry-templating), including: inheritance with layouts, dynamic includes, and macros;
12-
- [Pagination](https://craftcms.com/docs/4.x/element-queries.html#pagination) of entries;
10+
- Using a [Matrix field](https://craftcms.com/docs/5.x/reference/field-types/matrix.html) as a page-builder;
11+
- [Templating fundamentals](https://craftcms.com/docs/5.x/development/twig.html), including: inheritance with layouts, dynamic includes, and macros;
12+
- [Pagination](https://craftcms.com/docs/5.x/development/element-queries.html#pagination) of entries;
1313
- Responsive images
1414
- Local asset volumes
15-
- [Error pages](https://craftcms.com/docs/4.x/routing.html#error-templates)
15+
- [Error pages](https://craftcms.com/docs/5.x/system/routing.html#error-templates)
1616
- Installation and configuration of [plugins](https://plugins.craftcms.com)
17-
- Front-end development with Webpack and Tailwind CSS
1817

1918
### It’s free to use
2019

composer.lock

Lines changed: 377 additions & 204 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
cardView:
2+
- 'layoutElement:27e9a617-6e20-462f-99ac-4de53965a52d'
3+
tabs:
4+
-
5+
elementCondition: null
6+
elements:
7+
-
8+
autocapitalize: true
9+
autocomplete: false
10+
autocorrect: true
11+
class: null
12+
dateAdded: '2025-04-17T23:08:08+00:00'
13+
disabled: false
14+
elementCondition: null
15+
id: null
16+
includeInCards: false
17+
inputType: null
18+
instructions: null
19+
label: null
20+
max: null
21+
min: null
22+
name: null
23+
orientation: null
24+
placeholder: null
25+
providesThumbs: false
26+
readonly: false
27+
requirable: false
28+
size: null
29+
step: null
30+
tip: null
31+
title: null
32+
type: craft\fieldlayoutelements\addresses\LabelField
33+
uid: ef340bfe-b38a-4746-ad1e-ca3788bd664a
34+
userCondition: null
35+
warning: null
36+
width: 100
37+
-
38+
attribute: countryCode
39+
dateAdded: '2025-04-17T23:08:08+00:00'
40+
elementCondition: null
41+
id: null
42+
includeInCards: false
43+
instructions: null
44+
label: null
45+
orientation: null
46+
providesThumbs: false
47+
requirable: false
48+
tip: null
49+
type: craft\fieldlayoutelements\addresses\CountryCodeField
50+
uid: ab34caa6-11fa-4940-8391-b0cf953f158c
51+
userCondition: null
52+
warning: null
53+
width: 100
54+
-
55+
dateAdded: '2025-04-17T23:08:08+00:00'
56+
elementCondition: null
57+
includeInCards: true
58+
instructions: null
59+
label: null
60+
providesThumbs: false
61+
required: false
62+
tip: null
63+
type: craft\fieldlayoutelements\addresses\AddressField
64+
uid: 27e9a617-6e20-462f-99ac-4de53965a52d
65+
userCondition: null
66+
warning: null
67+
name: Content
68+
uid: 56f1c593-6545-400b-92ac-473c65acf4fe
69+
userCondition: null

config/project/ckeditor/configs/69e08c2b-0771-4f37-b3ab-b01ae9535ee0.yaml

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

config/project/ckeditor/configs/7e2c012d-f507-4762-86e3-9b0ddc400c1f.yaml

Lines changed: 0 additions & 14 deletions
This file was deleted.
Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,6 @@
1-
headingLevels:
2-
- 1
3-
- 2
4-
- 3
5-
- 4
6-
- 5
7-
- 6
1+
headingLevels: false
82
name: Simple
93
toolbar:
10-
- heading
11-
- '|'
124
- bold
135
- italic
146
- link
Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,38 @@
1+
color: null
12
fieldLayouts:
23
0476a59c-d8e9-40fd-bce3-4ba321daf851:
34
tabs:
45
-
6+
elementCondition: null
57
elements:
68
-
7-
instructions: null
8-
label: ''
9-
type: craft\fieldlayoutelements\entries\EntryTitleField
10-
-
9+
dateAdded: '2025-04-17T23:19:48+00:00'
10+
editCondition: null
11+
elementCondition: null
1112
fieldUid: e567b6ab-3855-452b-a337-4c119dac4d62 # Body Content
13+
handle: null
14+
includeInCards: false
15+
instructions: null
16+
label: null
17+
providesThumbs: false
1218
required: false
19+
tip: null
1320
type: craft\fieldlayoutelements\CustomField
21+
uid: fb640987-0f32-4c39-9023-a7d5320d14cc
22+
userCondition: null
23+
warning: null
24+
width: 100
1425
name: Content
15-
sortOrder: 1
26+
uid: c7603c3e-74e2-49a9-a614-9f56148bb38f
27+
userCondition: null
1628
handle: about
1729
hasTitleField: false
30+
icon: circle-info
1831
name: About
19-
sortOrder: 1
32+
showSlugField: true
33+
showStatusField: true
34+
slugTranslationKeyFormat: null
35+
slugTranslationMethod: site
2036
titleFormat: '{section.name|raw}'
37+
titleTranslationKeyFormat: null
38+
titleTranslationMethod: ''
Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,38 @@
1+
color: yellow
12
fieldLayouts:
23
434b8bff-3f8f-4c04-b4e1-43001b019d73:
34
tabs:
45
-
6+
elementCondition: null
57
elements:
68
-
7-
instructions: null
8-
label: ''
9-
type: craft\fieldlayoutelements\entries\EntryTitleField
10-
-
9+
dateAdded: '2025-04-17T23:19:48+00:00'
10+
editCondition: null
11+
elementCondition: null
1112
fieldUid: 031e8547-9981-4367-ad27-178240517ea1 # Site Introduction
13+
handle: null
14+
includeInCards: false
15+
instructions: null
16+
label: null
17+
providesThumbs: false
1218
required: false
19+
tip: null
1320
type: craft\fieldlayoutelements\CustomField
21+
uid: 948a51a1-1f7c-421e-88ee-f926501285dd
22+
userCondition: null
23+
warning: null
24+
width: 100
1425
name: Content
15-
sortOrder: 1
26+
uid: 8adc11cc-0bd2-42d6-a149-cc361bf0430e
27+
userCondition: null
1628
handle: home
1729
hasTitleField: false
30+
icon: house
1831
name: Home
19-
sortOrder: 1
32+
showSlugField: true
33+
showStatusField: true
34+
slugTranslationKeyFormat: null
35+
slugTranslationMethod: site
2036
titleFormat: '{section.name|raw}'
37+
titleTranslationKeyFormat: null
38+
titleTranslationMethod: ''

config/project/entryTypes/image--28d5c036-8cb0-4a14-b553-0167ee34efbe.yaml

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,21 @@
1-
color: null
1+
color: cyan
22
fieldLayouts:
33
d0baa120-b528-4317-a11e-0a36f80501c3:
4+
cardView:
5+
- 'layoutElement:530b405b-3e1e-4c46-a0c2-e6f0348272d0'
46
tabs:
57
-
68
elementCondition: null
79
elements:
810
-
11+
dateAdded: '2025-04-17T23:19:48+00:00'
12+
editCondition: null
913
elementCondition: null
1014
fieldUid: 6b203fd7-eca1-4313-8795-efbb5f6a8e63 # Image
1115
handle: null
1216
includeInCards: false
1317
instructions: null
14-
label: Image
18+
label: null
1519
providesThumbs: true
1620
required: false
1721
tip: null
@@ -21,12 +25,14 @@ fieldLayouts:
2125
warning: null
2226
width: 100
2327
-
28+
dateAdded: '2025-04-17T23:19:48+00:00'
29+
editCondition: null
2430
elementCondition: null
25-
fieldUid: 5d2372e2-c220-4af4-80c9-49bb8c85a92e # Position
31+
fieldUid: 5d2372e2-c220-4af4-80c9-49bb8c85a92e # Layout/Position
2632
handle: null
2733
includeInCards: true
2834
instructions: null
29-
label: Position
35+
label: null
3036
providesThumbs: false
3137
required: false
3238
tip: null
@@ -40,7 +46,7 @@ fieldLayouts:
4046
userCondition: null
4147
handle: image
4248
hasTitleField: false
43-
icon: null
49+
icon: image
4450
name: Image
4551
showSlugField: true
4652
showStatusField: true

config/project/entryTypes/imageCarousel--7e401ee6-3575-42de-b3b4-cedae706f392.yaml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
1-
color: null
1+
color: blue
22
fieldLayouts:
33
a3b39778-708a-4de0-9501-6b1d37108919:
44
tabs:
55
-
66
elementCondition: null
77
elements:
88
-
9+
dateAdded: '2025-04-17T23:19:48+00:00'
10+
editCondition: null
911
elementCondition: null
1012
fieldUid: a6f02aa5-ab37-46e2-bbd4-3b56930577d5 # Images
1113
handle: null
1214
includeInCards: false
1315
instructions: null
14-
label: Images
16+
label: null
1517
providesThumbs: true
1618
required: false
1719
tip: null
@@ -21,12 +23,14 @@ fieldLayouts:
2123
warning: null
2224
width: 100
2325
-
26+
dateAdded: '2025-04-17T23:19:48+00:00'
27+
editCondition: null
2428
elementCondition: null
25-
fieldUid: 2f6bf496-df01-42e0-9b77-a764f886813d # Aspect Ratio
29+
fieldUid: 2f6bf496-df01-42e0-9b77-a764f886813d # Slide Aspect Ratio
2630
handle: null
27-
includeInCards: true
31+
includeInCards: false
2832
instructions: null
29-
label: 'Aspect Ratio'
33+
label: null
3034
providesThumbs: false
3135
required: false
3236
tip: null
@@ -40,7 +44,7 @@ fieldLayouts:
4044
userCondition: null
4145
handle: imageCarousel
4246
hasTitleField: false
43-
icon: null
47+
icon: images
4448
name: 'Image Carousel'
4549
showSlugField: true
4650
showStatusField: true

0 commit comments

Comments
 (0)