summaryrefslogtreecommitdiffstats
path: root/web/react
diff options
context:
space:
mode:
authorAsaad Mahmood <Unknowngi@live.com>2015-11-12 23:39:28 +0500
committerAsaad Mahmood <Unknowngi@live.com>2015-11-13 16:57:34 +0500
commit4331920cf0f454f5d915e70fe7ebf8bd352a2f6d (patch)
tree55983d0cf05cbf935bc1490bfc7ac8f6b5f9b93c /web/react
parent0baa1bfe94c7ccd4ccfd5d31ae52d5f227a170d6 (diff)
downloadchat-4331920cf0f454f5d915e70fe7ebf8bd352a2f6d.tar.gz
chat-4331920cf0f454f5d915e70fe7ebf8bd352a2f6d.tar.bz2
chat-4331920cf0f454f5d915e70fe7ebf8bd352a2f6d.zip
Multiple UI improvements
Diffstat (limited to 'web/react')
-rw-r--r--web/react/components/login.jsx6
-rw-r--r--web/react/components/settings_sidebar.jsx3
2 files changed, 3 insertions, 6 deletions
diff --git a/web/react/components/login.jsx b/web/react/components/login.jsx
index f7f5bd23d..423ba9067 100644
--- a/web/react/components/login.jsx
+++ b/web/react/components/login.jsx
@@ -125,7 +125,7 @@ export default class Login extends React.Component {
let emailSignup;
if (global.window.mm_config.EnableSignUpWithEmail === 'true') {
emailSignup = (
- <div>
+ <div className='signup__email-container'>
<div className={'form-group' + errorClass}>
<input
autoFocus={focusEmail}
@@ -206,7 +206,7 @@ export default class Login extends React.Component {
href='/'
className='signup-team-login'
>
- {'Sign up now'}
+ {'Create one now'}
</a>
</span>
</div>
@@ -215,11 +215,11 @@ export default class Login extends React.Component {
return (
<div className='signup-team__container'>
- {verifiedBox}
<h5 className='margin--less'>{'Sign in to:'}</h5>
<h2 className='signup-team__name'>{teamDisplayName}</h2>
<h2 className='signup-team__subdomain'>{'on '}{global.window.mm_config.SiteName}</h2>
<form onSubmit={this.handleSubmit}>
+ {verifiedBox}
<div className={'form-group' + errorClass}>
{serverError}
</div>
diff --git a/web/react/components/settings_sidebar.jsx b/web/react/components/settings_sidebar.jsx
index 68d9cea48..212bcb22f 100644
--- a/web/react/components/settings_sidebar.jsx
+++ b/web/react/components/settings_sidebar.jsx
@@ -6,9 +6,6 @@ export default class SettingsSidebar extends React.Component {
componentDidUpdate() {
$('.settings-modal').find('.modal-body').scrollTop(0);
$('.settings-modal').find('.modal-body').perfectScrollbar('update');
- if (utils.isSafari()) {
- $('.settings-modal .settings-links .nav').addClass('absolute');
- }
}
constructor(props) {
super(props);