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

fix: rotation card dimensions #577

Merged
merged 6 commits into from
May 9, 2022
Merged

fix: rotation card dimensions #577

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d0194a2
fix: set initial image to have null parent order
storyworks May 4, 2022
7379277
fix: language warning in test
storyworks May 4, 2022
58db056
Merge branch 'main' of https://github.com/JesusFilm/core
storyworks May 9, 2022
efa8212
fix: revert library version to working rotation
storyworks May 9, 2022
38ed34b
Merge branch 'main' of https://github.com/JesusFilm/core into 22-04-Z…
storyworks May 9, 2022
d8916d5
fix: storybook config
storyworks May 9, 2022
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
10 changes: 2 additions & 8 deletions .storybook/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,14 +52,8 @@ const affectedStories = () => {

const stories = affectedProjects
.map((project) => {
if (
project === 'shared-storybook' ||
project === '' ||
project.includes('api-') ||
project.includes('-e2e')
)
return []
return storiesForProject[project]
if (project === '') return []
return storiesForProject[project] ?? []
})
.flat()

Expand Down
1 change: 1 addition & 0 deletions apps/journeys/src/components/Conductor/Conductor.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import {
TreeBlock,
useBlocks
} from '@core/journeys/ui'
// Used to resolve dynamic viewport height on Safari
import Div100vh from 'react-div-100vh'
import { BlockFields_CardBlock as CardBlock } from '../../../__generated__/BlockFields'
import { JourneyProgress } from '../JourneyProgress'
Expand Down
11 changes: 7 additions & 4 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
"notistack": "^2.0.3",
"react": "17.0.2",
"react-colorful": "^5.5.1",
"react-div-100vh": "^0.7.0",
"react-div-100vh": "^0.6.0",
"react-dom": "17.0.2",
"react-firebase-hooks": "^3.0.4",
"react-firebaseui": "^6.0.0",
Expand Down