Skip to content

Commit

Permalink
Merge pull request #1836 from natura-cosmeticos/DSY-4797
Browse files Browse the repository at this point in the history
Dsy 4797 Fix Storybook naming for GaYa
  • Loading branch information
vagnerbarbosant authored Jul 22, 2024
2 parents 5395ea4 + 6d53be2 commit dc1572e
Show file tree
Hide file tree
Showing 16 changed files with 85 additions and 85 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Natura Design System
# GaYa Design System

[![lerna](https://img.shields.io/badge/maintained%20with-lerna-cc00ff.svg)](https://lerna.js.org/)
[![semantic-release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg)](https://github.com/semantic-release/semantic-release)
Expand Down
2 changes: 1 addition & 1 deletion packages/react/.storybook/preview-head.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<link href="https://fonts.googleapis.com/css2?family=Roboto+Mono&family=Roboto:wght@400;500&display=swap" rel="stylesheet" />
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@naturacosmeticos/[email protected].1/dist/natds-icons.css" />
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@naturacosmeticos/[email protected].2/dist/natds-icons.css" />

<link href="https://cdn.jsdelivr.net/npm/@naturacosmeticos/natds-themes@latest/dist/assets/aesop_fonts.css" rel="stylesheet" />
<link href="https://cdn.jsdelivr.net/npm/@naturacosmeticos/natds-themes@latest/dist/assets/avon_fonts.css" rel="stylesheet" />
Expand Down
2 changes: 1 addition & 1 deletion packages/react/.storybook/theme.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ export const buildTheme = (theme, mode) => create({
barBg: theme.color.surface,
barTextColor: theme.color.highEmphasis,
base: mode,
brandTitle: 'Gaya Natura Design System',
brandTitle: 'GaYa Design System',
colorPrimary: theme.color.primary,
colorSecondary: theme.color.secondary,
textColor: theme.color.highEmphasis,
Expand Down
2 changes: 1 addition & 1 deletion packages/react/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Natura Design System - React
# GaYa Design System - React

React components for web development inside Natura&Co.

Expand Down
6 changes: 3 additions & 3 deletions packages/react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "@naturacosmeticos/natds-react",
"displayName": "NatDS-React",
"description": "A collection of components from Natura Design System for React",
"version": "2.61.0",
"version": "2.61.1-alpha.DSY-4797.1.0",
"private": false,
"keywords": [
"design-system",
Expand Down Expand Up @@ -57,8 +57,8 @@
"generate": "yarn plop --plopfile ./generators/plopfile.js"
},
"dependencies": {
"@naturacosmeticos/natds-icons": "1.25.1",
"@naturacosmeticos/natds-themes": "0.77.2",
"@naturacosmeticos/natds-icons": "1.25.2",
"@naturacosmeticos/natds-themes": "0.78.2",
"react-jss": "10.9.0"
},
"devDependencies": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ Object {
"badge": Object {
"color": Object {
"alert": Object {
"background": "#e74627",
"background": "#de3529",
"label": "#111111",
},
"primary": Object {
Expand All @@ -143,7 +143,7 @@ Object {
"label": "#000000",
},
"success": Object {
"background": "#569a32",
"background": "#2f833e",
"label": "#111111",
},
},
Expand Down Expand Up @@ -1130,11 +1130,11 @@ Object {
},
},
"color": Object {
"alert": "#e74627",
"alertDark": "#c13014",
"alertDarkest": "#a02b14",
"alertLight": "#ff826a",
"alertLightest": "#ffd0c7",
"alert": "#de3529",
"alertDark": "#8c2116",
"alertDarkest": "#470703",
"alertLight": "#ffa392",
"alertLightest": "#ffedea",
"background": "#fafafa",
"contentDisabled": "#a4a4a4",
"contentHighEmphasis": "#363636",
Expand All @@ -1147,16 +1147,16 @@ Object {
"contentMediumEmphasisFixedLight": "#bdbdbd",
"highEmphasis": "#363636",
"highlight": "#111111",
"info": "#227bbd",
"infoDark": "#1a588a",
"infoDarkest": "#194b73",
"infoLight": "#54a6dc",
"infoLightest": "#c4dff3",
"link": "#227bbd",
"linkDark": "#1a588a",
"linkDarkest": "#194b73",
"linkLight": "#54a6dc",
"linkLightest": "#c4dff3",
"info": "#1267cf",
"infoDark": "#154e99",
"infoDarkest": "#052149",
"infoLight": "#a5c0fc",
"infoLightest": "#edf0ff",
"link": "#1267cf",
"linkDark": "#154e99",
"linkDarkest": "#052149",
"linkLight": "#a5c0fc",
"linkLightest": "#edf0ff",
"lowEmphasis": "#8c8c8c",
"lowLight": "#ffffff",
"mediumEmphasis": "#737373",
Expand Down Expand Up @@ -1228,22 +1228,22 @@ Object {
"secondaryDarkest": "#ad4907",
"secondaryLight": "#ff8332",
"secondaryLightest": "#ff9a59",
"success": "#569a32",
"successDark": "#386823",
"successDarkest": "#2b4720",
"successLight": "#a0d87e",
"successLightest": "#e1f3d4",
"success": "#2f833e",
"successDark": "#205829",
"successDarkest": "#08280d",
"successLight": "#92d492",
"successLightest": "#d9f7d5",
"surface": "#ffffff",
"surfaceDark": "#4e4e4e",
"surfaceDisabled": "#a4a4a4",
"surfaceFixedDark": "#4e4e4e",
"surfaceFixedLight": "#ffffff",
"surfaceInverse": "#4e4e4e",
"warning": "#fcc433",
"warningDark": "#dea003",
"warningDarkest": "#946b02",
"warningLight": "#fdd265",
"warningLightest": "#fde198",
"warning": "#e5b815",
"warningDark": "#a38520",
"warningDarkest": "#5c4b14",
"warningLight": "#ffd75d",
"warningLightest": "#ffefcd",
},
"counter": Object {
"borderRadius": 4,
Expand Down Expand Up @@ -1446,7 +1446,7 @@ Object {
"color": Object {
"label": Object {
"enable": Object {
"default": "#227bbd",
"default": "#1267cf",
"light": "#8c8c8c",
},
},
Expand Down Expand Up @@ -2096,12 +2096,12 @@ Object {
"tag": Object {
"color": Object {
"background": Object {
"alert": "#e74627",
"link": "#227bbd",
"alert": "#de3529",
"link": "#1267cf",
"primary": "#f4ab34",
"secondary": "#ff6b0b",
"success": "#569a32",
"warning": "#fcc433",
"success": "#2f833e",
"warning": "#e5b815",
},
"label": Object {
"alert": "#111111",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -238,12 +238,12 @@ Array [
background-color: #c9c9c9;
}
.labelText-d0-0-2-9 {
color: #e74627;
color: #de3529;
}
.input-d1-0-2-10 {
height: 56px;
background-color: #ffffff;
border-color: #e74627;
border-color: #de3529;
color: #363636;
}
.input-d1-0-2-10::placeholder {
Expand Down Expand Up @@ -387,12 +387,12 @@ Array [
background-color: #c9c9c9;
}
.labelText-d0-0-2-9 {
color: #569a32;
color: #2f833e;
}
.input-d1-0-2-10 {
height: 56px;
background-color: #ffffff;
border-color: #569a32;
border-color: #2f833e;
color: #363636;
}
.input-d1-0-2-10::placeholder {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@ Array [
}
}
.badge-d0-0-2-4 {
background-color: #e74627;
background-color: #de3529;
border-radius: 4px;
height: 8px;
width: 8px;
}
.badge-d0-0-2-4:after {
background-color: #e74627;
background-color: #de3529;
border-radius: 4px;
}
.label-d1-0-2-5 {
Expand Down Expand Up @@ -82,13 +82,13 @@ Array [
}
}
.badge-d0-0-2-4 {
background-color: #e74627;
background-color: #de3529;
border-radius: 4px;
height: 8px;
width: 8px;
}
.badge-d0-0-2-4:after {
background-color: #e74627;
background-color: #de3529;
border-radius: 4px;
content: \\"\\";
}
Expand Down Expand Up @@ -134,14 +134,14 @@ Array [
}
}
.badge-d0-0-2-4 {
background-color: #e74627;
background-color: #de3529;
border-radius: 8px;
height: 16px;
padding-left: 4px;
padding-right: 4px;
}
.badge-d0-0-2-4:after {
background-color: #e74627;
background-color: #de3529;
border-radius: 8px;
}
.label-d1-0-2-5 {
Expand Down Expand Up @@ -195,14 +195,14 @@ Array [
}
}
.badge-d0-0-2-4 {
background-color: #e74627;
background-color: #de3529;
border-radius: 8px;
height: 16px;
padding-left: 4px;
padding-right: 4px;
}
.badge-d0-0-2-4:after {
background-color: #e74627;
background-color: #de3529;
border-radius: 8px;
}
.label-d1-0-2-5 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ Array [
}
.helperText-0-2-1 > i {}
.helperText-d0-0-2-2 {
color: #e74627;
color: #de3529;
}
.helperText-d0-0-2-2 > i {
margin-right: 4px;
Expand All @@ -54,7 +54,7 @@ Array [
pointer-events: none;
}
.icon-d0-0-2-4 {
color: #e74627;
color: #de3529;
font-size: 16px;
}",
<div>
Expand Down Expand Up @@ -88,7 +88,7 @@ Array [
}
.helperText-0-2-1 > i {}
.helperText-d0-0-2-2 {
color: #569a32;
color: #2f833e;
}
.helperText-d0-0-2-2 > i {
margin-right: 4px;
Expand All @@ -99,7 +99,7 @@ Array [
pointer-events: none;
}
.icon-d0-0-2-4 {
color: #569a32;
color: #2f833e;
font-size: 16px;
}",
<div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ Array [
flex-direction: row;
}
.link-d1-0-2-4 {
color: #227bbd;
color: #1267cf;
text-decoration: none;
margin-right: 8px;
}
Expand Down Expand Up @@ -104,7 +104,7 @@ Array [
flex-direction: row-reverse;
}
.link-d1-0-2-4 {
color: #227bbd;
color: #1267cf;
text-decoration: underline;
margin-left: 8px;
}
Expand Down Expand Up @@ -161,7 +161,7 @@ Array [
flex-direction: row;
}
.link-d1-0-2-4 {
color: #227bbd;
color: #1267cf;
text-decoration: underline;
margin-right: 8px;
}
Expand Down Expand Up @@ -218,7 +218,7 @@ Array [
flex-direction: row;
}
.link-d1-0-2-4 {
color: #227bbd;
color: #1267cf;
text-decoration: underline;
margin-right: 8px;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -407,14 +407,14 @@ Array [
}
}
.badge-d0-0-2-23 {
background-color: #e74627;
background-color: #de3529;
border-radius: 8px;
height: 16px;
padding-left: 4px;
padding-right: 4px;
}
.badge-d0-0-2-23:after {
background-color: #e74627;
background-color: #de3529;
border-radius: 8px;
}
.label-d1-0-2-24 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1222,7 +1222,7 @@ Array [
}
}
.snackbarContainer-d0-0-2-18 {
background-color: #e74627;
background-color: #de3529;
right: 8px ;
top: 8px;
bottom: unset;
Expand Down Expand Up @@ -1403,7 +1403,7 @@ Array [
}
}
.snackbarContainer-d0-0-2-18 {
background-color: #227bbd;
background-color: #1267cf;
right: 8px ;
top: 8px;
bottom: unset;
Expand Down Expand Up @@ -1584,7 +1584,7 @@ Array [
}
}
.snackbarContainer-d0-0-2-18 {
background-color: #569a32;
background-color: #2f833e;
right: 8px ;
top: 8px;
bottom: unset;
Expand Down Expand Up @@ -1766,7 +1766,7 @@ Array [
}
}
.snackbarContainer-d0-0-2-18 {
background-color: #fcc433;
background-color: #e5b815;
right: 8px ;
top: 8px;
bottom: unset;
Expand Down
2 changes: 1 addition & 1 deletion packages/react/src/components/Tag/Tag.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ describe('Tag component', () => {
const { styles, component: { getByTestId } } = renderWithTheme(<Tag {...tagProps} color="success" testID="success-color" />)
const component = getByTestId('success-color')

expect(component).toHaveStyle({ 'background-color': '#569a32' })
expect(component).toHaveStyle({ 'background-color': '#2F833E' })
expect([styles.toString(), component]).toMatchSnapshot()
})

Expand Down
Loading

0 comments on commit dc1572e

Please sign in to comment.