diff --git a/src/components/auth/Auth.scss b/src/components/auth/Auth.scss index f7745a2dd..498f3d8d8 100644 --- a/src/components/auth/Auth.scss +++ b/src/components/auth/Auth.scss @@ -98,14 +98,6 @@ .form { min-height: 26.25rem; } - - .Button { - margin-top: 2.75rem; - } - - .Button + .Button { - margin-top: 1rem; - } } #auth-code-form, @@ -139,6 +131,18 @@ } } +.auth-button { + margin-top: 2.5rem; +} + +.auth-button + .auth-button { + margin-top: 0.5rem; +} + +.auth-button.text + .auth-button.text { + margin-top: 0; +} + #auth-qr-form { .qr-outer { position: relative; diff --git a/src/components/auth/AuthPhoneNumber.tsx b/src/components/auth/AuthPhoneNumber.tsx index 5b9a045ba..02db92f7a 100644 --- a/src/components/auth/AuthPhoneNumber.tsx +++ b/src/components/auth/AuthPhoneNumber.tsx @@ -274,18 +274,38 @@ const AuthPhoneNumber: FC = ({ /> {canSubmit && ( isAuthReady ? ( - + ) : ( ) )} {isAuthReady && ( - )} {suggestedLanguage && suggestedLanguage !== language && continueText && ( - + )} diff --git a/src/components/auth/AuthQrCode.tsx b/src/components/auth/AuthQrCode.tsx index c7156df32..f13808631 100644 --- a/src/components/auth/AuthQrCode.tsx +++ b/src/components/auth/AuthQrCode.tsx @@ -190,10 +190,14 @@ const AuthCode = ({
  • {lang('LoginQRHelp3')}
  • {isAuthReady && ( - + )} {suggestedLanguage && suggestedLanguage !== language && continueText && ( - + )} diff --git a/src/components/common/Composer.scss b/src/components/common/Composer.scss index 54ee1ad1b..d0b529011 100644 --- a/src/components/common/Composer.scss +++ b/src/components/common/Composer.scss @@ -459,7 +459,7 @@ } .message-input-wrapper { - --action-button-size: var(--base-height, 3.5rem); + --action-button-size: var(--base-height, 3rem); --action-button-compact-fix: -1rem; display: flex; @@ -648,7 +648,7 @@ .input-scroller { overflow: hidden; - min-height: var(--base-height, 3.5rem); + min-height: var(--base-height, 3rem); max-height: 26rem; /* stylelint-disable-next-line plugin/no-low-performance-animation-properties */ @@ -709,7 +709,7 @@ overflow: hidden; height: auto; - padding: calc((var(--base-height, 3.5rem) - var(--composer-text-size, 1rem) * 1.375) / 2) 0.875rem; + padding: calc((var(--base-height, 3rem) - var(--composer-text-size, 1rem) * 1.375) / 2) 0.875rem; border: none !important; border-radius: 0 !important; @@ -847,7 +847,7 @@ .form-control { height: auto; margin-bottom: 0; - padding: calc((var(--base-height, 3.5rem) - var(--composer-text-size, 1rem) * 1.3125) / 2) 0; + padding: calc((var(--base-height, 3rem) - var(--composer-text-size, 1rem) * 1.3125) / 2) 0; line-height: 1.3125; white-space: pre-wrap; @@ -859,7 +859,7 @@ .forced-placeholder, .placeholder-text { - top: calc((var(--base-height, 3.5rem) - var(--composer-text-size, 1rem) * 1.3125) / 2); + top: calc((var(--base-height, 3rem) - var(--composer-text-size, 1rem) * 1.3125) / 2); @media (max-width: 600px) { top: calc((2.875rem - var(--composer-text-size, 1rem) * 1.3125) / 2); @@ -889,7 +889,7 @@ #caption-input-text { --margin-for-scrollbar: 2rem; .input-scroller { - min-height: var(--base-height, 3.5rem); + min-height: var(--base-height, 3rem); max-height: 10rem; margin-right: calc((var(--margin-for-scrollbar) + 1rem) * -1); @@ -933,11 +933,11 @@ } #caption-input-text .placeholder-text { - bottom: 1.0625rem; + bottom: 0.8125rem; } #story-input-text .placeholder-text { - top: calc((var(--base-height, 3.5rem) - var(--composer-text-size, 1rem) * 1.3125) / 2); + top: calc((var(--base-height, 3rem) - var(--composer-text-size, 1rem) * 1.3125) / 2); left: 0.875rem; &.is-need-premium { diff --git a/src/components/middle/HeaderActions.tsx b/src/components/middle/HeaderActions.tsx index 2154ec381..74deb98ba 100644 --- a/src/components/middle/HeaderActions.tsx +++ b/src/components/middle/HeaderActions.tsx @@ -331,7 +331,7 @@ const HeaderActions: FC = ({ <> {canExpandActions && !shouldSendJoinRequest && (canSubscribe || shouldJoinToSend) && (