Skip to content

Commit ae9f4e5

Browse files
author
github-actions
committed
Merge main into next
2 parents 0d787c8 + caf0d53 commit ae9f4e5

37 files changed

+299
-154
lines changed

‎.changeset/hungry-boxes-attack.md‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
---
2+
"@comet/cms-api": patch
3+
---
4+
5+
DAM: Fix headers
6+
7+
While we fixed a few issues with cache control headers in https://github.com/vivid-planet/comet/pull/2653, there are still a few issues which need to be addressed. The following changes are part of a series of changes which will address the issues:
8+
9+
- Only store the `content-type` header
10+
- Prevent imgproxy headers from being passed through to the client
11+
- Remove redundantly stored `content-type` for Azure storage accounts and S3 buckets

‎demo/api/src/comet-config.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
{
22
"dam": {
33
"allowedImageAspectRatios": ["16x9", "4x3", "3x2", "3x1", "2x1", "1x1", "1x2", "1x3", "2x3", "3x4", "9x16", "1200x630"],
4+
<<<<<<< HEAD
45
"maxSrcResolution": 70,
6+
=======
7+
"allowedImageSizes": [320, 420, 768, 1024, 1200, 2048, 2560, 3200, 3840],
8+
>>>>>>> main
59
"uploadsMaxFileSize": 500
610
},
711
"fileUploads": {

‎demo/site-pages/src/common/blocks/CallToActionListBlock.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ const Root = styled.div`
2121
flex-flow: row wrap;
2222
gap: ${({ theme }) => theme.spacing.S300};
2323
24-
${({ theme }) => theme.breakpoints.sm.mediaQuery} {
24+
${({ theme }) => theme.breakpoints.md.mediaQuery} {
2525
gap: ${({ theme }) => theme.spacing.S400};
2626
}
2727
`;

‎demo/site-pages/src/common/blocks/MediaGalleryBlock.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,15 +53,15 @@ const PageLayoutContent = styled.div`
5353
grid-column: 2 / -2;
5454
position: relative;
5555
56-
${({ theme }) => theme.breakpoints.xs.mediaQuery} {
56+
${({ theme }) => theme.breakpoints.sm.mediaQuery} {
5757
grid-column: 5 / -5;
5858
}
5959
60-
${({ theme }) => theme.breakpoints.md.mediaQuery} {
60+
${({ theme }) => theme.breakpoints.lg.mediaQuery} {
6161
grid-column: 6 / -6;
6262
}
6363
64-
${({ theme }) => theme.breakpoints.lg.mediaQuery} {
64+
${({ theme }) => theme.breakpoints.xl.mediaQuery} {
6565
grid-column: 7 / -7;
6666
}
6767
`;

‎demo/site-pages/src/common/blocks/RichTextBlock.tsx‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,14 @@ const DisableLastBottomSpacing = styled.div`
116116
> *:last-child {
117117
margin-bottom: 0;
118118
119+
<<<<<<< HEAD
119120
${theme.breakpoints.xs.mediaQuery} {
120121
margin-bottom: 0;
122+
=======
123+
${theme.breakpoints.sm.mediaQuery} {
124+
margin-bottom: 0;
125+
}
126+
>>>>>>> main
121127
}
122128
}
123129
`};

‎demo/site-pages/src/common/components/Typography.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ export const Typography = styled.div.attrs<{
205205
css`
206206
margin-bottom: 0;
207207
208-
${theme.breakpoints.xs.mediaQuery} {
208+
${theme.breakpoints.sm.mediaQuery} {
209209
margin-bottom: 0;
210210
}
211211
`};

‎demo/site-pages/src/common/helpers/SvgUse.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ interface SvgUseProps extends SVGProps<SVGSVGElement> {
55
}
66

77
export const SvgUse = ({ href, ...props }: SvgUseProps) => (
8-
<svg {...props}>
8+
<svg aria-hidden="true" {...props}>
99
<use href={href} xlinkHref={href} />
1010
</svg>
1111
);

‎demo/site-pages/src/documents/pages/blocks/BasicStageBlock.tsx‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ const Content = styled.div<{ $alignItems: CSSProperties["alignItems"] }>`
7272
const MediaPhone = styled.div`
7373
height: 800px;
7474
75-
${({ theme }) => theme.breakpoints.xs.mediaQuery} {
75+
${({ theme }) => theme.breakpoints.sm.mediaQuery} {
7676
display: none;
7777
}
7878
`;
@@ -81,11 +81,11 @@ const MediaTablet = styled.div`
8181
display: none;
8282
height: 700px;
8383
84-
${({ theme }) => theme.breakpoints.xs.mediaQuery} {
84+
${({ theme }) => theme.breakpoints.sm.mediaQuery} {
8585
display: block;
8686
}
8787
88-
${({ theme }) => theme.breakpoints.sm.mediaQuery} {
88+
${({ theme }) => theme.breakpoints.md.mediaQuery} {
8989
display: none;
9090
}
9191
`;
@@ -94,11 +94,11 @@ const MediaTabletLandscape = styled.div`
9494
display: none;
9595
height: 650px;
9696
97-
${({ theme }) => theme.breakpoints.sm.mediaQuery} {
97+
${({ theme }) => theme.breakpoints.md.mediaQuery} {
9898
display: block;
9999
}
100100
101-
${({ theme }) => theme.breakpoints.md.mediaQuery} {
101+
${({ theme }) => theme.breakpoints.lg.mediaQuery} {
102102
display: none;
103103
}
104104
`;
@@ -107,11 +107,11 @@ const MediaDesktop = styled.div`
107107
display: none;
108108
height: 750px;
109109
110-
${({ theme }) => theme.breakpoints.md.mediaQuery} {
110+
${({ theme }) => theme.breakpoints.lg.mediaQuery} {
111111
display: block;
112112
}
113113
114-
${({ theme }) => theme.breakpoints.lg.mediaQuery} {
114+
${({ theme }) => theme.breakpoints.xl.mediaQuery} {
115115
height: 800px;
116116
}
117117
`;

‎demo/site-pages/src/documents/pages/blocks/BillboardTeaserBlock.tsx‎

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ const Content = styled.div`
6969
${({ theme }) => css`
7070
grid-column: 3 / -3;
7171
72+
<<<<<<< HEAD
7273
${theme.breakpoints.xs.mediaQuery} {
7374
grid-column: 5 / -5;
7475
}
@@ -77,42 +78,52 @@ const Content = styled.div`
7778
grid-column: 7 / -7;
7879
}
7980
`};
81+
=======
82+
${theme.breakpoints.sm.mediaQuery} {
83+
grid-column: 5 / -5;
84+
}
85+
86+
${theme.breakpoints.xl.mediaQuery} {
87+
grid-column: 7 / -7;
88+
}
89+
`};
90+
>>>>>>> main
8091
`;
8192
8293
const ImageMobile = styled.div`
83-
${({ theme }) => theme.breakpoints.xs.mediaQuery} {
94+
${({ theme }) => theme.breakpoints.sm.mediaQuery} {
8495
display: none;
8596
}
8697
`;
8798
8899
const ImageTablet = styled.div`
89100
display: none;
90101

91-
${({ theme }) => theme.breakpoints.xs.mediaQuery} {
102+
${({ theme }) => theme.breakpoints.sm.mediaQuery} {
92103
display: block;
93104
}
94105

95-
${({ theme }) => theme.breakpoints.sm.mediaQuery} {
106+
${({ theme }) => theme.breakpoints.md.mediaQuery} {
96107
display: none;
97108
}
98109
`;
99110
100111
const ImageDesktop = styled.div`
101112
display: none;
102113

103-
${({ theme }) => theme.breakpoints.sm.mediaQuery} {
114+
${({ theme }) => theme.breakpoints.md.mediaQuery} {
104115
display: block;
105116
}
106117

107-
${({ theme }) => theme.breakpoints.md.mediaQuery} {
118+
${({ theme }) => theme.breakpoints.lg.mediaQuery} {
108119
display: none;
109120
}
110121
`;
111122
112123
const ImageLargeDesktop = styled.div`
113124
display: none;
114125

115-
${({ theme }) => theme.breakpoints.md.mediaQuery} {
126+
${({ theme }) => theme.breakpoints.lg.mediaQuery} {
116127
display: block;
117128
}
118129
`;

‎demo/site-pages/src/documents/pages/blocks/ColumnsBlock.tsx‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,21 +50,21 @@ const Column = styled.div<{ $layout: string }>`
5050
css`
5151
grid-column: 5 / -5;
5252
53-
${theme.breakpoints.xs.mediaQuery} {
53+
${theme.breakpoints.sm.mediaQuery} {
5454
grid-column: 7 / -7;
5555
}
56-
${theme.breakpoints.sm.mediaQuery} {
56+
${theme.breakpoints.md.mediaQuery} {
5757
grid-column: 8 / -8;
5858
}
59-
${theme.breakpoints.md.mediaQuery} {
59+
${theme.breakpoints.lg.mediaQuery} {
6060
grid-column: 9 / -9;
6161
}
62-
${theme.breakpoints.lg.mediaQuery} {
62+
${theme.breakpoints.xl.mediaQuery} {
6363
grid-column: 10 / -10;
6464
}
6565
`};
6666
67-
${({ theme }) => theme.breakpoints.xs.mediaQuery} {
67+
${({ theme }) => theme.breakpoints.sm.mediaQuery} {
6868
${({ $layout }) =>
6969
$layout === "4-16-4" &&
7070
css`

0 commit comments

Comments
 (0)