diff options
Diffstat (limited to 'web')
| -rw-r--r-- | web/react/components/login.jsx | 4 | ||||
| -rw-r--r-- | web/react/components/sidebar.jsx | 1 | ||||
| -rw-r--r-- | web/react/components/team_signup_password_page.jsx | 3 | ||||
| -rw-r--r-- | web/sass-files/sass/partials/_post.scss | 1 | ||||
| -rw-r--r-- | web/sass-files/sass/partials/_sidebar--left.scss | 2 |
5 files changed, 7 insertions, 4 deletions
diff --git a/web/react/components/login.jsx b/web/react/components/login.jsx index 0f3aa42db..28dd64c39 100644 --- a/web/react/components/login.jsx +++ b/web/react/components/login.jsx @@ -152,7 +152,6 @@ export default class Login extends React.Component { ); } - var forgotPassword; if (loginMessage.length > 0 && emailSignup) { loginMessage = ( <div> @@ -162,7 +161,10 @@ export default class Login extends React.Component { </div> </div> ); + } + var forgotPassword; + if (emailSignup) { forgotPassword = ( <div className='form-group'> <a href={'/' + teamName + '/reset_password'}>I forgot my password</a> diff --git a/web/react/components/sidebar.jsx b/web/react/components/sidebar.jsx index 8dd192893..5b74165f3 100644 --- a/web/react/components/sidebar.jsx +++ b/web/react/components/sidebar.jsx @@ -278,7 +278,6 @@ module.exports = React.createClass({ var lastUnreadElement = $(this.refs[this.lastUnreadChannel].getDOMNode()); if (lastUnreadElement.position().top > container.height()) { - $(this.refs.bottomUnreadIndicator.getDOMNode()).css('bottom', '0'); $(this.refs.bottomUnreadIndicator.getDOMNode()).css('display', 'initial'); } else { $(this.refs.bottomUnreadIndicator.getDOMNode()).css('display', 'none'); diff --git a/web/react/components/team_signup_password_page.jsx b/web/react/components/team_signup_password_page.jsx index bbe82a5c2..6b21915f6 100644 --- a/web/react/components/team_signup_password_page.jsx +++ b/web/react/components/team_signup_password_page.jsx @@ -57,13 +57,14 @@ module.exports = React.createClass({ window.location.href = '/verify_email?email=' + encodeURIComponent(teamSignup.team.email) + '&teamname=' + encodeURIComponent(teamSignup.team.name); } else { this.setState({serverError: err.message}); + $('#finish-button').button('reset'); } }.bind(this) ); }.bind(this), function error(err) { this.setState({serverError: err.message}); - $('#sign-up-button').button('reset'); + $('#finish-button').button('reset'); }.bind(this) ); }, diff --git a/web/sass-files/sass/partials/_post.scss b/web/sass-files/sass/partials/_post.scss index 0605e9c3b..231e6fe3f 100644 --- a/web/sass-files/sass/partials/_post.scss +++ b/web/sass-files/sass/partials/_post.scss @@ -139,6 +139,7 @@ body.ios { width: 100%; padding: 1em 0 0; position: relative; + -webkit-overflow-scrolling: touch; &.hide-scroll::-webkit-scrollbar { width: 0px !important; } diff --git a/web/sass-files/sass/partials/_sidebar--left.scss b/web/sass-files/sass/partials/_sidebar--left.scss index 6b827eaee..432b8eb46 100644 --- a/web/sass-files/sass/partials/_sidebar--left.scss +++ b/web/sass-files/sass/partials/_sidebar--left.scss @@ -59,7 +59,7 @@ top: 66px; } .nav-pills__unread-indicator-bottom { - bottom: 0px; + bottom: 10px; } .nav { |