diff --git a/apps/web/Components/Layout/Header.jsx b/apps/web/Components/Layout/Header.jsx index 3062640..126d243 100644 --- a/apps/web/Components/Layout/Header.jsx +++ b/apps/web/Components/Layout/Header.jsx @@ -22,7 +22,6 @@ const HeaderContent = styled(Flex)` `; const Wrapper = styled.header` - height: var(--height-header); position: sticky; top: 0; z-index: 999999; diff --git a/apps/web/Components/Layout/Logo.jsx b/apps/web/Components/Layout/Logo.jsx index 45c5a50..abb5479 100644 --- a/apps/web/Components/Layout/Logo.jsx +++ b/apps/web/Components/Layout/Logo.jsx @@ -34,8 +34,9 @@ const LogoText = styled.h3` const TagWrapper = styled.div` font-family: 'Montserrat'; font-weight: 500; - * { - font-size: 0.7rem; + + ${min('tablet')} { + margin: 0 5px; } `; @@ -43,12 +44,11 @@ const { COLOR_PRIMARY } = getColors(); const UnlimitedTag = observer(() => { const { $process } = useStore(); + if ($process.has('Unlimited')) { return ( - - без ограничений - + без ограничений ); } @@ -64,7 +64,7 @@ function Logo() { logo - + Лизинговый Калькулятор diff --git a/apps/web/Components/Layout/Navigation.tsx b/apps/web/Components/Layout/Navigation.tsx index 044bf94..a1c5375 100644 --- a/apps/web/Components/Layout/Navigation.tsx +++ b/apps/web/Components/Layout/Navigation.tsx @@ -2,7 +2,6 @@ import Background from './Background'; import type { MenuProps } from 'antd'; import Link from 'next/link'; import { useRouter } from 'next/router'; -import styled from 'styled-components'; import { Menu } from 'ui/elements'; import { AppstoreOutlined, SettingOutlined } from 'ui/elements/icons'; @@ -38,16 +37,12 @@ const items: MenuProps['items'] = [ }, ]; -const Wrapper = styled(Background)` - height: var(--height-navigation); -`; - export function AppNavigation() { const { pathname } = useRouter(); return ( - + - + ); } diff --git a/apps/web/styles/global-style.js b/apps/web/styles/global-style.js index fa78d86..691593a 100644 --- a/apps/web/styles/global-style.js +++ b/apps/web/styles/global-style.js @@ -1,5 +1,4 @@ import getColors from './colors'; -import { min } from '@/styles/mq'; import { createGlobalStyle } from 'styled-components'; const { COLOR_PRIMARY, COLOR_SECONDARY, COLOR_TERTIARTY } = getColors(); @@ -10,11 +9,6 @@ export const GlobalStyle = createGlobalStyle` --color-primary: ${COLOR_PRIMARY}; --color-secondary: ${COLOR_SECONDARY}; --color-tertiarty: ${COLOR_TERTIARTY}; - --height-navigation: 46px; - --height-header: 60px; - ${min('laptop')} { - --height-header: 74px; - } } /* Scroll bar stylings */