Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve captions appearance when there is also a CTA #13477

Merged
merged 8 commits into from
Oct 27, 2023
+17 −25
Merged

Improve captions appearance when there is also a CTA #13477

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
11a2b72
🐛 Fix `amp-story-captions` layout and fix `max-height` of `amp-story-…
AnuragVasanwala Oct 18, 2023
cd2cce0
Merge branch 'main' into fix/13425-cta-overlaps-video-captions
AnuragVasanwala Oct 18, 2023
33b1190
Merge branch 'main' into fix/13425-cta-overlaps-video-captions
AnuragVasanwala Oct 27, 2023
ac7445a
📖 Add necessary comments, ⏪ Revert test code
AnuragVasanwala Oct 27, 2023
19e4446
✨ Add `style-preset="default"` for `amp-story-captions`
AnuragVasanwala Oct 27, 2023
2a87ecb
Slightly improve appearance in the editor
swissspidy Oct 27, 2023
e809906
Update snapshots
swissspidy Oct 27, 2023
292eb55
Update snapshot
swissspidy Oct 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions packages/output/src/page.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,13 +197,13 @@ function OutputPage({
aspect-ratio={ASPECT_RATIO}
class="grid-layer align-bottom"
>
<div className="captions-area">
{/* `backgroundColor` is added only for testing purpose. */}
<div className="captions-area" style={{ backgroundColor: 'blue' }}>
{videoCaptions.map((captionId) => (
<amp-story-captions
key={captionId}
id={captionId}
layout="fixed-height"
height="100"
layout="container"
/>
))}
</div>
Expand Down
1 change: 1 addition & 0 deletions packages/output/src/utils/styles.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ function CustomStyles() {
amp-story-grid-layer.align-bottom {
align-content: end;
padding: 0;
max-height: calc(100vh - 148px);
AnuragVasanwala marked this conversation as resolved.
Show resolved Hide resolved
}

.captions-area {
Expand Down
Loading