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

Prevent gap in background with parallax effect #2056

Merged
merged 2 commits into from
Jan 17, 2024
Merged

Prevent gap in background with parallax effect #2056

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6b38798
Prevent gap in background with parallax effect
tf Jan 17, 2024
e02ec7a
Fix CI for Rails 7.1.3
tf Jan 17, 2024
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
8 changes: 4 additions & 4 deletions entry_types/scrolled/package/spec/frontend/features/backdropAnimationEffects-spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@ describe('backdrop animation effects', () => {
expect(animateMock).toHaveBeenCalledWith(
{
transform: [
'scale(116%) translateY(8%)',
'scale(116%) translateY(-8%)'
'translateY(8%) scale(116%)',
'translateY(-8%) scale(116%)'
]
},
expect.objectContaining({timeline: viewTimelines[0]}
Expand Down Expand Up @@ -112,8 +112,8 @@ describe('backdrop animation effects', () => {
expect(animateMock).toHaveBeenCalledWith(
{
transform: [
'scale(116%) translateY(8%)',
'scale(116%) translateY(-8%)'
'translateY(8%) scale(116%)',
'translateY(-8%) scale(116%)'
]
},
expect.objectContaining({timeline: viewTimelines[0]}
Expand Down
4 changes: 2 additions & 2 deletions entry_types/scrolled/package/src/frontend/v1/Backdrop/Effects.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ export function Effects({file, children}) {
const animation = ref.current.animate(
{
transform: [
`scale(${scale}%) translateY(${max}%)`,
`scale(${scale}%) translateY(${-max}%)`
`translateY(${max}%) scale(${scale}%)`,
`translateY(${-max}%) scale(${scale}%)`
],
},
{
Expand Down
7 changes: 3 additions & 4 deletions spec/support/pageflow/dummy/rails_template.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ def source_paths

rails_version_string = Rails::VERSION::STRING.tr!('.', '_')

engine_name = ENV.fetch('PAGEFLOW_PLUGIN_ENGINE', 'pageflow')
engine_name = ENV['PAGEFLOW_PLUGIN_ENGINE'].presence || 'pageflow'
database_prefix = "#{engine_name}-rails-#{rails_version_string}"

gsub_file('config/database.yml',
Expand Down Expand Up @@ -45,8 +45,7 @@ def source_paths

in_root { run('rake db:environment:set db:drop:all', capture: true, abort_on_failure: false) }

rake 'db:create' # workaround for https://github.com/rails/rails/issues/50038
rake 'db:create:all'
rake 'db:create'

# Install Webpacker

Expand Down Expand Up @@ -106,4 +105,4 @@ def source_paths
copy_file('add_custom_fields.rb',
'db/migrate/99990000000000_add_custom_fields.rb')

rake 'db:migrate db:test:load_schema', env: 'development'
rake 'db:migrate'
Loading