Skip to content

Commit

Permalink
fix(InMeeting): add style fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
lalli-flores committed Feb 25, 2020
1 parent 5267028 commit eda8e60
Show file tree
Hide file tree
Showing 4 changed files with 38 additions and 35 deletions.
20 changes: 0 additions & 20 deletions src/components/WebexInMeeting/WebexInMeeting.css

This file was deleted.

6 changes: 3 additions & 3 deletions src/components/WebexInMeeting/WebexInMeeting.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ import PropTypes from 'prop-types';

import {WebexLocalMedia, WebexRemoteMedia} from '..';

import './WebexInMeeting.css';
import './WebexInMeeting.scss';

/**
* Webex In-Meeting component displays the remote stream plus
* the local stream at the bottom right corner.
*
* @param {object} props
* @returns {object} JSX of the component
* @param {string} props.meetingID ID of the meeting for which to show media
* @returns {Object} JSX of the component
*/
export default function WebexInMeeting({meetingID}) {
return (
Expand Down
29 changes: 29 additions & 0 deletions src/components/WebexInMeeting/WebexInMeeting.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
$shadow-offset: 0.25rem;
$shadow-blur: 1rem;
$shadow-spread: -0.125rem;
$shadow-color: rgba(0, 0, 0, 0.2);

.in-meeting {
position: relative;
width: 100%;
height: 100%;

.remote-media {
position: relative;
width: 100%;
height: 100%;
}

.local-media {
position: absolute;
bottom: 2rem;
right: 2rem;

width: 13.5rem;
height: 7.5rem;

box-shadow: $shadow-offset $shadow-offset $shadow-blur $shadow-spread $shadow-color;
border-radius: 0.25rem;
z-index: 1;
}
}
18 changes: 6 additions & 12 deletions src/components/WebexInMeeting/WebexInMeeting.stories.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,17 @@ import {WebexJSONAdapter} from '../../adapters';

import {WebexInMeeting, WebexDataProvider} from '..';

// Setup for the stories
const stories = storiesOf('Webex InMeeting', module);
const webexAdapter = new WebexJSONAdapter(jsonData);
const wrapperStyle = {height: '500px', width: '800px', border: '1px solid black'};

stories.add('remote and local media enabled', () => (
<div style={wrapperStyle}>
<WebexDataProvider adapter={webexAdapter}>
<WebexInMeeting meetingID="remote&localMedia" />
</WebexDataProvider>
</div>
<WebexDataProvider adapter={webexAdapter}>
<WebexInMeeting meetingID="remote&localMedia" />
</WebexDataProvider>
));

stories.add('only remote media enabled', () => (
<div style={wrapperStyle}>
<WebexDataProvider adapter={webexAdapter}>
<WebexInMeeting meetingID="remoteMedia" />
</WebexDataProvider>
</div>
<WebexDataProvider adapter={webexAdapter}>
<WebexInMeeting meetingID="remoteMedia" />
</WebexDataProvider>
));

0 comments on commit eda8e60

Please sign in to comment.