Skip to content

fix(ActiveCallPanel): use call avatar in call info #1001

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

Merged
merged 1 commit into from
Aug 3, 2018
Merged

fix(ActiveCallPanel): use call avatar in call info #1001

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions packages/ringcentral-widgets/components/ActiveCallPanel/CallInfo.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,14 @@ import classnames from 'classnames';
import ContactDisplay from '../ContactDisplay';
import dynamicsFont from '../../assets/DynamicsFont/DynamicsFont.scss';
import styles from './styles.scss';
import CallAvatar from '../CallAvatar';

export default function CallInfo(props) {
let avatar;
if (props.avatarUrl) {
avatar = (<img src={props.avatarUrl} alt="avatar" />);
avatar = (<CallAvatar avatarUrl={props.avatarUrl} />);
} else {
avatar = (<i className={classnames(dynamicsFont.portrait, styles.icon)} />);
avatar = (<CallAvatar avatarUrl={null} />);
}
return (
<div className={styles.userInfo}>
Expand Down
2 changes: 1 addition & 1 deletion packages/ringcentral-widgets/components/ActiveCallPanel/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,6 @@ $fontSize:15px;
vertical-align: middle;
padding: 0;
margin: 0;
border: 2px solid $snow;
font-size: $fontSize;
text-align: center;
position: relative;
Expand All @@ -141,6 +140,7 @@ $fontSize:15px;
.remains {
color: $snow;
background-color: $smoke;
border: 2px solid $snow;
}
.avatar+.avatar {
margin-left: -20px;
Expand Down