Skip to content

Commit 6aa0005

Browse files
committed
Merge remote-tracking branch 'origin/1.x' into 1.x
2 parents 795b1e1 + 2cd6db3 commit 6aa0005

File tree

4 files changed

+24
-10
lines changed

4 files changed

+24
-10
lines changed

.github/release.yml

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,25 @@
11
changelog:
2+
exclude:
3+
labels:
4+
- ":chart_with_upwards_trend: dependency-update"
5+
authors:
6+
- dependabot
27
categories:
3-
- title: 🏕 Features
8+
- title: "⚠️ Breaking changes"
49
labels:
5-
- '*'
10+
- ":warning: breaking"
11+
- title: "🚀 New features"
12+
labels:
13+
- ":rocket: feature"
14+
- title: "📘 Documentation updates"
15+
labels:
16+
- ":blue_book: documentation"
17+
- title: "🐛 Bug fixes"
18+
labels:
19+
- ":beetle: bug"
20+
- title: Other Changes
21+
labels:
22+
- "*"
623
exclude:
724
labels:
825
- dependencies

.github/workflows/update-changelog.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- name: Checkout code
1616
uses: actions/checkout@v4
1717
with:
18-
ref: main
18+
ref: 1.x
1919

2020
- name: Update Changelog
2121
uses: stefanzweifel/changelog-updater-action@v1
@@ -26,6 +26,6 @@ jobs:
2626
- name: Commit updated CHANGELOG
2727
uses: stefanzweifel/git-auto-commit-action@v6
2828
with:
29-
branch: main
29+
branch: 1.x
3030
commit_message: Update CHANGELOG
3131
file_pattern: CHANGELOG.md

docs/fe-content.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,4 +218,4 @@ $paginatedContent = inspirecms_content()->getPaginatedByDocumentType(documentTyp
218218

219219
> [!note]
220220
>
221-
> For examples of displaying content in layouts, see the [Layouts](./fe-layouts){.doc-link} documentation.
221+
> For examples of displaying content in layouts, see the [Layouts](./fe-layouts){.doc-link} documentation.

src/Filament/Resources/NavigationResource.php

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,15 +52,12 @@ public static function form(Form $form): Form
5252
->schema([
5353
static::getCategoryFormComponent(),
5454
static::getParentFormComponent(),
55-
Forms\Components\Grid::make(2)
56-
->schema([
57-
static::getTitleFormComponent(),
58-
static::getIsActiveFormComponent(),
59-
]),
55+
static::getIsActiveFormComponent(),
6056
]),
6157
Forms\Components\Section::make()
6258
->columns(2)
6359
->schema([
60+
static::getTitleFormComponent()->columnSpanFull(),
6461
static::getTypeFormComponent(),
6562
static::getContentFormComponent(),
6663
static::getUrlFormComponent(),

0 commit comments

Comments
 (0)