diff options
| author | Asaad Mahmood <asaadmahmood@users.noreply.github.com> | 2017-05-10 18:48:22 +0500 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2017-05-10 09:48:22 -0400 |
| commit | b868aa1dc7af16ddea8f65ed60683a6f440567ec (patch) | |
| tree | 823f8b19802d78198dcc7032d07f999d1b3c73be /webapp/components/login | |
| parent | 9625362494888c9423bb6503b7e18557b6b9cc79 (diff) | |
| download | chat-b868aa1dc7af16ddea8f65ed60683a6f440567ec.tar.gz chat-b868aa1dc7af16ddea8f65ed60683a6f440567ec.tar.bz2 chat-b868aa1dc7af16ddea8f65ed60683a6f440567ec.zip | |
Fixes for RC1 (#6376)
* PLT-6505 - Fixing z-index for post control menu
* PLT-6507 - Channel header icons not aligned
* PLT-6508 - Options popover issue on android
* PLT-6528 - Removing cross contamination on badge
* PLT-6535 - Aligning content in SSO buttons
* PLT-6509 - Aligning dropdown close icon
Diffstat (limited to 'webapp/components/login')
| -rw-r--r-- | webapp/components/login/login_controller.jsx | 42 |
1 files changed, 25 insertions, 17 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> ); |