diff --git a/.circleci/config.yml b/.circleci/config.yml index 8d4e5b3fd1..8c9b2f2d61 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -260,7 +260,6 @@ workflows: branches: only: - develop - - bug-bash-develop-sync # Production builds are exectuted # when PR is merged to the master # Don't change anything in this configuration diff --git a/src/shared/components/Settings/Account/MyAccount/index.jsx b/src/shared/components/Settings/Account/MyAccount/index.jsx index 33867791f8..b7e688ba22 100644 --- a/src/shared/components/Settings/Account/MyAccount/index.jsx +++ b/src/shared/components/Settings/Account/MyAccount/index.jsx @@ -362,8 +362,8 @@ export default class MyAccount extends ConsentComponent { newEmail, currentEmail, btnChangeEmailVisible, - btnVerifiEmailVisible, - btnVerifiAgainlVisible, + // btnVerifiEmailVisible, + // btnVerifiAgainlVisible, focus, hasLength, hasLetter, @@ -377,11 +377,11 @@ export default class MyAccount extends ConsentComponent { isMobileView, showRePasswordTips, rePasswordValid, - isValidEmail, + // isValidEmail, isOpen, } = this.state; - const { updatingPassword, updatingProfile, isEmailConflict = false } = profileState; + const { updatingPassword, /* updatingProfile, */ isEmailConflict = false } = profileState; const { incorrectPassword } = settingsPageState; return ( @@ -481,8 +481,13 @@ export default class MyAccount extends ConsentComponent { ) } + { /* TEMPORARY DISABLE CHANGE E-MAIL - community-app#5107
-
+
-
+
-
+
-
+
+ */} ) : (
@@ -582,8 +600,11 @@ export default class MyAccount extends ConsentComponent {
) } + {/* TEMPORARY DISABLE CHANGE E-MAIL - community-app#5107
-
+
-
+
-
+
-
+
+ */} ) } diff --git a/src/shared/components/Terms/TermDetails.scss b/src/shared/components/Terms/TermDetails.scss index 675274ce3b..93ddaf3a90 100644 --- a/src/shared/components/Terms/TermDetails.scss +++ b/src/shared/components/Terms/TermDetails.scss @@ -40,6 +40,44 @@ br + br { display: none; } + + ol { + margin: 0 0 5px; + counter-reset: item; + font-size: 15px; + color: $tc-gray-90; + line-height: 25px; + display: table; + + li { + list-style-type: none; + font-weight: 400; + counter-increment: item; + display: table-row; + white-space: normal; + + &::before { + display: table-cell; + font-weight: 700; + text-align: right; + content: counter(item) "."; + padding: 0 10px 0 0; + width: 32px; + } + } + } + + ul { + margin: 0 0 5px 20px; + font-size: 15px; + color: $tc-gray-90; + line-height: 25px; + list-style: disc outside none; + + li { + font-weight: 400; + } + } } .frame {