UI fix for errors in signup and login pages and adding space between buttons in the security tab (#3512)
* Fixing the errors style on login and signup pages * Adding space between login options in the security section
Этот коммит содержится в:
коммит произвёл
Corey Hulen
родитель
31a0f65973
Коммит
3eee51f74e
@@ -551,7 +551,7 @@ class SecurityTab extends React.Component {
|
||||
}
|
||||
|
||||
emailOption = (
|
||||
<div>
|
||||
<div className='padding-bottom x2'>
|
||||
<Link
|
||||
className='btn btn-primary'
|
||||
to={link}
|
||||
@@ -569,7 +569,7 @@ class SecurityTab extends React.Component {
|
||||
let gitlabOption;
|
||||
if (global.window.mm_config.EnableSignUpWithGitLab === 'true' && user.auth_service === '') {
|
||||
gitlabOption = (
|
||||
<div>
|
||||
<div className='padding-bottom x2'>
|
||||
<Link
|
||||
className='btn btn-primary'
|
||||
to={'/claim/email_to_oauth?email=' + encodeURIComponent(user.email) + '&old_type=' + user.auth_service + '&new_type=' + Constants.GITLAB_SERVICE}
|
||||
@@ -587,7 +587,7 @@ class SecurityTab extends React.Component {
|
||||
let googleOption;
|
||||
if (global.window.mm_config.EnableSignUpWithGoogle === 'true' && user.auth_service === '') {
|
||||
googleOption = (
|
||||
<div>
|
||||
<div className='padding-bottom x2'>
|
||||
<Link
|
||||
className='btn btn-primary'
|
||||
to={'/' + teamName + '/claim/email_to_oauth?email=' + encodeURIComponent(user.email) + '&old_type=' + user.auth_service + '&new_type=' + Constants.GOOGLE_SERVICE}
|
||||
@@ -605,7 +605,7 @@ class SecurityTab extends React.Component {
|
||||
let ldapOption;
|
||||
if (global.window.mm_config.EnableLdap === 'true' && user.auth_service === '') {
|
||||
ldapOption = (
|
||||
<div>
|
||||
<div className='padding-bottom x2'>
|
||||
<Link
|
||||
className='btn btn-primary'
|
||||
to={'/claim/email_to_ldap?email=' + encodeURIComponent(user.email)}
|
||||
@@ -623,7 +623,7 @@ class SecurityTab extends React.Component {
|
||||
let samlOption;
|
||||
if (global.window.mm_config.EnableSaml === 'true' && user.auth_service === '') {
|
||||
samlOption = (
|
||||
<div>
|
||||
<div className='padding-bottom x2'>
|
||||
<Link
|
||||
className='btn btn-primary'
|
||||
to={'/claim/email_to_oauth?email=' + encodeURIComponent(user.email) + '&old_type=' + user.auth_service + '&new_type=' + Constants.SAML_SERVICE}
|
||||
@@ -643,7 +643,6 @@ class SecurityTab extends React.Component {
|
||||
<div key='userSignInOption'>
|
||||
{emailOption}
|
||||
{gitlabOption}
|
||||
<br/>
|
||||
{ldapOption}
|
||||
{samlOption}
|
||||
{googleOption}
|
||||
|
||||
Ссылка в новой задаче
Block a user