Skip to content

Commit f6a90dd

Browse files
committed
Merge remote-tracking branch 'refs/remotes/origin/dev' into dev
2 parents 427d914 + 98225dc commit f6a90dd

File tree

3 files changed

+15
-13
lines changed

3 files changed

+15
-13
lines changed

src/apps/content-editor/src/app/views/ItemList/TableCells/SortCell.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ export const SortCell = ({ params }: { params: GridRenderCellParams }) => {
1717
(params.value?.toString() || "0")
1818
}
1919
onChange={(evt) => {
20-
handleChange(parseInt(evt.target.value));
20+
handleChange(parseInt(evt.target.value) || 0);
2121
}}
2222
onClick={(e) => e.stopPropagation()}
2323
InputProps={{

src/shell/components/Head/Head.js

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -88,24 +88,24 @@ export default connect((state, props) => {
8888
>
8989
Create Head Tag
9090
</Button>
91-
<h1>
91+
<h3>
9292
<Notice>
9393
Head tags are not versioned. Once saved they will take effect when
9494
the page(s) are next cached. Caching occurs on publish or every 24
9595
hours.
9696
</Notice>
97-
</h1>
97+
</h3>
98+
</div>
99+
<div className={styles.Notice}>
100+
{legacyHeadTags?.length && (
101+
<Box sx={{ mx: 2 }} component="h3">
102+
<Notice>
103+
This instance has legacy head tags. If you want to edit or
104+
delete these, please contact support.
105+
</Notice>
106+
</Box>
107+
)}
98108
</div>
99-
100-
{legacyHeadTags?.length && (
101-
<Box sx={{ mx: 2 }} component="h1">
102-
<Notice>
103-
This instance has legacy head tags. If you want to edit or delete
104-
these, please contact support.
105-
</Notice>
106-
</Box>
107-
)}
108-
109109
{props.tags.length ? (
110110
props.tags
111111
.sort((a, b) => (a.sort > b.sort ? 1 : -1))

src/shell/components/Head/Head.less

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
display: flex;
1818
align-items: center;
1919
margin: 20px 16px 32px 16px;
20+
color: #5b667d;
21+
font-size: 14px;
2022
}
2123

2224
.NoTags {

0 commit comments

Comments
 (0)