diff options
author | Christopher Speller <crspeller@gmail.com> | 2017-05-12 09:12:55 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-05-12 09:12:55 -0400 |
commit | 1397798f1763b0848957a8672c8d40b6243764d5 (patch) | |
tree | 5d109da2e9e088f16eff0ad1421876a3d3da412e /webapp/components/signup | |
parent | b1c39204a63a87d2cbc57f66cf9db50c938b2ee5 (diff) | |
parent | 9d109b070037951fcd0832b785eba8a3db9a157c (diff) | |
download | chat-1397798f1763b0848957a8672c8d40b6243764d5.tar.gz chat-1397798f1763b0848957a8672c8d40b6243764d5.tar.bz2 chat-1397798f1763b0848957a8672c8d40b6243764d5.zip |
Merge pull request #6401 from mattermost/merge-3.9
Merge release-3.9 branch into master
Diffstat (limited to 'webapp/components/signup')
-rw-r--r-- | webapp/components/signup/signup_controller.jsx | 57 |
1 files changed, 33 insertions, 24 deletions
diff --git a/webapp/components/signup/signup_controller.jsx b/webapp/components/signup/signup_controller.jsx index 0c969e5ed..9a6ed0ada 100644 --- a/webapp/components/signup/signup_controller.jsx +++ b/webapp/components/signup/signup_controller.jsx @@ -144,9 +144,8 @@ export default class SignupController extends React.Component { key='email' to={'/signup_email' + window.location.search} > - - <span className='icon fa fa-envelope'/> <span> + <span className='icon fa fa-envelope'/> <FormattedMessage id='signup.email' defaultMessage='Email and Password' @@ -163,12 +162,14 @@ export default class SignupController extends React.Component { key='gitlab' href={Client.getOAuthRoute() + '/gitlab/signup' + window.location.search} > - <span className='icon'/> <span> - <FormattedMessage - id='signup.gitlab' - defaultMessage='GitLab Single-Sign-On' - /> + <span className='icon'/> + <span> + <FormattedMessage + id='signup.gitlab' + defaultMessage='GitLab Single-Sign-On' + /> + </span> </span> </a> ); @@ -181,12 +182,14 @@ export default class SignupController extends React.Component { key='google' href={Client.getOAuthRoute() + '/google/signup' + window.location.search} > - <span className='icon'/> <span> - <FormattedMessage - id='signup.google' - defaultMessage='Google Account' - /> + <span className='icon'/> + <span> + <FormattedMessage + id='signup.google' + defaultMessage='Google Account' + /> + </span> </span> </a> ); @@ -199,12 +202,14 @@ export default class SignupController extends React.Component { key='office365' href={Client.getOAuthRoute() + '/office365/signup' + window.location.search} > - <span className='icon'/> <span> - <FormattedMessage - id='signup.office365' - defaultMessage='Office 365' - /> + <span className='icon'/> + <span> + <FormattedMessage + id='signup.office365' + defaultMessage='Office 365' + /> + </span> </span> </a> ); @@ -217,12 +222,14 @@ export default class SignupController extends React.Component { key='ldap' to={'/signup_ldap' + window.location.search} > - <span className='icon fa fa-folder-open fa--margin-top'/> <span> - <FormattedMessage - id='signup.ldap' - defaultMessage='AD/LDAP Credentials' - /> + <span className='icon fa fa-folder-open fa--margin-top'/> + <span> + <FormattedMessage + id='signup.ldap' + defaultMessage='AD/LDAP Credentials' + /> + </span> </span> </Link> ); @@ -242,9 +249,11 @@ export default class SignupController extends React.Component { key='saml' href={'/login/sso/saml' + window.location.search + query} > - <span className='icon fa fa-lock fa--margin-top'/> <span> - {global.window.mm_config.SamlLoginButtonText} + <span className='icon fa fa-lock fa--margin-top'/> + <span> + {global.window.mm_config.SamlLoginButtonText} + </span> </span> </a> ); |