diff --git a/app/assets/styles/blink/_ConferenceBox.scss b/app/assets/styles/blink/_ConferenceBox.scss index c428beb..2bf9dac 100644 --- a/app/assets/styles/blink/_ConferenceBox.scss +++ b/app/assets/styles/blink/_ConferenceBox.scss @@ -1,58 +1,58 @@ .container { flex: 1; } .button { background-color: white; margin: 8px; } .iosButton { background-color: white; margin: 8px; padding-top: 4px; } .androidButton { background-color: white; margin: 8px; } .conferenceContainer { position: absolute; bottom: 0; left: 0; right: 0; top: 0; align-content: flex-end; } .videosContainer { flex: 1; } .landscapeVideosContainer { flex-direction: row; } .hangupButton { background-color: rgba(#a94442, .8); } .wholePageVideo { width: 100%; height: 100%; } .buttonContainer { flex-direction: row; margin: 0 auto; } .carouselContainer { position: absolute; bottom: 10; - left: 0; - right: 0; + left: 10; + right: 10; } diff --git a/app/components/ConferenceCarousel.js b/app/components/ConferenceCarousel.js index 1da1b6e..fdfeb35 100644 --- a/app/components/ConferenceCarousel.js +++ b/app/components/ConferenceCarousel.js @@ -1,38 +1,42 @@ import React, { Component } from 'react'; import PropTypes from 'prop-types'; import { View, Dimensions } from 'react-native'; import Carousel from 'react-native-snap-carousel'; import styles from '../assets/styles/blink/_ConferenceCarousel.scss'; -let {height, width} = Dimensions.get('window'); class ConferenceCarousel extends Component { constructor(props) { super(props); } render() { + const margin = 20; + const width = Dimensions.get('window')['width'] - margin; return ( { this._carousel = c; }} data={this.props.children} renderItem={({item}) => { //add in some styles on the View return item; }} + lockScrollWhileSnapping={true} sliderWidth={width} - itemWidth={130} - itemHeight={100} + activeSlideAlignment={this.props.align === 'right' ? 'start' : 'center'} + itemWidth={125} + itemHeight={90} + inverted={true} /> ); } } ConferenceCarousel.propTypes = { children: PropTypes.node, align: PropTypes.string }; export default ConferenceCarousel;