diff --git a/src/components/cards/card.css b/src/components/cards/card.css index d18360a8c..bd2ff2829 100644 --- a/src/components/cards/card.css +++ b/src/components/cards/card.css @@ -9,6 +9,12 @@ min-width: 468px; } +.card-container-overlay { + margin: auto; + pointer-events: none; + overflow: hidden; +} + .left-card, .right-card { height: 90%; position: absolute; diff --git a/src/components/cards/cards.jsx b/src/components/cards/cards.jsx index 9b7dfe7b2..f5a702770 100644 --- a/src/components/cards/cards.jsx +++ b/src/components/cards/cards.jsx @@ -3,6 +3,7 @@ import React, {Fragment} from 'react'; import classNames from 'classnames'; import {FormattedMessage} from 'react-intl'; import Draggable from 'react-draggable'; +import Box from '../box/box.jsx'; import styles from './card.css'; @@ -277,55 +278,64 @@ const Cards = props => { const steps = content[activeDeckId].steps; return ( - -
-
- -
- {steps[step].deckIds ? ( - - ) : ( - steps[step].video ? ( - +
+
+ +
+ {steps[step].deckIds ? ( + ) : ( - - ) - )} - {steps[step].trackingPixel && steps[step].trackingPixel} + steps[step].video ? ( + + ) : ( + + ) + )} + {steps[step].trackingPixel && steps[step].trackingPixel} +
+ 0 ? onPrevStep : null} + />
- 0 ? onPrevStep : null} - />
-
- + + ); }; diff --git a/src/reducers/cards.js b/src/reducers/cards.js index c54161f4c..4e5c4af11 100644 --- a/src/reducers/cards.js +++ b/src/reducers/cards.js @@ -31,6 +31,8 @@ const reducer = function (state, action) { visible: false }); case SHRINK_EXPAND_CARDS: + // Set new position here based on bounds + console.log('TODO: set new position based on bounds'); return Object.assign({}, state, { expanded: !state.expanded });