Skip to content

Commit

Permalink
Merge pull request #1764 from natura-cosmeticos/DSY-3466
Browse files Browse the repository at this point in the history
refactor(natds-web): update logo Avon-v2 - Lib Legado
  • Loading branch information
Design-System-Natura authored Jul 12, 2023
2 parents 7758ac8 + 246da1d commit c706a1c
Show file tree
Hide file tree
Showing 12 changed files with 69 additions and 68 deletions.
2 changes: 1 addition & 1 deletion packages/styles/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
"codecov": "3.8.3"
},
"dependencies": {
"@naturacosmeticos/natds-themes": "0.54.0",
"@naturacosmeticos/natds-themes": "0.58.5",
"hex-to-rgba": "2.0.1"
},
"publishConfig": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -885,7 +885,7 @@ Object {
"lineHeight": 1.5,
},
"h2": Object {
"fontSize": 60,
"fontSize": 64,
"fontWeight": 400,
"letterSpacing": 0,
"lineHeight": 1.5,
Expand All @@ -897,9 +897,9 @@ Object {
"lineHeight": 1.5,
},
"h4": Object {
"fontSize": 34,
"fontSize": 32,
"fontWeight": 400,
"letterSpacing": 0.27,
"letterSpacing": 0,
"lineHeight": 1.5,
},
"h5": Object {
Expand Down Expand Up @@ -1802,7 +1802,7 @@ Object {
"lineHeight": 1.5,
},
"h2": Object {
"fontSize": 60,
"fontSize": 64,
"fontWeight": 400,
"letterSpacing": 0,
"lineHeight": 1.5,
Expand All @@ -1814,9 +1814,9 @@ Object {
"lineHeight": 1.5,
},
"h4": Object {
"fontSize": 34,
"fontSize": 32,
"fontWeight": 400,
"letterSpacing": 0.27,
"letterSpacing": 0,
"lineHeight": 1.5,
},
"h5": Object {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -877,7 +877,7 @@ Object {
"lineHeight": 1.5,
},
"h2": Object {
"fontSize": 60,
"fontSize": 64,
"fontWeight": 400,
"letterSpacing": 0,
"lineHeight": 1.5,
Expand All @@ -889,9 +889,9 @@ Object {
"lineHeight": 1.5,
},
"h4": Object {
"fontSize": 34,
"fontSize": 32,
"fontWeight": 400,
"letterSpacing": 0.27,
"letterSpacing": 0,
"lineHeight": 1.5,
},
"h5": Object {
Expand Down Expand Up @@ -1783,7 +1783,7 @@ Object {
"lineHeight": 1.5,
},
"h2": Object {
"fontSize": 60,
"fontSize": 64,
"fontWeight": 400,
"letterSpacing": 0,
"lineHeight": 1.5,
Expand All @@ -1795,9 +1795,9 @@ Object {
"lineHeight": 1.5,
},
"h4": Object {
"fontSize": 34,
"fontSize": 32,
"fontWeight": 400,
"letterSpacing": 0.27,
"letterSpacing": 0,
"lineHeight": 1.5,
},
"h5": Object {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -873,7 +873,7 @@ Object {
"lineHeight": 1.5,
},
"h2": Object {
"fontSize": 60,
"fontSize": 64,
"fontWeight": 400,
"letterSpacing": 0,
"lineHeight": 1.5,
Expand All @@ -885,9 +885,9 @@ Object {
"lineHeight": 1.5,
},
"h4": Object {
"fontSize": 34,
"fontSize": 32,
"fontWeight": 400,
"letterSpacing": 0.27,
"letterSpacing": 0,
"lineHeight": 1.5,
},
"h5": Object {
Expand Down Expand Up @@ -1778,7 +1778,7 @@ Object {
"lineHeight": 1.5,
},
"h2": Object {
"fontSize": 60,
"fontSize": 64,
"fontWeight": 400,
"letterSpacing": 0,
"lineHeight": 1.5,
Expand All @@ -1790,9 +1790,9 @@ Object {
"lineHeight": 1.5,
},
"h4": Object {
"fontSize": 34,
"fontSize": 32,
"fontWeight": 400,
"letterSpacing": 0.27,
"letterSpacing": 0,
"lineHeight": 1.5,
},
"h5": Object {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -877,7 +877,7 @@ Object {
"lineHeight": 1.5,
},
"h2": Object {
"fontSize": 60,
"fontSize": 64,
"fontWeight": 400,
"letterSpacing": 0,
"lineHeight": 1.5,
Expand All @@ -889,9 +889,9 @@ Object {
"lineHeight": 1.5,
},
"h4": Object {
"fontSize": 34,
"fontSize": 32,
"fontWeight": 400,
"letterSpacing": 0.27,
"letterSpacing": 0,
"lineHeight": 1.5,
},
"h5": Object {
Expand Down Expand Up @@ -1786,7 +1786,7 @@ Object {
"lineHeight": 1.5,
},
"h2": Object {
"fontSize": 60,
"fontSize": 64,
"fontWeight": 400,
"letterSpacing": 0,
"lineHeight": 1.5,
Expand All @@ -1798,9 +1798,9 @@ Object {
"lineHeight": 1.5,
},
"h4": Object {
"fontSize": 34,
"fontSize": 32,
"fontWeight": 400,
"letterSpacing": 0.27,
"letterSpacing": 0,
"lineHeight": 1.5,
},
"h5": Object {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -873,7 +873,7 @@ Object {
"lineHeight": 1.5,
},
"h2": Object {
"fontSize": 60,
"fontSize": 64,
"fontWeight": 400,
"letterSpacing": 0,
"lineHeight": 1.5,
Expand All @@ -885,9 +885,9 @@ Object {
"lineHeight": 1.5,
},
"h4": Object {
"fontSize": 34,
"fontSize": 32,
"fontWeight": 400,
"letterSpacing": 0.27,
"letterSpacing": 0,
"lineHeight": 1.5,
},
"h5": Object {
Expand Down Expand Up @@ -1780,7 +1780,7 @@ Object {
"lineHeight": 1.5,
},
"h2": Object {
"fontSize": 60,
"fontSize": 64,
"fontWeight": 400,
"letterSpacing": 0,
"lineHeight": 1.5,
Expand All @@ -1792,9 +1792,9 @@ Object {
"lineHeight": 1.5,
},
"h4": Object {
"fontSize": 34,
"fontSize": 32,
"fontWeight": 400,
"letterSpacing": 0.27,
"letterSpacing": 0,
"lineHeight": 1.5,
},
"h5": Object {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -546,7 +546,7 @@ Object {
"lineHeight": 1.5,
},
"h2": Object {
"fontSize": 60,
"fontSize": 64,
"fontWeight": 400,
"letterSpacing": 0,
"lineHeight": 1.5,
Expand All @@ -558,9 +558,9 @@ Object {
"lineHeight": 1.5,
},
"h4": Object {
"fontSize": 34,
"fontSize": 32,
"fontWeight": 400,
"letterSpacing": 0.27,
"letterSpacing": 0,
"lineHeight": 1.5,
},
"h5": Object {
Expand Down
2 changes: 1 addition & 1 deletion packages/web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "@naturacosmeticos/natds-web",
"displayName": "NatDS React Web",
"description": "A collection of components from Natura Design System for React websites and webapps",
"version": "4.6.0",
"version": "4.6.1-alpha.DSY-3466.2.0",
"private": false,
"keywords": [
"design-system",
Expand Down
3 changes: 2 additions & 1 deletion packages/web/src/Components/Logo/Logo.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* eslint-disable react/no-danger */
/* eslint-disable react/no-danger-with-children */
import React from 'react'
import { useTheme } from '@material-ui/core/styles'
Expand All @@ -10,7 +11,7 @@ const Logo = ({
size = 'veryHuge',
model = 'a',
arialabel = 'logo'
}: ILogoProps) => {
}: ILogoProps):JSX.Element => {
const theme: IThemeWeb = useTheme()
const checkColor = color === 'neutral' ? 'neutral' : 'custom'
const logo = theme.asset?.brand[checkColor][model].file
Expand Down
12 changes: 6 additions & 6 deletions packages/web/src/Provider/__snapshots__/buildTheme.test.ts.snap
Original file line number Diff line number Diff line change
Expand Up @@ -855,7 +855,7 @@ Object {
"lineHeight": 1.5,
},
"h2": Object {
"fontSize": 60,
"fontSize": 64,
"fontWeight": 400,
"letterSpacing": 0,
"lineHeight": 1.5,
Expand All @@ -867,9 +867,9 @@ Object {
"lineHeight": 1.5,
},
"h4": Object {
"fontSize": 34,
"fontSize": 32,
"fontWeight": 400,
"letterSpacing": 0.27,
"letterSpacing": 0,
"lineHeight": 1.5,
},
"h5": Object {
Expand Down Expand Up @@ -1765,7 +1765,7 @@ Object {
"lineHeight": 1.5,
},
"h2": Object {
"fontSize": 60,
"fontSize": 64,
"fontWeight": 400,
"letterSpacing": 0,
"lineHeight": 1.5,
Expand All @@ -1777,9 +1777,9 @@ Object {
"lineHeight": 1.5,
},
"h4": Object {
"fontSize": 34,
"fontSize": 32,
"fontWeight": 400,
"letterSpacing": 0.27,
"letterSpacing": 0,
"lineHeight": 1.5,
},
"h5": Object {
Expand Down
Loading

0 comments on commit c706a1c

Please sign in to comment.