Skip to content

Viewport resize fix #5222

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

Merged
merged 3 commits into from
Dec 1, 2020
Merged

Viewport resize fix #5222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e4e4f72
Fix #5214
kkartunov Nov 30, 2020
74ca86b
ci: on test
kkartunov Nov 30, 2020
fb433f7
Merge branch 'develop' into viewport-resize-fix
luizrrodrigues Dec 1, 2020
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
3 changes: 1 addition & 2 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ workflows:
filters:
branches:
only:
- spirit-award
- free
# This is alternate dev env for parallel testing
- "build-qa":
context : org-global
Expand All @@ -260,7 +260,6 @@ workflows:
branches:
only:
- develop
- fix-dashboard-auth
# Production builds are exectuted
# when PR is merged to the master
# Don't change anything in this configuration
Expand Down
2 changes: 1 addition & 1 deletion src/shared/components/Contentful/Viewport/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ function ViewportContentLoader(props) {
let animation = {};
if (animationOnScroll) {
contentIds.pop();
animation = { ...data.entries.items[animationOnScroll.sys.id].fields };
animation = { ...animationOnScroll.fields };
// Animations only on client side
if (isomorphy.isClientSide()) {
AOS.init();
Expand Down