summaryrefslogtreecommitdiffstats
path: root/webapp/components
diff options
context:
space:
mode:
Diffstat (limited to 'webapp/components')
-rw-r--r--webapp/components/login/login_controller.jsx42
-rw-r--r--webapp/components/signup/signup_controller.jsx57
2 files changed, 58 insertions, 41 deletions
diff --git a/webapp/components/login/login_controller.jsx b/webapp/components/login/login_controller.jsx
index 04ba46896..4b6757294 100644
--- a/webapp/components/login/login_controller.jsx
+++ b/webapp/components/login/login_controller.jsx
@@ -493,12 +493,14 @@ export default class LoginController extends React.Component {
key='gitlab'
href={Client.getOAuthRoute() + '/gitlab/login' + this.props.location.search}
>
- <span className='icon'/>
<span>
- <FormattedMessage
- id='login.gitlab'
- defaultMessage='GitLab'
- />
+ <span className='icon'/>
+ <span>
+ <FormattedMessage
+ id='login.gitlab'
+ defaultMessage='GitLab'
+ />
+ </span>
</span>
</a>
);
@@ -511,12 +513,14 @@ export default class LoginController extends React.Component {
key='google'
href={Client.getOAuthRoute() + '/google/login' + this.props.location.search}
>
- <span className='icon'/>
<span>
- <FormattedMessage
- id='login.google'
- defaultMessage='Google Apps'
- />
+ <span className='icon'/>
+ <span>
+ <FormattedMessage
+ id='login.google'
+ defaultMessage='Google Apps'
+ />
+ </span>
</span>
</a>
);
@@ -529,12 +533,14 @@ export default class LoginController extends React.Component {
key='office365'
href={Client.getOAuthRoute() + '/office365/login' + this.props.location.search}
>
- <span className='icon'/>
<span>
- <FormattedMessage
- id='login.office365'
- defaultMessage='Office 365'
- />
+ <span className='icon'/>
+ <span>
+ <FormattedMessage
+ id='login.office365'
+ defaultMessage='Office 365'
+ />
+ </span>
</span>
</a>
);
@@ -547,9 +553,11 @@ export default class LoginController extends React.Component {
key='saml'
href={'/login/sso/saml' + this.props.location.search}
>
- <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>
);
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>
);