From d7bdee36bfdb10298eb4d562f0d5e4825a251f2c Mon Sep 17 00:00:00 2001 From: SergeyEzhin Date: Tue, 20 Dec 2022 18:52:16 +0400 Subject: [PATCH] [common] For Bug 59787 --- apps/common/mobile/lib/view/About.jsx | 129 +++++++++--------- .../resources/img/about/logo-new-white.svg | 24 ++++ .../mobile/resources/img/about/logo-new.svg | 24 ++++ apps/common/mobile/resources/less/about.less | 107 ++++++++------- .../mobile/resources/less/common-ios.less | 6 - apps/common/mobile/resources/less/common.less | 11 -- 6 files changed, 168 insertions(+), 133 deletions(-) create mode 100644 apps/common/mobile/resources/img/about/logo-new-white.svg create mode 100644 apps/common/mobile/resources/img/about/logo-new.svg diff --git a/apps/common/mobile/lib/view/About.jsx b/apps/common/mobile/lib/view/About.jsx index 00910018ef..cb7e941147 100644 --- a/apps/common/mobile/lib/view/About.jsx +++ b/apps/common/mobile/lib/view/About.jsx @@ -2,6 +2,7 @@ import React, { Fragment } from 'react'; import { observer, inject } from "mobx-react"; import { Page, Navbar, Link } from "framework7-react"; import { useTranslation } from "react-i18next"; +import { Device } from '../../utils/device'; const PageAbout = props => { const { t } = useTranslation(); @@ -18,7 +19,7 @@ const PageAbout = props => { const infoCustomer = customer ? customer.info : null; const logoCustomer = customer ? customer.logo : null; - const publisherUrl = __PUBLISHER_URL__, + const publisherUrl = __PUBLISHER_URL__, publisherPrintUrl = publisherUrl.replace(/https?:\/{2}|\/$/g,""); const publisherName = __PUBLISHER_NAME__.replace(/\\"/g, '"'); @@ -31,93 +32,87 @@ const PageAbout = props => { const nameEditor = (_t.textEditor || editors[editorType]).toUpperCase(); return ( - + {licInfo && typeof licInfo == 'object' && typeof(customer) == 'object' ? ( -
+
{logoCustomer && logoCustomer.length ? ( - -
-

{nameEditor}

-

{_t.textVersion} {__PRODUCT_VERSION__}

+
+

{nameEditor}

+

{_t.textVersion} {__PRODUCT_VERSION__}

-
- {nameCustomer && nameCustomer.length ? ( -

{nameCustomer}

- ) : null} - {addressCustomer && addressCustomer.length ? ( -

- + {mailCustomer || phoneCustomer ? ( +

+ {mailCustomer && mailCustomer.length ? ( +

+ {mailCustomer} +

+ ) : null} + {phoneCustomer && phoneCustomer.length ? ( +

+ {phoneCustomer} +

+ ) : null} +
+ ) : null} + {addressCustomer && addressCustomer.length ? ( +
+

{addressCustomer}

+
+ ) : null} + {nameCustomer || infoCustomer || urlCustomer ? ( +
+ {nameCustomer && nameCustomer.length ? ( +

{nameCustomer}

+ ) : null} + {infoCustomer && infoCustomer.length ? ( +

{infoCustomer}

+ ) : null} + {urlCustomer && urlCustomer.length ? ( +

+ + {urlCustomer} + +

) : null} - {mailCustomer && mailCustomer.length ? ( -

- - {mailCustomer} -

- ) : null} - {phoneCustomer && phoneCustomer.length ? ( -

- - {phoneCustomer} -

- ) : null} - - {urlCustomer && urlCustomer.length ? ( -

- - {urlCustomer} - -

- ) : null} - {infoCustomer && infoCustomer.length ? ( -

- -

- ) : null} -
-
-
-

- +

+ ) : null} +
+

+ {__PUBLISHER_ADDRESS__}

-

{publisherName}

-

+

+
+

{publisherName}

+

{publisherPrintUrl}

) : ( -
-
+
+
+

{nameEditor}

+

{_t.textVersion} {__PRODUCT_VERSION__}

-
-

{nameEditor}

-

{_t.textVersion} {__PRODUCT_VERSION__}

+
+

+ {__PUBLISHER_ADDRESS__} +

-
-

{publisherName}

-

- - {__PUBLISHER_ADDRESS__} -

-

- - {__SUPPORT_EMAIL__} -

-

- - {__PUBLISHER_PHONE__} -

-

+

+

{publisherName}

+

{publisherPrintUrl}

diff --git a/apps/common/mobile/resources/img/about/logo-new-white.svg b/apps/common/mobile/resources/img/about/logo-new-white.svg new file mode 100644 index 0000000000..93c0ae388a --- /dev/null +++ b/apps/common/mobile/resources/img/about/logo-new-white.svg @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/apps/common/mobile/resources/img/about/logo-new.svg b/apps/common/mobile/resources/img/about/logo-new.svg new file mode 100644 index 0000000000..e487eb80e7 --- /dev/null +++ b/apps/common/mobile/resources/img/about/logo-new.svg @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/apps/common/mobile/resources/less/about.less b/apps/common/mobile/resources/less/about.less index 7b5e3f1e80..cdf371e471 100644 --- a/apps/common/mobile/resources/less/about.less +++ b/apps/common/mobile/resources/less/about.less @@ -2,65 +2,74 @@ // @common-image-path - defined in webpack config .about { + padding-bottom: 30px; + .page-content { text-align: center /*rtl:ignore*/; - } - - .content-block:first-child { - margin: 15px 0 /*rtl:append20px*/; - } - - .content-block { - margin: 0 auto 15px; - - a { - color: @text-normal; - } - } - - .settings-about-logo { display: flex; - justify-content: center; - img { - max-width: 100%; - height: auto; - } + flex-direction: column; } - h3 { - font-weight: normal; - margin: 0; - color: @text-secondary; - - &.vendor { - color: @text-normal; - font-weight: bold; - margin-top: 15px; - } + &_phone { + padding-top: 178px; } - p > label { - color: @text-normal; - margin-right: 5px; - color: @text-secondary; - } - - .logo { - display: inline-block; - width: 100%; - height: 55px; - background: ~"url(@{common-image-path}/about/logo_s.svg) no-repeat center"; - } - - .theme-type-dark { - .about .logo { - background: ~"url(@{common-image-path}/about/logo-white_s.svg) no-repeat center"; - } + &_tablet { + // padding-top: 104px; + padding-top: 12px; + padding-bottom: 12px; } + + &__text { + font-style: normal; + font-weight: 400; + font-size: 12px; + line-height: 16px; + text-align: center; + color: @text-normal; + margin: 0; + } + + a { + color: @brandColor; + } + + .logo-block { + &__elem { + display: flex; + justify-content: center; + img { + max-width: 100%; + height: auto; + } + } + } + + &__logo { + width: 100%; + height: 80px; + background: ~"url(@{common-image-path}/about/logo-new.svg) no-repeat center"; + } + + &__editor { + flex-grow: 1; + margin-top: 20px; + } + + &__contacts { + text-align: center; + padding-left: 72px; + padding-right: 72px; + } + + &__licensor, &__customer { + text-align: center; + margin-top: 12px; + } } .theme-type-dark { - .about .logo { - background: ~"url(@{common-image-path}/about/logo-white_s.svg) no-repeat center"; + .about__logo { + background: ~"url(@{common-image-path}/about/logo-new-white.svg) no-repeat center"; } } \ No newline at end of file diff --git a/apps/common/mobile/resources/less/common-ios.less b/apps/common/mobile/resources/less/common-ios.less index dc3f735bcd..ff36bcc827 100644 --- a/apps/common/mobile/resources/less/common-ios.less +++ b/apps/common/mobile/resources/less/common-ios.less @@ -366,12 +366,6 @@ } } - .about { - .logo { - margin-top: 20px; - } - } - .content-block { color: @blockTitleColor; } diff --git a/apps/common/mobile/resources/less/common.less b/apps/common/mobile/resources/less/common.less index 0b4931c60e..dc970e4267 100644 --- a/apps/common/mobile/resources/less/common.less +++ b/apps/common/mobile/resources/less/common.less @@ -279,17 +279,6 @@ } } -.about { - .content-block { - margin: 0 auto 15px; - - p:last-child a{ - color: var(--brand-word); - text-decoration: underline; - } - } -} - .content-block { margin: 32px 0; padding: 0 16px;