Skip to content
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

Jump to bottom

Changes for Jitsi UI #518

Merged
merged 5 commits into from
Jul 19, 2020
Merged

Changes for Jitsi UI #518

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
17c7a46
css changes for jitsi box ui change
nisarg1499 Jul 13, 2020
af80095
edited jitsi.scss for jitsi ui and reverted changes of comment.scss
nisarg1499 Jul 15, 2020
5745a46
changes made for making same fonts
nisarg1499 Jul 15, 2020
e88e7d3
added modals in jitsi ui
nisarg1499 Jul 16, 2020
970149d
removed unnecessary code from jitsi.scss
nisarg1499 Jul 16, 2020
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
52 changes: 30 additions & 22 deletions src/user/integrations/NameForm.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, {Component} from 'react';
import {Modal, Button, Form, Row} from 'react-bootstrap';
import {Modal, Button, Form, Row, Col} from 'react-bootstrap';
import {JitsiMeet} from './Jitsi';
import "./jitsi.scss";

Expand Down Expand Up @@ -31,39 +31,47 @@ export class Info extends Component{
{...this.props}
size="md"
aria-labelledby="contained-modal-title-vcenter"
className="modal"
centered>
<div className="container">
<Modal.Header closeButton className="heading border border-0 p-0">

<Modal.Header closeButton className="modal__header">
<Modal.Title id="contained-modal-title-vcenter">
<div className="title">Info</div>
<div className="about">Enter your name and a roomID</div>
</Modal.Title>
</Modal.Header>
<Modal.Body>
<Row className="form-content">
<Form.Label className="label">Your Name</Form.Label>
<Form.Control className="form-input"
type="text" placeholder="Name.." size="sm"
onChange={event => this.handleChange(event, "user")}
required/>
</Row>
<Row className="form-content">
<Form.Label className="label">Room ID</Form.Label>
<Form.Control className="form-input"
type="text" placeholder="RoomID.." size="sm"
onChange={event => this.handleChange(event, "roomID")}
required/>
</Row>
<Modal.Body className="modal__body">
<Form className="modal__form">
<Form.Row className="modal__row">
<Form.Group className="modal__group" as={Col}>
<Form.Label className="label">Your Name</Form.Label>
<Form.Control className="modal__post"
type="text" placeholder="Name.." size="sm"
onChange={event => this.handleChange(event, "user")}
required/>
</Form.Group>
</Form.Row>
<Form.Row className="modal__row">
<Form.Group className="modal__group" as={Col}>
<Form.Label className="label">Room ID</Form.Label>
<Form.Control className="modal__post"
type="text" placeholder="RoomID.." size="sm"
onChange={event => this.handleChange(event, "roomID")}
required/>
</Form.Group>
</Form.Row>
</Form>
</Modal.Body>
<div className="form-footer">
<div className="modal__buttons">
<Button onClick={() => this.setState({startJitsi:true})}
disabled={this.state.disable} className="savebtn">Join Call</Button>
disabled={this.state.disable} className="modal__save">
<span className="modal__buttontext">Join</span></Button>
{this.state.startJitsi ? <JitsiMeet show={this.state.startJitsi}
onHide={this.closeJitsi} user={this.state.user}
roomID={this.state.roomID}/> : null}
<Button variant="outline-primary" onClick={this.props.onHide}>Cancel</Button>
<Button className="modal__cancel" variant="outline-primary" onClick={this.props.onHide}>
<span className="modal__buttontext">Cancel</span></Button>
</div>
</div>
</Modal>
);
}
Expand Down
19 changes: 11 additions & 8 deletions src/user/integrations/jitsi.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
font-weight: 700;
line-height: 29px;
color: #1A73E8;
// margin-left: 6px;
margin-left: 3px;
}
.about{
font-weight: 500;
Expand All @@ -34,7 +34,7 @@
color: #90949C;
margin-top:10px;
margin-bottom: 5px;
// margin-left: 6px;
margin-left: 4px;
}
.message{
font-weight: 500;
Expand All @@ -52,34 +52,37 @@
color:#000000;
margin-bottom: 3px;
margin-top: 5px;
// margin-left: 3px;
margin-left: 2px;
}
.form-input{
font-family: Inter;
font-style: normal;
font-weight: 300;
font-size: 13px;
line-height: 16px;
//margin-left: 3px;
margin-left: 3px;
}
.form-content{
margin-top:-2%;
margin-bottom: 20px;
justify-content:space-between;
}
.form-footer{
.form-footer-jitsi{
Rupeshiya marked this conversation as resolved.
Show resolved Hide resolved
margin-top: -5px;
Button{
width: auto;
margin-right: 20px;
margin-bottom: 30px;
border-radius: 100px;
// border-radius: 100px;
font-weight:600;
}
.savebtn{
.joinbtn{
background-color: #1A73E8;
width: 80px;
height: 2.0em;
margin-left: 5px;
padding: 0;
}

}
.contain{
margin-top: -3px;
Expand Down