diff --git a/src/@next/Skeleton/components/SkeletonText/SkeletonText.test.tsx b/src/@next/Skeleton/components/SkeletonText/SkeletonText.test.tsx index d525d9472..af8dd9ea1 100644 --- a/src/@next/Skeleton/components/SkeletonText/SkeletonText.test.tsx +++ b/src/@next/Skeleton/components/SkeletonText/SkeletonText.test.tsx @@ -16,7 +16,7 @@ const skeletonMetrics = [ ['body1', '21px', '21px'], ['body2', '21px', '19.6px'], ['button', '21px', '19.6px'], - ['caption', '16.8px', '16.8px'], + ['caption', '18.2px', '16.8px'], ['overline', '15.4px', '15.4px'], ] as const; diff --git a/src/@next/Skeleton/components/SkeletonText/SkeletonTextStyle.ts b/src/@next/Skeleton/components/SkeletonText/SkeletonTextStyle.ts index 63cdfbe6c..e01286678 100644 --- a/src/@next/Skeleton/components/SkeletonText/SkeletonTextStyle.ts +++ b/src/@next/Skeleton/components/SkeletonText/SkeletonTextStyle.ts @@ -91,7 +91,11 @@ const button = css` `; const caption = css` - height: 16.8px; + height: 18.2px; + + @media (max-width: ${Breakpoints.large}) { + height: 16.8px; + } `; const overline = css` diff --git a/src/@next/Typography/Typography.test.tsx b/src/@next/Typography/Typography.test.tsx index 1faa1e3c2..5ff3c5021 100644 --- a/src/@next/Typography/Typography.test.tsx +++ b/src/@next/Typography/Typography.test.tsx @@ -18,7 +18,7 @@ const typographyMetrics: ReadonlyArray< ['body1', '14px', '150%', '14px', undefined], ['body2', '14px', '150%', '14px', '140%'], ['button', '14px', '150%', '14px', '140%'], - ['caption', '12px', '140%', '12px', undefined], + ['caption', '13px', '140%', '12px', undefined], ['overline', '11px', '140%', '11px', undefined], ]; diff --git a/src/@next/Typography/TypographyStyles.ts b/src/@next/Typography/TypographyStyles.ts index b10d65812..589481c5c 100644 --- a/src/@next/Typography/TypographyStyles.ts +++ b/src/@next/Typography/TypographyStyles.ts @@ -150,7 +150,7 @@ export const button = css` export const caption = css` font-family: ${NotoSans}, sans-serif; font-weight: 600; - font-size: 12px; + font-size: 13px; line-height: 140%; letter-spacing: 0.25px; diff --git a/test/e2e/dataTable/dataTable.spec.ts-snapshots/dataTable-chromium-linux.png b/test/e2e/dataTable/dataTable.spec.ts-snapshots/dataTable-chromium-linux.png index 2273ef71f..d779b18d6 100755 Binary files a/test/e2e/dataTable/dataTable.spec.ts-snapshots/dataTable-chromium-linux.png and b/test/e2e/dataTable/dataTable.spec.ts-snapshots/dataTable-chromium-linux.png differ diff --git a/test/e2e/dataTable/dataTable.spec.ts-snapshots/dataTable-empty-state-chromium-linux.png b/test/e2e/dataTable/dataTable.spec.ts-snapshots/dataTable-empty-state-chromium-linux.png index b6aeb70a1..51c51a503 100755 Binary files a/test/e2e/dataTable/dataTable.spec.ts-snapshots/dataTable-empty-state-chromium-linux.png and b/test/e2e/dataTable/dataTable.spec.ts-snapshots/dataTable-empty-state-chromium-linux.png differ diff --git a/test/e2e/dataTable/dataTable.spec.ts-snapshots/dataTable-loading-chromium-linux.png b/test/e2e/dataTable/dataTable.spec.ts-snapshots/dataTable-loading-chromium-linux.png index 939b111be..30b23532e 100755 Binary files a/test/e2e/dataTable/dataTable.spec.ts-snapshots/dataTable-loading-chromium-linux.png and b/test/e2e/dataTable/dataTable.spec.ts-snapshots/dataTable-loading-chromium-linux.png differ diff --git a/test/e2e/dataTable/dataTable.spec.ts-snapshots/dataTable-no-wrap-cell-chromium-linux.png b/test/e2e/dataTable/dataTable.spec.ts-snapshots/dataTable-no-wrap-cell-chromium-linux.png index e1e0f9406..ec341b7a4 100755 Binary files a/test/e2e/dataTable/dataTable.spec.ts-snapshots/dataTable-no-wrap-cell-chromium-linux.png and b/test/e2e/dataTable/dataTable.spec.ts-snapshots/dataTable-no-wrap-cell-chromium-linux.png differ diff --git a/test/e2e/dataTable/dataTable.spec.ts-snapshots/dataTable-row-hover-chromium-linux.png b/test/e2e/dataTable/dataTable.spec.ts-snapshots/dataTable-row-hover-chromium-linux.png index e5c686129..a68d6d603 100755 Binary files a/test/e2e/dataTable/dataTable.spec.ts-snapshots/dataTable-row-hover-chromium-linux.png and b/test/e2e/dataTable/dataTable.spec.ts-snapshots/dataTable-row-hover-chromium-linux.png differ diff --git a/test/e2e/dataTable/dataTable.spec.ts-snapshots/dataTable-sorted-chromium-linux.png b/test/e2e/dataTable/dataTable.spec.ts-snapshots/dataTable-sorted-chromium-linux.png index ca3300829..a17769e43 100755 Binary files a/test/e2e/dataTable/dataTable.spec.ts-snapshots/dataTable-sorted-chromium-linux.png and b/test/e2e/dataTable/dataTable.spec.ts-snapshots/dataTable-sorted-chromium-linux.png differ diff --git a/test/e2e/dataTable/dataTable.spec.ts-snapshots/dataTable-vertical-align-center-cell-chromium-linux.png b/test/e2e/dataTable/dataTable.spec.ts-snapshots/dataTable-vertical-align-center-cell-chromium-linux.png index 47b84c897..db6a60740 100755 Binary files a/test/e2e/dataTable/dataTable.spec.ts-snapshots/dataTable-vertical-align-center-cell-chromium-linux.png and b/test/e2e/dataTable/dataTable.spec.ts-snapshots/dataTable-vertical-align-center-cell-chromium-linux.png differ diff --git a/test/e2e/indexTable/indexTable.spec.ts-snapshots/indexTable-chromium-linux.png b/test/e2e/indexTable/indexTable.spec.ts-snapshots/indexTable-chromium-linux.png index 432440868..1a31a8383 100755 Binary files a/test/e2e/indexTable/indexTable.spec.ts-snapshots/indexTable-chromium-linux.png and b/test/e2e/indexTable/indexTable.spec.ts-snapshots/indexTable-chromium-linux.png differ diff --git a/test/e2e/indexTable/indexTable.spec.ts-snapshots/indexTable-empty-state-chromium-linux.png b/test/e2e/indexTable/indexTable.spec.ts-snapshots/indexTable-empty-state-chromium-linux.png index 432440868..1a31a8383 100755 Binary files a/test/e2e/indexTable/indexTable.spec.ts-snapshots/indexTable-empty-state-chromium-linux.png and b/test/e2e/indexTable/indexTable.spec.ts-snapshots/indexTable-empty-state-chromium-linux.png differ diff --git a/test/e2e/indexTable/indexTable.spec.ts-snapshots/indexTable-loading-chromium-linux.png b/test/e2e/indexTable/indexTable.spec.ts-snapshots/indexTable-loading-chromium-linux.png index e4e6f2e22..4e41ceb82 100755 Binary files a/test/e2e/indexTable/indexTable.spec.ts-snapshots/indexTable-loading-chromium-linux.png and b/test/e2e/indexTable/indexTable.spec.ts-snapshots/indexTable-loading-chromium-linux.png differ diff --git a/test/e2e/indexTable/indexTable.spec.ts-snapshots/indextable-hover-checkbox-cell-chromium-linux.png b/test/e2e/indexTable/indexTable.spec.ts-snapshots/indextable-hover-checkbox-cell-chromium-linux.png index 959b0754e..b9b2cd01b 100755 Binary files a/test/e2e/indexTable/indexTable.spec.ts-snapshots/indextable-hover-checkbox-cell-chromium-linux.png and b/test/e2e/indexTable/indexTable.spec.ts-snapshots/indextable-hover-checkbox-cell-chromium-linux.png differ diff --git a/test/e2e/indexTable/indexTable.spec.ts-snapshots/indextable-hover-row-chromium-linux.png b/test/e2e/indexTable/indexTable.spec.ts-snapshots/indextable-hover-row-chromium-linux.png index b3543f503..4de0d9c44 100755 Binary files a/test/e2e/indexTable/indexTable.spec.ts-snapshots/indextable-hover-row-chromium-linux.png and b/test/e2e/indexTable/indexTable.spec.ts-snapshots/indextable-hover-row-chromium-linux.png differ