From 96e20d76af0b2cea2a396273cc96ac2461d54bc9 Mon Sep 17 00:00:00 2001 From: Fabio Reis Date: Thu, 21 Mar 2024 07:11:43 -0300 Subject: [PATCH 1/3] refactor(component): update Dialog to use the correct font-weight --- packages/yoga/src/Dialog/web/Header.jsx | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/packages/yoga/src/Dialog/web/Header.jsx b/packages/yoga/src/Dialog/web/Header.jsx index b706a66a3c..25ca8a29a1 100644 --- a/packages/yoga/src/Dialog/web/Header.jsx +++ b/packages/yoga/src/Dialog/web/Header.jsx @@ -1,16 +1,8 @@ import React from 'react'; -import Box from '../../Box'; +import Text from '../../Text'; const Header = props => ( - + ); Header.displayName = 'Dialog.Header'; From 1d93420d0f8dc1e7dd26c70fddb023c0f3aa85e2 Mon Sep 17 00:00:00 2001 From: Fabio Reis Date: Thu, 21 Mar 2024 07:22:30 -0300 Subject: [PATCH 2/3] test: update snapshots --- .../__snapshots__/BottomSheet.test.jsx.snap | 21 +++++---- .../web/__snapshots__/Dialog.test.jsx.snap | 44 +++++++++++-------- 2 files changed, 37 insertions(+), 28 deletions(-) diff --git a/packages/yoga/src/BottomSheet/web/__snapshots__/BottomSheet.test.jsx.snap b/packages/yoga/src/BottomSheet/web/__snapshots__/BottomSheet.test.jsx.snap index 7f9d45d160..274ff3810c 100644 --- a/packages/yoga/src/BottomSheet/web/__snapshots__/BottomSheet.test.jsx.snap +++ b/packages/yoga/src/BottomSheet/web/__snapshots__/BottomSheet.test.jsx.snap @@ -1,14 +1,6 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP exports[` should match snapshot 1`] = ` -.c4 { - margin-bottom: 24px; - color: #231B22; - font-size: 24px; - font-weight: 500; - text-align: center; -} - .c6 { margin-bottom: 32px; color: #6B6B78; @@ -91,6 +83,18 @@ exports[` should match snapshot 1`] = ` fill: #FFFFFF; } +.c4 { + margin: 0; + padding: 0; + font-size: 24px; + line-height: 32px; + color: #231B22; + font-family: Rubik; + font-weight: 500; + margin-bottom: 24px; + text-align: center; +} + .c1 { padding: 16px 16px 16px 16px; border-radius: 8px; @@ -199,7 +203,6 @@ exports[` should match snapshot 1`] = ` >
Title
diff --git a/packages/yoga/src/Dialog/web/__snapshots__/Dialog.test.jsx.snap b/packages/yoga/src/Dialog/web/__snapshots__/Dialog.test.jsx.snap index e9eb055473..be3cb6323f 100644 --- a/packages/yoga/src/Dialog/web/__snapshots__/Dialog.test.jsx.snap +++ b/packages/yoga/src/Dialog/web/__snapshots__/Dialog.test.jsx.snap @@ -1,14 +1,6 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP exports[` should match snapshot 1`] = ` -.c3 { - margin-bottom: 24px; - color: #231B22; - font-size: 24px; - font-weight: 500; - text-align: center; -} - .c4 { margin-bottom: 32px; color: #6B6B78; @@ -91,6 +83,18 @@ exports[` should match snapshot 1`] = ` fill: #FFFFFF; } +.c3 { + margin: 0; + padding: 0; + font-size: 24px; + line-height: 32px; + color: #231B22; + font-family: Rubik; + font-weight: 500; + margin-bottom: 24px; + text-align: center; +} + .c1 { padding: 16px 16px 16px 16px; border-radius: 8px; @@ -152,7 +156,6 @@ exports[` should match snapshot 1`] = ` >
Title
@@ -182,15 +185,7 @@ exports[` should match snapshot 1`] = ` exports[` should match snapshot with close button 1`] = `
- .c7 { - margin-bottom: 24px; - color: #231B22; - font-size: 24px; - font-weight: 500; - text-align: center; -} - -.c8 { + .c8 { margin-bottom: 32px; color: #6B6B78; font-size: 16px; @@ -381,6 +376,18 @@ exports[` should match snapshot with close button 1`] = ` transition: fill 0.2s; } +.c7 { + margin: 0; + padding: 0; + font-size: 24px; + line-height: 32px; + color: #231B22; + font-family: Rubik; + font-weight: 500; + margin-bottom: 24px; + text-align: center; +} + .c1 { padding: 16px 16px 16px 16px; border-radius: 8px; @@ -471,7 +478,6 @@ exports[` should match snapshot with close button 1`] = `
Title
From 90e085027ccff1cff1af0ba2376b86ea1ac3b581 Mon Sep 17 00:00:00 2001 From: Fabio Reis Date: Thu, 21 Mar 2024 16:52:25 -0300 Subject: [PATCH 3/3] refactor(dialog): update dialog subtitle to text body1 --- .../__snapshots__/BottomSheet.test.jsx.snap | 25 +++++---- packages/yoga/src/Dialog/web/Content.jsx | 13 +---- .../web/__snapshots__/Dialog.test.jsx.snap | 52 +++++++++++-------- .../web/__snapshots__/Drawer.test.jsx.snap | 25 +++++---- 4 files changed, 59 insertions(+), 56 deletions(-) diff --git a/packages/yoga/src/BottomSheet/web/__snapshots__/BottomSheet.test.jsx.snap b/packages/yoga/src/BottomSheet/web/__snapshots__/BottomSheet.test.jsx.snap index 274ff3810c..fc68852fd7 100644 --- a/packages/yoga/src/BottomSheet/web/__snapshots__/BottomSheet.test.jsx.snap +++ b/packages/yoga/src/BottomSheet/web/__snapshots__/BottomSheet.test.jsx.snap @@ -1,14 +1,6 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP exports[` should match snapshot 1`] = ` -.c6 { - margin-bottom: 32px; - color: #6B6B78; - font-size: 16px; - font-weight: 400; - text-align: center; -} - .c8 { display: -webkit-box; display: -webkit-flex; @@ -95,6 +87,18 @@ exports[` should match snapshot 1`] = ` text-align: center; } +.c6 { + margin: 0; + padding: 0; + font-size: 16px; + line-height: 24px; + color: #231B22; + font-family: Rubik; + font-weight: 400; + margin-bottom: 32px; + text-align: center; +} + .c1 { padding: 16px 16px 16px 16px; border-radius: 8px; @@ -206,12 +210,11 @@ exports[` should match snapshot 1`] = ` > Title -
Subtitle -
+