diff --git a/src/components/Button/Button.tsx b/src/components/Button/Button.tsx index e8cc016..db94951 100644 --- a/src/components/Button/Button.tsx +++ b/src/components/Button/Button.tsx @@ -32,7 +32,7 @@ const Button = ({ label, onClick, buttonType, Icon }: IButton) => { onClick={onClick} > {Icon && Icon} - {label} + {label && {label}} ) } diff --git a/src/components/Button/__tests__/Button.stories.tsx b/src/components/Button/__tests__/Button.stories.tsx index 0ac7bde..cf4283e 100644 --- a/src/components/Button/__tests__/Button.stories.tsx +++ b/src/components/Button/__tests__/Button.stories.tsx @@ -41,6 +41,12 @@ Secondary.args = { buttonType: ButtonType.Secondary, } +export const IconRound = Template.bind({}) +IconRound.args = { + Icon: , + buttonType: ButtonType.IconRound, +} + export const PrimaryWithIcon = Template.bind({}) PrimaryWithIcon.args = { label: 'Primary Ic', @@ -54,9 +60,3 @@ SecondaryWithIcon.args = { buttonType: ButtonType.Secondary, Icon: , } - -export const IconRound = Template.bind({}) -IconRound.args = { - ButtonType: ButtonType.IconRound, - Icon: , -} diff --git a/src/components/Button/button.scss b/src/components/Button/button.scss index 9078878..14e1cae 100644 --- a/src/components/Button/button.scss +++ b/src/components/Button/button.scss @@ -15,6 +15,8 @@ font-size: 1.2vw; font-weight: 500; line-height: 2.4rem; + font-family: 'Netflix Sans', 'Helvetica Neue', 'Segoe UI', 'Roboto', 'Ubuntu', + 'sans-serif'; @include responsive(phone) { top: 24rem; @@ -22,21 +24,22 @@ &.with-icon { display: flex; - justify-content: center; align-items: center; - align-self: center; & > * { - width: 24px; height: 24px; fill: #fff; - margin-right: 1rem; } } &.with-label { padding-left: 2.4rem; - padding-right: 2.4rem; + padding-right: 2.8rem; + + & > span { + margin-left: 1rem; + font-weight: 500; + } } &.Primary { @@ -101,11 +104,20 @@ } &.IconRound { + border-radius: 50%; + display: flex; + height: 42px; + width: 42px; + border: 2px solid rgba(255, 255, 255, 0.7); + color: white; background-color: rgba(42, 42, 42, 0.6); border-color: hsla(0, 0%, 100%, 0.5); border-width: 2px; + & > * { fill: #fff; + height: 100%; + width: 100%; } } } diff --git a/src/components/Footer.tsx b/src/components/Footer.tsx index bdffbed..5f1817b 100644 --- a/src/components/Footer.tsx +++ b/src/components/Footer.tsx @@ -1,4 +1,6 @@ import React from 'react' +import Button, { ButtonType } from './Button/Button' +import AddLogo from '../static/images/add.svg' const footer = () => (
@@ -8,8 +10,8 @@ const footer = () => ( className='footer__copyright--link' href='https://github.com/devandres-tech' > - {' '} - Dev Andres +
diff --git a/src/components/Header.tsx b/src/components/Header.tsx index 9d56686..f32b880 100644 --- a/src/components/Header.tsx +++ b/src/components/Header.tsx @@ -29,7 +29,7 @@ const Header = ({ name, overview }: IHeader) => { url='https://vimeo.com/384025132' />

{name}

-