diff --git a/frontend/src/components/user-settings/delete-account.js b/frontend/src/components/user-settings/delete-account.js index db7e2ed808..b3d19c9038 100644 --- a/frontend/src/components/user-settings/delete-account.js +++ b/frontend/src/components/user-settings/delete-account.js @@ -35,7 +35,7 @@ class DeleteAccount extends React.Component {

{gettext('Delete Account')}

{gettext('This operation will not be reverted. Please think twice!')}

- +
{this.state.isConfirmDialogOpen && ( diff --git a/frontend/src/components/user-settings/language-setting.js b/frontend/src/components/user-settings/language-setting.js index 708ced5b43..27d9360a60 100644 --- a/frontend/src/components/user-settings/language-setting.js +++ b/frontend/src/components/user-settings/language-setting.js @@ -1,6 +1,5 @@ import React from 'react'; import Select from 'react-select'; -import { Dropdown, DropdownToggle, DropdownMenu, DropdownItem } from 'reactstrap'; import { gettext, siteRoot } from '../../utils/constants'; const { diff --git a/frontend/src/components/user-settings/social-login.js b/frontend/src/components/user-settings/social-login.js index 565fc17c12..1c5ce02d01 100644 --- a/frontend/src/components/user-settings/social-login.js +++ b/frontend/src/components/user-settings/social-login.js @@ -39,8 +39,8 @@ class SocialLogin extends React.Component {

{gettext('Social Login')}

{langCode == 'zh-cn' ? '企业微信': 'WeChat Work'}

{socialConnected ? - {gettext('Disconnect')} : - {gettext('Connect')} + {gettext('Disconnect')} : + {gettext('Connect')} } {this.state.isConfirmDialogOpen && ( diff --git a/frontend/src/components/user-settings/user-basic-info-form.js b/frontend/src/components/user-settings/user-basic-info-form.js index fee084ea3c..19e42c84b1 100644 --- a/frontend/src/components/user-settings/user-basic-info-form.js +++ b/frontend/src/components/user-settings/user-basic-info-form.js @@ -79,7 +79,7 @@ class UserBasicInfoForm extends React.Component {
-

{gettext('You can use this field at login.')}

+

{gettext('You can use this field at login.')}

)} @@ -89,7 +89,7 @@ class UserBasicInfoForm extends React.Component {
-

{gettext('Your notifications will be sent to this email.')}

+

{gettext('Your notifications will be sent to this email.')}

)} diff --git a/frontend/src/css/user-settings.css b/frontend/src/css/user-settings.css index 797f004a95..2eace6ca3c 100644 --- a/frontend/src/css/user-settings.css +++ b/frontend/src/css/user-settings.css @@ -30,7 +30,7 @@ body { margin:0; } .content { - padding: 0rem 1rem; + padding: 0rem 1rem 8rem; overflow: auto; } .setting-item { @@ -64,7 +64,7 @@ body { flex: auto; margin: 0; padding-left: 1em; - border-left: 1px solid transparent; + border-left: 2px solid transparent; color: #333; } .user-setting-nav .nav-item.active .nav-link { @@ -77,3 +77,7 @@ body { .eye-icon { color: #666; } +.input-tip { + padding-top: calc(0.375rem + 1px); + color: #666; +}