Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/domains/misc/components/Layout/Layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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')};
`;
Expand Down
6 changes: 3 additions & 3 deletions src/domains/misc/components/Layout/TopBar/Brand.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down Expand Up @@ -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;
}
`;
8 changes: 6 additions & 2 deletions src/domains/misc/components/Layout/TopBar/TopBar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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 = () => {
Expand Down Expand Up @@ -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`
Expand Down
5 changes: 3 additions & 2 deletions src/domains/misc/components/Layout/TopBar/consts.ts
Original file line number Diff line number Diff line change
@@ -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';
6 changes: 2 additions & 4 deletions src/domains/misc/components/Layout/TopBar/logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
41 changes: 16 additions & 25 deletions src/domains/misc/components/Layout/TopBar/logoType.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.