diff options
author | Joram Wilander <jwawilander@gmail.com> | 2015-07-10 12:12:03 -0400 |
---|---|---|
committer | Joram Wilander <jwawilander@gmail.com> | 2015-07-10 12:12:03 -0400 |
commit | f433da2e5fcfb199e735c5231279f1d09820ba1d (patch) | |
tree | 2866dac2be0f5a023f03e8be877d9aa438e32af4 /web/react/components | |
parent | ff128d7c161ead05d0cd7cc6dbbe2dbdd06259e1 (diff) | |
parent | 7d7a50d6b184db0c94180982d9751d6d7f55d7af (diff) | |
download | chat-f433da2e5fcfb199e735c5231279f1d09820ba1d.tar.gz chat-f433da2e5fcfb199e735c5231279f1d09820ba1d.tar.bz2 chat-f433da2e5fcfb199e735c5231279f1d09820ba1d.zip |
Merge pull request #156 from asaadmahmoodspin/master
Improving mentions list and other UI improvements
Diffstat (limited to 'web/react/components')
-rw-r--r-- | web/react/components/invite_member_modal.jsx | 22 | ||||
-rw-r--r-- | web/react/components/mention_list.jsx | 2 | ||||
-rw-r--r-- | web/react/components/signup_user_complete.jsx | 2 |
3 files changed, 16 insertions, 10 deletions
diff --git a/web/react/components/invite_member_modal.jsx b/web/react/components/invite_member_modal.jsx index 9ff67ae1b..94be2acd6 100644 --- a/web/react/components/invite_member_modal.jsx +++ b/web/react/components/invite_member_modal.jsx @@ -162,25 +162,31 @@ module.exports = React.createClass({ invite_sections[index] = ( <div key={"key" + index}> <div> - <button type="button" className="btn remove__member" onClick={this.removeInviteFields.bind(this, index)}>×</button> + <button type="button" className="btn btn-link remove__member" onClick={this.removeInviteFields.bind(this, index)}><span className="fa fa-trash"></span></button> </div> <div className={ email_error ? "form-group invite has-error" : "form-group invite" }> <input onKeyUp={this.displayNameKeyUp} type="text" ref={"email"+index} className="form-control" placeholder="email@domain.com" maxLength="64" /> { email_error } </div> + <div className="row--invite"> { config.AllowInviteNames ? - <div className={ first_name_error ? "form-group invite has-error" : "form-group invite" }> - <input type="text" className="form-control" ref={"first_name"+index} placeholder="First name" maxLength="64" /> - { first_name_error } + <div className="col-sm-6"> + <div className={ first_name_error ? "form-group has-error" : "form-group" }> + <input type="text" className="form-control" ref={"first_name"+index} placeholder="First name" maxLength="64" /> + { first_name_error } + </div> </div> : "" } { config.AllowInviteNames ? - <div className={ last_name_error ? "form-group invite has-error" : "form-group invite" }> - <input type="text" className="form-control" ref={"last_name"+index} placeholder="Last name" maxLength="64" /> - { last_name_error } + <div className="col-sm-6"> + <div className={ last_name_error ? "form-group has-error" : "form-group" }> + <input type="text" className="form-control" ref={"last_name"+index} placeholder="Last name" maxLength="64" /> + { last_name_error } + </div> </div> : "" } </div> + </div> ); } @@ -203,7 +209,7 @@ module.exports = React.createClass({ <button type="button" className="btn btn-default" onClick={this.addInviteFields}>Add another</button> <br/> <br/> - <label className='control-label'>People invited automatically join Town Square channel.</label> + <span>People invited automatically join Town Square channel.</span> </div> <div className="modal-footer"> <button type="button" className="btn btn-default" data-dismiss="modal">Close</button> diff --git a/web/react/components/mention_list.jsx b/web/react/components/mention_list.jsx index 3fac41073..25834b9e5 100644 --- a/web/react/components/mention_list.jsx +++ b/web/react/components/mention_list.jsx @@ -129,7 +129,7 @@ module.exports = React.createClass({ if (numMentions < 1) return (<div/>); - var height = (numMentions*37) + 2; + var height = (numMentions*36) + 4; var width = $('#'+this.props.id).parent().width(); var bottom = $(window).height() - $('#'+this.props.id).offset().top; var left = $('#'+this.props.id).offset().left; diff --git a/web/react/components/signup_user_complete.jsx b/web/react/components/signup_user_complete.jsx index 124e617bd..fb96cc99f 100644 --- a/web/react/components/signup_user_complete.jsx +++ b/web/react/components/signup_user_complete.jsx @@ -130,7 +130,7 @@ module.exports = React.createClass({ </div> { email } <label className="control-label">Password</label> - <div className={ name_error ? "form-group has-error" : "form-group" }> + <div className={ password_error ? "form-group has-error" : "form-group" }> <input type="password" ref="password" className="form-control" placeholder="" maxLength="128" /> { password_error } </div> |