Skip to content

Commit 640e8ca

Browse files
authored
Merge pull request conventional-changelog#94 from verdaccio/89-fix-incorrect-logos-style
fix: incorrect logos styles
2 parents 50664dc + 0d00ab4 commit 640e8ca

File tree

4 files changed

+19
-10
lines changed

4 files changed

+19
-10
lines changed

src/components/Loading/Loading.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
import React from 'react';
22

3-
import Logo from '../Logo';
3+
import Logo, { Size } from '../Logo';
44
import Spinner from '../Spinner';
55

66
import { Wrapper, Badge } from './styles';
77

88
const Loading: React.FC = () => (
99
<Wrapper>
1010
<Badge>
11-
<Logo />
11+
<Logo size={Size.Big} />
1212
</Badge>
1313
<Spinner />
1414
</Wrapper>
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
// Jest Snapshot v1, https://goo.gl/fbAQLP
22

3-
exports[`<Loading /> component should render the component in default state 1`] = `"<div class=\\"css-1221txa eimgwje0\\"><div class=\\"css-bxochs eimgwje1\\"><div class=\\"css-1tnu3ib em793ed0\\"></div></div><div class=\\"css-vqrgi e1ag4h8b0\\"><div class=\\"MuiCircularProgress-root-1 MuiCircularProgress-colorPrimary-4 MuiCircularProgress-indeterminate-3 css-15gl0ho e1ag4h8b1\\" style=\\"width:50px;height:50px\\" role=\\"progressbar\\"><svg class=\\"MuiCircularProgress-svg-6\\" viewBox=\\"22 22 44 44\\"><circle class=\\"MuiCircularProgress-circle-7 MuiCircularProgress-circleIndeterminate-9\\" cx=\\"44\\" cy=\\"44\\" r=\\"20.2\\" fill=\\"none\\" stroke-width=\\"3.6\\"></circle></svg></div></div></div>"`;
3+
exports[`<Loading /> component should render the component in default state 1`] = `"<div class=\\"css-1221txa eimgwje0\\"><div class=\\"css-bxochs eimgwje1\\"><div class=\\"css-kt1gx0 em793ed0\\"></div></div><div class=\\"css-vqrgi e1ag4h8b0\\"><div class=\\"MuiCircularProgress-root-1 MuiCircularProgress-colorPrimary-4 MuiCircularProgress-indeterminate-3 css-15gl0ho e1ag4h8b1\\" style=\\"width:50px;height:50px\\" role=\\"progressbar\\"><svg class=\\"MuiCircularProgress-svg-6\\" viewBox=\\"22 22 44 44\\"><circle class=\\"MuiCircularProgress-circle-7 MuiCircularProgress-circleIndeterminate-9\\" cx=\\"44\\" cy=\\"44\\" r=\\"20.2\\" fill=\\"none\\" stroke-width=\\"3.6\\"></circle></svg></div></div></div>"`;

src/components/Logo/Logo.tsx

+15-6
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,16 @@ import React from 'react';
33
import styled from 'react-emotion';
44
import logo from './img/logo.svg';
55

6-
const StyledLogo = styled('div')`
6+
export enum Size {
7+
Small = '40px',
8+
Big = '90px',
9+
}
10+
11+
interface Props {
12+
size?: Size;
13+
}
14+
15+
const StyledLogo = styled('div')<Props>`
716
&& {
817
display: inline-block;
918
vertical-align: middle;
@@ -12,11 +21,11 @@ const StyledLogo = styled('div')`
1221
background-size: contain;
1322
background-image: url(${logo});
1423
background-repeat: no-repeat;
15-
width: 40px;
16-
height: 40px;`;
17-
18-
const Logo: React.FC = () => {
19-
return <StyledLogo />;
24+
width: ${({ size }) => size};
25+
height: ${({ size }) => size};
26+
`;
27+
const Logo: React.FC<Props> = ({ size = Size.Small }) => {
28+
return <StyledLogo size={size} />;
2029
};
2130

2231
export default Logo;

src/components/Logo/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
export { default } from './Logo';
1+
export { default, Size } from './Logo';

0 commit comments

Comments
 (0)