Skip to content

Commit 5d9f5f4

Browse files
committed
Merge branch '2025.4' into 2026.1
2 parents d9482a3 + a2fb7e2 commit 5d9f5f4

40 files changed

Lines changed: 1364 additions & 180 deletions

File tree

assets/js/src/core/components/toolbar/toolbar.styles.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import { createStyles } from 'antd-style'
1313
export const useStyles = createStyles(({ token, css }) => {
1414
return {
1515
toolbar: css`
16+
width: 100%;
1617
height: 48px;
1718
padding: ${token.paddingXS}px;
1819

assets/js/src/core/modules/application-logger/application-logger-container-inner.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -172,9 +172,9 @@ export const ApplicationLoggerContainerInner = (): React.JSX.Element => {
172172
renderTopBar={
173173
<Toolbar
174174
justify='space-between'
175-
margin={ {
176-
x: 'mini',
177-
y: 'none'
175+
padding={ {
176+
left: 'small',
177+
right: 'extra-small'
178178
}
179179
}
180180
theme='secondary'

assets/js/src/core/modules/document-types/document-types-container.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,9 @@ export const DocumentTypesContainer = (): React.JSX.Element => {
8989
renderTopBar={
9090
<Toolbar
9191
justify='space-between'
92-
margin={ {
93-
x: 'mini',
94-
y: 'none'
92+
padding={ {
93+
left: 'small',
94+
right: 'extra-small'
9595
} }
9696
theme='secondary'
9797
>

assets/js/src/core/modules/element/search-replace-assignments/components/search-replace-form/search-replace-form.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ export const SearchReplaceForm = (): React.JSX.Element => {
3838
<>
3939
<Toolbar
4040
justify="space-between"
41-
margin={ {
42-
x: 'mini',
43-
y: 'none'
41+
padding={ {
42+
left: 'small',
43+
right: 'extra-small'
4444
} }
4545
theme="secondary"
4646
>

assets/js/src/core/modules/email/blocklist/email-blocklist-container.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,9 @@ export const EmailBlocklistContainer = (): React.JSX.Element => {
8282
renderTopBar={
8383
<Toolbar
8484
justify='space-between'
85-
margin={ {
86-
x: 'mini',
87-
y: 'none'
85+
padding={ {
86+
left: 'small',
87+
right: 'extra-small'
8888
} }
8989
theme='secondary'
9090
>

assets/js/src/core/modules/email/log/email-log-container.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,9 @@ export const EmailLogContainer = (): React.JSX.Element => {
8080
renderTopBar={
8181
<Toolbar
8282
justify='space-between'
83-
margin={ {
84-
x: 'mini',
85-
y: 'none'
83+
padding={ {
84+
left: 'small',
85+
right: 'extra-small'
8686
} }
8787
theme='secondary'
8888
>

assets/js/src/core/modules/gdpr-data-extractor/gdpr-data-extractor-container.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,9 +125,9 @@ export const GDPRDataExtractorContainer = (): React.JSX.Element => {
125125
renderTopBar={
126126
<Toolbar
127127
justify='space-between'
128-
margin={ {
129-
x: 'mini',
130-
y: 'none'
128+
padding={ {
129+
left: 'small',
130+
right: 'extra-small'
131131
} }
132132
theme='secondary'
133133
>

assets/js/src/core/modules/notes-and-events/notes-and-events-container.tsx

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -71,11 +71,10 @@ const NotesAndEventsContainer = (): React.JSX.Element => {
7171
renderTopBar={
7272
<Toolbar
7373
justify='space-between'
74-
margin={ {
75-
x: 'mini',
76-
y: 'none'
77-
}
78-
}
74+
padding={ {
75+
left: 'small',
76+
right: 'extra-small'
77+
} }
7978
theme='secondary'
8079
>
8180
<Title>{t('notes-and-events.label')}</Title>
@@ -89,7 +88,7 @@ const NotesAndEventsContainer = (): React.JSX.Element => {
8988
withoutAddon={ false }
9089
/>
9190
</Toolbar>
92-
}
91+
}
9392
>
9493
<Content
9594
loading={ isLoading }

assets/js/src/core/modules/notifications/notifications-view.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@ const NotificationsView = ({ notifications, isLoading, isFetching, deleteNotific
6363
renderTopBar={
6464
<Toolbar
6565
justify='space-between'
66-
margin={ {
67-
x: 'mini',
68-
y: 'none'
66+
padding={ {
67+
left: 'small',
68+
right: 'extra-small'
6969
}
7070
}
7171
theme='secondary'

assets/js/src/core/modules/predefined-asset-metadata/predefined-asset-metadata-container.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,9 +129,9 @@ export const PredefinedAssetMetadataContainer = (): React.JSX.Element => {
129129
renderTopBar={
130130
<Toolbar
131131
justify='space-between'
132-
margin={ {
133-
x: 'mini',
134-
y: 'none'
132+
padding={ {
133+
left: 'small',
134+
right: 'extra-small'
135135
} }
136136
theme='secondary'
137137
>

0 commit comments

Comments
 (0)