Skip to content

Commit 3029221

Browse files
authored
Merge pull request #98 from Cardinal-Cryptography/SD-106-update-logos
2 parents 3cfaea3 + 47baf6e commit 3029221

File tree

6 files changed

+31
-36
lines changed

6 files changed

+31
-36
lines changed

src/domains/misc/components/Layout/Layout.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ const BottomNavigationContainer = styled.div`
9494
width: 100%;
9595
9696
background: ${vars('--color-neutral-background-2-rest')};
97+
overflow: hidden;
9798
9899
border-top: 1px solid ${vars('--color-neutral-stroke-2-rest')};
99100
`;

src/domains/misc/components/Layout/TopBar/Brand.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import styled from 'styled-components';
22

33
import vars from 'src/domains/styling/utils/vars';
44

5-
import { BRAND_CONTAINER_TITLE, BRAND_LOGO_WIDTH_DESKTOP } from './consts';
5+
import { BRAND_CONTAINER_TITLE, BRAND_LOGO_WIDTH_MOBILE } from './consts';
66
import LogoSvg from './logo.svg?react';
77
import LogoTypeSvg from './logoType.svg?react';
88

@@ -32,13 +32,13 @@ const Container = styled.div`
3232
const MobileLogo = styled(LogoSvg)`
3333
display: none;
3434
35-
@container ${BRAND_CONTAINER_TITLE} (max-width: ${BRAND_LOGO_WIDTH_DESKTOP}) { /* stylelint-disable-line at-rule-prelude-no-invalid */
35+
@container ${BRAND_CONTAINER_TITLE} (max-width: ${BRAND_LOGO_WIDTH_MOBILE}) { /* stylelint-disable-line at-rule-prelude-no-invalid */
3636
display: block;
3737
}
3838
`;
3939

4040
const DesktopLogo = styled(LogoTypeSvg)`
41-
@container ${BRAND_CONTAINER_TITLE} (max-width: ${BRAND_LOGO_WIDTH_DESKTOP}) { /* stylelint-disable-line at-rule-prelude-no-invalid */
41+
@container ${BRAND_CONTAINER_TITLE} (max-width: ${BRAND_LOGO_WIDTH_MOBILE}) { /* stylelint-disable-line at-rule-prelude-no-invalid */
4242
display: none;
4343
}
4444
`;

src/domains/misc/components/Layout/TopBar/TopBar.tsx

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import Navigation from '../Navigation';
1515

1616
import Brand from './Brand';
1717
import * as NavBox from './NavBox';
18-
import { BRAND_CONTAINER_TITLE, BRAND_LOGO_HEIGHT } from './consts';
18+
import { BRAND_CONTAINER_TITLE, BRAND_LOGO_HEIGHT_DESKTOP, BRAND_LOGO_HEIGHT_MOBILE } from './consts';
1919
import UserIcon from './userIcon.svg?react';
2020

2121
const TopBar = () => {
@@ -70,9 +70,13 @@ export default TopBar;
7070

7171
const StyledBrand = styled(Brand)`
7272
margin-left: 8px;
73-
height: ${BRAND_LOGO_HEIGHT};
73+
height: ${BRAND_LOGO_HEIGHT_DESKTOP};
7474
7575
flex-shrink: 0;
76+
77+
@media (width <= ${BOTTOM_MENU_BREAKPOINT}) { /* stylelint-disable-line media-query-no-invalid */
78+
height: ${BRAND_LOGO_HEIGHT_MOBILE};
79+
}
7680
`;
7781

7882
const BrandContainer = styled.div`
Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
export const BRAND_CONTAINER_TITLE = 'brandcontainer';
2-
export const BRAND_LOGO_WIDTH_DESKTOP = '150px';
3-
export const BRAND_LOGO_HEIGHT = '18px';
2+
export const BRAND_LOGO_WIDTH_MOBILE = '175px';
3+
export const BRAND_LOGO_HEIGHT_DESKTOP = '39px';
4+
export const BRAND_LOGO_HEIGHT_MOBILE = '32px';
Lines changed: 2 additions & 4 deletions
Loading
Lines changed: 16 additions & 25 deletions
Loading

0 commit comments

Comments
 (0)