From 47baf6efadffbe825f7c192fbaadee0436b585f0 Mon Sep 17 00:00:00 2001 From: rAskVAL Date: Wed, 16 Jul 2025 12:20:10 +0300 Subject: [PATCH] SD-106: Update logos --- src/domains/misc/components/Layout/Layout.tsx | 1 + .../misc/components/Layout/TopBar/Brand.tsx | 6 +-- .../misc/components/Layout/TopBar/TopBar.tsx | 8 +++- .../misc/components/Layout/TopBar/consts.ts | 5 ++- .../misc/components/Layout/TopBar/logo.svg | 6 +-- .../components/Layout/TopBar/logoType.svg | 41 ++++++++----------- 6 files changed, 31 insertions(+), 36 deletions(-) diff --git a/src/domains/misc/components/Layout/Layout.tsx b/src/domains/misc/components/Layout/Layout.tsx index 508fe8f..04864c3 100644 --- a/src/domains/misc/components/Layout/Layout.tsx +++ b/src/domains/misc/components/Layout/Layout.tsx @@ -94,6 +94,7 @@ const BottomNavigationContainer = styled.div` width: 100%; background: ${vars('--color-neutral-background-2-rest')}; + overflow: hidden; border-top: 1px solid ${vars('--color-neutral-stroke-2-rest')}; `; diff --git a/src/domains/misc/components/Layout/TopBar/Brand.tsx b/src/domains/misc/components/Layout/TopBar/Brand.tsx index 481d9a3..7b16f7b 100644 --- a/src/domains/misc/components/Layout/TopBar/Brand.tsx +++ b/src/domains/misc/components/Layout/TopBar/Brand.tsx @@ -2,7 +2,7 @@ import styled from 'styled-components'; import vars from 'src/domains/styling/utils/vars'; -import { BRAND_CONTAINER_TITLE, BRAND_LOGO_WIDTH_DESKTOP } from './consts'; +import { BRAND_CONTAINER_TITLE, BRAND_LOGO_WIDTH_MOBILE } from './consts'; import LogoSvg from './logo.svg?react'; import LogoTypeSvg from './logoType.svg?react'; @@ -32,13 +32,13 @@ const Container = styled.div` const MobileLogo = styled(LogoSvg)` display: none; - @container ${BRAND_CONTAINER_TITLE} (max-width: ${BRAND_LOGO_WIDTH_DESKTOP}) { /* stylelint-disable-line at-rule-prelude-no-invalid */ + @container ${BRAND_CONTAINER_TITLE} (max-width: ${BRAND_LOGO_WIDTH_MOBILE}) { /* stylelint-disable-line at-rule-prelude-no-invalid */ display: block; } `; const DesktopLogo = styled(LogoTypeSvg)` - @container ${BRAND_CONTAINER_TITLE} (max-width: ${BRAND_LOGO_WIDTH_DESKTOP}) { /* stylelint-disable-line at-rule-prelude-no-invalid */ + @container ${BRAND_CONTAINER_TITLE} (max-width: ${BRAND_LOGO_WIDTH_MOBILE}) { /* stylelint-disable-line at-rule-prelude-no-invalid */ display: none; } `; diff --git a/src/domains/misc/components/Layout/TopBar/TopBar.tsx b/src/domains/misc/components/Layout/TopBar/TopBar.tsx index 1d8c3c0..cfd0c38 100644 --- a/src/domains/misc/components/Layout/TopBar/TopBar.tsx +++ b/src/domains/misc/components/Layout/TopBar/TopBar.tsx @@ -15,7 +15,7 @@ import Navigation from '../Navigation'; import Brand from './Brand'; import * as NavBox from './NavBox'; -import { BRAND_CONTAINER_TITLE, BRAND_LOGO_HEIGHT } from './consts'; +import { BRAND_CONTAINER_TITLE, BRAND_LOGO_HEIGHT_DESKTOP, BRAND_LOGO_HEIGHT_MOBILE } from './consts'; import UserIcon from './userIcon.svg?react'; const TopBar = () => { @@ -70,9 +70,13 @@ export default TopBar; const StyledBrand = styled(Brand)` margin-left: 8px; - height: ${BRAND_LOGO_HEIGHT}; + height: ${BRAND_LOGO_HEIGHT_DESKTOP}; flex-shrink: 0; + + @media (width <= ${BOTTOM_MENU_BREAKPOINT}) { /* stylelint-disable-line media-query-no-invalid */ + height: ${BRAND_LOGO_HEIGHT_MOBILE}; + } `; const BrandContainer = styled.div` diff --git a/src/domains/misc/components/Layout/TopBar/consts.ts b/src/domains/misc/components/Layout/TopBar/consts.ts index 1740d59..5e590a3 100644 --- a/src/domains/misc/components/Layout/TopBar/consts.ts +++ b/src/domains/misc/components/Layout/TopBar/consts.ts @@ -1,3 +1,4 @@ export const BRAND_CONTAINER_TITLE = 'brandcontainer'; -export const BRAND_LOGO_WIDTH_DESKTOP = '150px'; -export const BRAND_LOGO_HEIGHT = '18px'; +export const BRAND_LOGO_WIDTH_MOBILE = '175px'; +export const BRAND_LOGO_HEIGHT_DESKTOP = '39px'; +export const BRAND_LOGO_HEIGHT_MOBILE = '32px'; diff --git a/src/domains/misc/components/Layout/TopBar/logo.svg b/src/domains/misc/components/Layout/TopBar/logo.svg index d65d29b..4557ad7 100644 --- a/src/domains/misc/components/Layout/TopBar/logo.svg +++ b/src/domains/misc/components/Layout/TopBar/logo.svg @@ -1,5 +1,3 @@ - - + + diff --git a/src/domains/misc/components/Layout/TopBar/logoType.svg b/src/domains/misc/components/Layout/TopBar/logoType.svg index 9aaf90d..8ea3e3f 100644 --- a/src/domains/misc/components/Layout/TopBar/logoType.svg +++ b/src/domains/misc/components/Layout/TopBar/logoType.svg @@ -1,30 +1,21 @@ - - - - - - - - - + + + + + + + + + + + + + + - - + +