From 324b12a29e0e0340d6caccca85ca19640a6f7892 Mon Sep 17 00:00:00 2001 From: Artem Tarasov Date: Fri, 30 Oct 2020 10:01:19 +0300 Subject: [PATCH] Web: Client: Wizard: fixed styles --- .../src/components/pages/Wizard/index.js | 4 ++-- .../pages/Wizard/sub-components/button-container.js | 1 + .../pages/Wizard/sub-components/header-container.js | 2 +- .../pages/Wizard/sub-components/input-container.js | 13 +++++++++---- .../Wizard/sub-components/settings-container.js | 2 +- 5 files changed, 14 insertions(+), 8 deletions(-) diff --git a/web/ASC.Web.Client/src/components/pages/Wizard/index.js b/web/ASC.Web.Client/src/components/pages/Wizard/index.js index 6777821d2d..25f5d6b85f 100644 --- a/web/ASC.Web.Client/src/components/pages/Wizard/index.js +++ b/web/ASC.Web.Client/src/components/pages/Wizard/index.js @@ -49,10 +49,10 @@ emailSettings.allowDomainPunycode = true; const WizardContainer = styled.div` width: 960px; margin: 0 auto; - margin-top: 60px; + margin-top: 63px; .wizard-form { - margin-top: 32px; + margin-top: 33px; display: grid; grid-template-columns: 1fr; grid-row-gap: 32px; diff --git a/web/ASC.Web.Client/src/components/pages/Wizard/sub-components/button-container.js b/web/ASC.Web.Client/src/components/pages/Wizard/sub-components/button-container.js index ad65b82728..fca9bceb98 100644 --- a/web/ASC.Web.Client/src/components/pages/Wizard/sub-components/button-container.js +++ b/web/ASC.Web.Client/src/components/pages/Wizard/sub-components/button-container.js @@ -9,6 +9,7 @@ const { tablet } = utils.device; const StyledContainer = styled(Box)` width: 311px; margin: 0 auto; + margin-top: 1px; @media ${tablet} { width: 100%; diff --git a/web/ASC.Web.Client/src/components/pages/Wizard/sub-components/header-container.js b/web/ASC.Web.Client/src/components/pages/Wizard/sub-components/header-container.js index 4aaeae4dfd..61790a14a7 100644 --- a/web/ASC.Web.Client/src/components/pages/Wizard/sub-components/header-container.js +++ b/web/ASC.Web.Client/src/components/pages/Wizard/sub-components/header-container.js @@ -19,7 +19,7 @@ const StyledHeaderContainer = styled(Box)` .wizard-desc { text-align: center; - margin-top: 8px; + margin-top: 9px; } @media ${tablet} { diff --git a/web/ASC.Web.Client/src/components/pages/Wizard/sub-components/input-container.js b/web/ASC.Web.Client/src/components/pages/Wizard/sub-components/input-container.js index 093dac95c3..d237213274 100644 --- a/web/ASC.Web.Client/src/components/pages/Wizard/sub-components/input-container.js +++ b/web/ASC.Web.Client/src/components/pages/Wizard/sub-components/input-container.js @@ -22,7 +22,7 @@ const StyledContainer = styled(Box)` grid-row-gap: 16px; .generate-pass-link { - margin-bottom: 16px; + margin-bottom: 11px; } .wizard-checkbox { @@ -34,8 +34,13 @@ const StyledContainer = styled(Box)` vertical-align: middle; } + .wizard-checkbox svg { + margin-right: 8px; + } + .link { - vertical-align: middle; + vertical-align: -2px; + margin-top: 2px; } @media ${tablet} { @@ -83,7 +88,7 @@ const InputContainer = ({ tabIndex={1} size="large" scale={true} - placeholder={t("Email")} + placeholder={t("PlaceholderEmail")} emailSettings={settings} hasError={hasErrorEmail} onValidateInput={onEmailChangeHandler} @@ -134,7 +139,7 @@ const InputContainer = ({ refPassInput.current.onGeneratePassword()} > diff --git a/web/ASC.Web.Client/src/components/pages/Wizard/sub-components/settings-container.js b/web/ASC.Web.Client/src/components/pages/Wizard/sub-components/settings-container.js index 2334941717..3b84ffa1f1 100644 --- a/web/ASC.Web.Client/src/components/pages/Wizard/sub-components/settings-container.js +++ b/web/ASC.Web.Client/src/components/pages/Wizard/sub-components/settings-container.js @@ -24,7 +24,7 @@ const StyledContainer = styled(Box)` } .drop-down { - margin-left: 8px; + margin-left: 6px; } @media ${tablet} {