Skip to content

Commit

Permalink
Merge branch 'ben/guide-continue-icon-click' into ben/guide-continue-…
Browse files Browse the repository at this point in the history
…icon-click-variant
  • Loading branch information
breville committed Jul 11, 2024
2 parents c1d7d57 + 9ce6d9a commit 73c19f0
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
3 changes: 2 additions & 1 deletion src/oceans/components/common/Guide.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,8 @@ let UnwrappedGuide = class Guide extends React.Component {
const renderClickToContinueReminder =
state.guides === 'K5' &&
state.guideShowing &&
!guide.getCurrentGuide().noDimBackground;
!guide.getCurrentGuide().noDimBackground &&
guide.getCurrentGuide().style !== 'Info';

return (
<div>
Expand Down
2 changes: 1 addition & 1 deletion src/oceans/styles/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -515,7 +515,7 @@ const styles = {
width: '5%',

Check failure on line 515 in src/oceans/styles/index.js

View workflow job for this annotation

GitHub Actions / build_deploy

Duplicate key 'width'
minWidth: 25,
height: 15,
animation: '0.25s ease-in 3s 1 normal backwards running fadein'
animation: '0.25s ease-in 4s 1 normal backwards running fadein'
},
guideClickToContinueReminder1: {
width: '100%',
Expand Down

0 comments on commit 73c19f0

Please sign in to comment.