diff --git a/packages/gestalt-datepicker/src/__snapshots__/DatePicker.jsdom.test.tsx.snap b/packages/gestalt-datepicker/src/__snapshots__/DatePicker.jsdom.test.tsx.snap index 92383a5435..754c487557 100644 --- a/packages/gestalt-datepicker/src/__snapshots__/DatePicker.jsdom.test.tsx.snap +++ b/packages/gestalt-datepicker/src/__snapshots__/DatePicker.jsdom.test.tsx.snap @@ -13,7 +13,7 @@ exports[`DatePicker Mobile Datepicker renders 1`] = ` for="fake_id" >
, diff --git a/packages/gestalt/src/Button.css b/packages/gestalt/src/Button.css index 985c78288f..7a0580ece3 100644 --- a/packages/gestalt/src/Button.css +++ b/packages/gestalt/src/Button.css @@ -25,20 +25,20 @@ .sm { composes: small from "./Layout.css"; - composes: paddingX3 from "./boxWhitespace.css"; - composes: paddingY1 from "./boxWhitespace.css"; + composes: paddingX300 from "./boxWhitespace.css"; + composes: paddingY100 from "./boxWhitespace.css"; } .md { composes: medium from "./Layout.css"; - composes: paddingX3 from "./boxWhitespace.css"; - composes: paddingY2 from "./boxWhitespace.css"; + composes: paddingX300 from "./boxWhitespace.css"; + composes: paddingY200 from "./boxWhitespace.css"; } .lg { composes: large from "./Layout.css"; - composes: paddingX4 from "./boxWhitespace.css"; - composes: paddingY3 from "./boxWhitespace.css"; + composes: paddingX400 from "./boxWhitespace.css"; + composes: paddingY300 from "./boxWhitespace.css"; } .smVr { diff --git a/packages/gestalt/src/ButtonToggle.css b/packages/gestalt/src/ButtonToggle.css index 60f3c1a4ed..01e3c0f557 100644 --- a/packages/gestalt/src/ButtonToggle.css +++ b/packages/gestalt/src/ButtonToggle.css @@ -64,17 +64,17 @@ .sm { composes: small from "./Layout.css"; - composes: paddingX3 paddingY1 from "./boxWhitespace.css"; + composes: paddingX300 paddingY100 from "./boxWhitespace.css"; } .md { composes: medium from "./Layout.css"; - composes: paddingX3 paddingY2 from "./boxWhitespace.css"; + composes: paddingX300 paddingY200 from "./boxWhitespace.css"; } .lg { composes: large from "./Layout.css"; - composes: paddingX4 paddingY3 from "./boxWhitespace.css"; + composes: paddingX400 paddingY300 from "./boxWhitespace.css"; } .smVr { @@ -98,19 +98,19 @@ .thumbnailSm { composes: small from "./Layout.css"; - composes: paddingX1 from "./boxWhitespace.css"; + composes: paddingX100 from "./boxWhitespace.css"; padding-bottom: 2px; padding-top: var(--space-200); } .thumbnailMd { composes: medium from "./Layout.css"; - composes: paddingX2 paddingY2 from "./boxWhitespace.css"; + composes: paddingX200 paddingY200 from "./boxWhitespace.css"; } .thumbnailLg { composes: large from "./Layout.css"; - composes: paddingX3 paddingY2 from "./boxWhitespace.css"; + composes: paddingX300 paddingY200 from "./boxWhitespace.css"; } .enabled { diff --git a/packages/gestalt/src/Datapoint/__snapshots__/Trend.test.tsx.snap b/packages/gestalt/src/Datapoint/__snapshots__/Trend.test.tsx.snap index db69edf89b..90e2dfc83e 100644 --- a/packages/gestalt/src/Datapoint/__snapshots__/Trend.test.tsx.snap +++ b/packages/gestalt/src/Datapoint/__snapshots__/Trend.test.tsx.snap @@ -2,7 +2,7 @@ exports[`DatapointTrend renders 1`] = `
packages/gestalt/src/Flex.css + $ node ./scripts/flex.js > packages/gestalt/src/Flex.css */ @@ -14,261 +14,321 @@ This file was generated by running } .columnGap0 { - margin-bottom: var(--space-0); - margin-top: var(--space-0); + margin-bottom: 0; + margin-top: 0; } .columnGap0 > .FlexItem { - margin-bottom: var(--space-0); - margin-top: var(--space-0); + margin-bottom: 0; + margin-top: 0; } .rowGap0 { - margin-left: var(--space-0); - margin-right: var(--space-0); + margin-left: 0; + margin-right: 0; } .rowGap0 > .FlexItem { - margin-left: var(--space-0); - margin-right: var(--space-0); + margin-left: 0; + margin-right: 0; } -.columnGap1 { +.columnGap25 { + margin-bottom: -0.5px; + margin-top: -0.5px; +} + +.columnGap25 > .FlexItem { + margin-bottom: 0.5px; + margin-top: 0.5px; +} + +.rowGap25 { + margin-left: -0.5px; + margin-right: -0.5px; +} + +.rowGap25 > .FlexItem { + margin-left: 0.5px; + margin-right: 0.5px; +} + +.columnGap50 { + margin-bottom: -1px; + margin-top: -1px; +} + +.columnGap50 > .FlexItem { + margin-bottom: 1px; + margin-top: 1px; +} + +.rowGap50 { + margin-left: -1px; + margin-right: -1px; +} + +.rowGap50 > .FlexItem { + margin-left: 1px; + margin-right: 1px; +} + +.columnGap100 { margin-bottom: -2px; margin-top: -2px; } -.columnGap1 > .FlexItem { +.columnGap100 > .FlexItem { margin-bottom: 2px; margin-top: 2px; } -.rowGap1 { +.rowGap100 { margin-left: -2px; margin-right: -2px; } -.rowGap1 > .FlexItem { +.rowGap100 > .FlexItem { margin-left: 2px; margin-right: 2px; } -.columnGap2 { - margin-bottom: var(--space-negative-100); - margin-top: var(--space-negative-100); +.columnGap150 { + margin-bottom: -3px; + margin-top: -3px; +} + +.columnGap150 > .FlexItem { + margin-bottom: 3px; + margin-top: 3px; +} + +.rowGap150 { + margin-left: -3px; + margin-right: -3px; +} + +.rowGap150 > .FlexItem { + margin-left: 3px; + margin-right: 3px; +} + +.columnGap1000 { + margin-bottom: -20px; + margin-top: -20px; +} + +.columnGap1000 > .FlexItem { + margin-bottom: 20px; + margin-top: 20px; +} + +.rowGap1000 { + margin-left: -20px; + margin-right: -20px; +} + +.rowGap1000 > .FlexItem { + margin-left: 20px; + margin-right: 20px; +} + +.columnGap1100 { + margin-bottom: -22px; + margin-top: -22px; +} + +.columnGap1100 > .FlexItem { + margin-bottom: 22px; + margin-top: 22px; +} + +.rowGap1100 { + margin-left: -22px; + margin-right: -22px; +} + +.rowGap1100 > .FlexItem { + margin-left: 22px; + margin-right: 22px; +} + +.columnGap1200 { + margin-bottom: -24px; + margin-top: -24px; +} + +.columnGap1200 > .FlexItem { + margin-bottom: 24px; + margin-top: 24px; +} + +.rowGap1200 { + margin-left: -24px; + margin-right: -24px; +} + +.rowGap1200 > .FlexItem { + margin-left: 24px; + margin-right: 24px; +} + +.columnGap200 { + margin-bottom: -4px; + margin-top: -4px; } -.columnGap2 > .FlexItem { - margin-bottom: var(--space-100); - margin-top: var(--space-100); +.columnGap200 > .FlexItem { + margin-bottom: 4px; + margin-top: 4px; } -.rowGap2 { - margin-left: var(--space-negative-100); - margin-right: var(--space-negative-100); +.rowGap200 { + margin-left: -4px; + margin-right: -4px; } -.rowGap2 > .FlexItem { - margin-left: var(--space-100); - margin-right: var(--space-100); +.rowGap200 > .FlexItem { + margin-left: 4px; + margin-right: 4px; } -.columnGap3 { +.columnGap300 { margin-bottom: -6px; margin-top: -6px; } -.columnGap3 > .FlexItem { +.columnGap300 > .FlexItem { margin-bottom: 6px; margin-top: 6px; } -.rowGap3 { +.rowGap300 { margin-left: -6px; margin-right: -6px; } -.rowGap3 > .FlexItem { +.rowGap300 > .FlexItem { margin-left: 6px; margin-right: 6px; } -.columnGap4 { - margin-bottom: var(--space-negative-200); - margin-top: var(--space-negative-200); +.columnGap400 { + margin-bottom: -8px; + margin-top: -8px; } -.columnGap4 > .FlexItem { - margin-bottom: var(--space-200); - margin-top: var(--space-200); +.columnGap400 > .FlexItem { + margin-bottom: 8px; + margin-top: 8px; } -.rowGap4 { - margin-left: var(--space-negative-200); - margin-right: var(--space-negative-200); +.rowGap400 { + margin-left: -8px; + margin-right: -8px; } -.rowGap4 > .FlexItem { - margin-left: var(--space-200); - margin-right: var(--space-200); +.rowGap400 > .FlexItem { + margin-left: 8px; + margin-right: 8px; } -.columnGap5 { +.columnGap500 { margin-bottom: -10px; margin-top: -10px; } -.columnGap5 > .FlexItem { +.columnGap500 > .FlexItem { margin-bottom: 10px; margin-top: 10px; } -.rowGap5 { +.rowGap500 { margin-left: -10px; margin-right: -10px; } -.rowGap5 > .FlexItem { +.rowGap500 > .FlexItem { margin-left: 10px; margin-right: 10px; } -.columnGap6 { - margin-bottom: var(--space-negative-300); - margin-top: var(--space-negative-300); +.columnGap600 { + margin-bottom: -12px; + margin-top: -12px; } -.columnGap6 > .FlexItem { - margin-bottom: var(--space-300); - margin-top: var(--space-300); +.columnGap600 > .FlexItem { + margin-bottom: 12px; + margin-top: 12px; } -.rowGap6 { - margin-left: var(--space-negative-300); - margin-right: var(--space-negative-300); +.rowGap600 { + margin-left: -12px; + margin-right: -12px; } -.rowGap6 > .FlexItem { - margin-left: var(--space-300); - margin-right: var(--space-300); +.rowGap600 > .FlexItem { + margin-left: 12px; + margin-right: 12px; } -.columnGap7 { +.columnGap700 { margin-bottom: -14px; margin-top: -14px; } -.columnGap7 > .FlexItem { +.columnGap700 > .FlexItem { margin-bottom: 14px; margin-top: 14px; } -.rowGap7 { +.rowGap700 { margin-left: -14px; margin-right: -14px; } -.rowGap7 > .FlexItem { +.rowGap700 > .FlexItem { margin-left: 14px; margin-right: 14px; } -.columnGap8 { - margin-bottom: var(--space-negative-400); - margin-top: var(--space-negative-400); +.columnGap800 { + margin-bottom: -16px; + margin-top: -16px; } -.columnGap8 > .FlexItem { - margin-bottom: var(--space-400); - margin-top: var(--space-400); +.columnGap800 > .FlexItem { + margin-bottom: 16px; + margin-top: 16px; } -.rowGap8 { - margin-left: var(--space-negative-400); - margin-right: var(--space-negative-400); +.rowGap800 { + margin-left: -16px; + margin-right: -16px; } -.rowGap8 > .FlexItem { - margin-left: var(--space-400); - margin-right: var(--space-400); +.rowGap800 > .FlexItem { + margin-left: 16px; + margin-right: 16px; } -.columnGap9 { +.columnGap900 { margin-bottom: -18px; margin-top: -18px; } -.columnGap9 > .FlexItem { +.columnGap900 > .FlexItem { margin-bottom: 18px; margin-top: 18px; } -.rowGap9 { +.rowGap900 { margin-left: -18px; margin-right: -18px; } -.rowGap9 > .FlexItem { +.rowGap900 > .FlexItem { margin-left: 18px; margin-right: 18px; } - -.columnGap10 { - margin-bottom: var(--space-negative-500); - margin-top: var(--space-negative-500); -} - -.columnGap10 > .FlexItem { - margin-bottom: var(--space-500); - margin-top: var(--space-500); -} - -.rowGap10 { - margin-left: var(--space-negative-500); - margin-right: var(--space-negative-500); -} - -.rowGap10 > .FlexItem { - margin-left: var(--space-500); - margin-right: var(--space-500); -} - -.columnGap11 { - margin-bottom: -22px; - margin-top: -22px; -} - -.columnGap11 > .FlexItem { - margin-bottom: 22px; - margin-top: 22px; -} - -.rowGap11 { - margin-left: -22px; - margin-right: -22px; -} - -.rowGap11 > .FlexItem { - margin-left: 22px; - margin-right: 22px; -} - -.columnGap12 { - margin-bottom: var(--space-negative-600); - margin-top: var(--space-negative-600); -} - -.columnGap12 > .FlexItem { - margin-bottom: var(--space-600); - margin-top: var(--space-600); -} - -.rowGap12 { - margin-left: var(--space-negative-600); - margin-right: var(--space-negative-600); -} - -.rowGap12 > .FlexItem { - margin-left: var(--space-600); - margin-right: var(--space-600); -} diff --git a/packages/gestalt/src/Flex.tsx b/packages/gestalt/src/Flex.tsx index 6b55df6d82..d7a68213e4 100644 --- a/packages/gestalt/src/Flex.tsx +++ b/packages/gestalt/src/Flex.tsx @@ -5,7 +5,27 @@ import FlexItem from './FlexItem'; import wrapWithComponent from './utils/wrapWithComponent'; type Dimension = number | string; -type Gap = 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 | 16; +type Gap = + | 0 + | 0.25 + | 0.5 + | 1 + | 1.5 + | 2 + | 3 + | 4 + | 5 + | 6 + | 7 + | 8 + | 9 + | 10 + | 11 + | 12 + | 13 + | 14 + | 15 + | 16; type Props = { /** @@ -159,8 +179,8 @@ const FlexWithForwardRef = forwardRef( }).filter(Boolean) : childrenProp; - const gapStyles = `${styles[`rowGap${typeof gap === 'number' ? gap : gap.row}`]} ${ - styles[`columnGap${typeof gap === 'number' ? gap : gap.column}`] + const gapStyles = `${styles[`rowGap${typeof gap === 'number' ? gap * 100 : gap.row * 100}`]} ${ + styles[`columnGap${typeof gap === 'number' ? gap * 100 : gap.column * 100}`] }`; const { passthroughProps, propsStyles } = buildStyles({ diff --git a/packages/gestalt/src/Modal.css b/packages/gestalt/src/Modal.css index 19d7e98cea..a3eea4e2d8 100644 --- a/packages/gestalt/src/Modal.css +++ b/packages/gestalt/src/Modal.css @@ -13,7 +13,7 @@ .wrapper { composes: relative overflowAuto flex from "./Layout.css"; composes: rounding4 from "./Borders.css"; - composes: marginStart4 marginEnd4 from "./boxWhitespace.css"; + composes: marginStart400 marginEnd400 from "./boxWhitespace.css"; background-color: var(--color-background-overlay); max-height: calc(100vh - 32px); } diff --git a/packages/gestalt/src/SearchField.css b/packages/gestalt/src/SearchField.css index da13a82b27..2978ba521b 100644 --- a/packages/gestalt/src/SearchField.css +++ b/packages/gestalt/src/SearchField.css @@ -45,9 +45,9 @@ html[dir="rtl"] .inputActive { } .clear { - composes: marginEnd2 from "./boxWhitespace.css"; - composes: paddingX1 from "./boxWhitespace.css"; - composes: paddingY1 from "./boxWhitespace.css"; + composes: marginEnd200 from "./boxWhitespace.css"; + composes: paddingX100 from "./boxWhitespace.css"; + composes: paddingY100 from "./boxWhitespace.css"; position: absolute; top: 50%; transform: translateY(-50%); diff --git a/packages/gestalt/src/SearchGuide.css b/packages/gestalt/src/SearchGuide.css index 0946603eb0..750737bfbb 100644 --- a/packages/gestalt/src/SearchGuide.css +++ b/packages/gestalt/src/SearchGuide.css @@ -3,7 +3,7 @@ composes: noBorder from "./Borders.css"; composes: pointer from "./Cursor.css"; composes: large from "./Layout.css"; - composes: paddingX1 from "./boxWhitespace.css"; + composes: paddingX100 from "./boxWhitespace.css"; border-radius: var(--rounding-600); display: inherit; } diff --git a/packages/gestalt/src/Table.css b/packages/gestalt/src/Table.css index 0d198698e5..6b4bf86b36 100644 --- a/packages/gestalt/src/Table.css +++ b/packages/gestalt/src/Table.css @@ -11,8 +11,8 @@ .th, .td { - composes: paddingY3 from "./boxWhitespace.css"; - composes: paddingX3 from "./boxWhitespace.css"; + composes: paddingY300 from "./boxWhitespace.css"; + composes: paddingX300 from "./boxWhitespace.css"; } .stickyHeader { diff --git a/packages/gestalt/src/TableOfContents/TableOfContentsAnchor.css b/packages/gestalt/src/TableOfContents/TableOfContentsAnchor.css index 6dd8e0f9ec..139d16fc6d 100644 --- a/packages/gestalt/src/TableOfContents/TableOfContentsAnchor.css +++ b/packages/gestalt/src/TableOfContents/TableOfContentsAnchor.css @@ -1,5 +1,5 @@ .item { - composes: paddingY3 from "../boxWhitespace.css"; + composes: paddingY300 from "../boxWhitespace.css"; composes: flexGrow from "../Layout.css"; background-color: var(--color-background-tableofcontents-item-default); } diff --git a/packages/gestalt/src/Tabs.css b/packages/gestalt/src/Tabs.css index aed999edcd..e2f64e47ed 100644 --- a/packages/gestalt/src/Tabs.css +++ b/packages/gestalt/src/Tabs.css @@ -1,5 +1,5 @@ .paddingY { - composes: paddingY3 from "./boxWhitespace.css"; + composes: paddingY300 from "./boxWhitespace.css"; } .focused { diff --git a/packages/gestalt/src/TagData.css b/packages/gestalt/src/TagData.css index 9395ae43c6..73619d6b61 100644 --- a/packages/gestalt/src/TagData.css +++ b/packages/gestalt/src/TagData.css @@ -7,13 +7,13 @@ .tagMedium { composes: borderBox from "./Layout.css"; - composes: paddingY3 from "./boxWhitespace.css"; + composes: paddingY300 from "./boxWhitespace.css"; height: 40px; } .tagSmall { composes: borderBox from "./Layout.css"; - composes: paddingY2 from "./boxWhitespace.css"; + composes: paddingY200 from "./boxWhitespace.css"; height: 32px; } diff --git a/packages/gestalt/src/TileData.css b/packages/gestalt/src/TileData.css index 68d2094f33..88b4231cd4 100644 --- a/packages/gestalt/src/TileData.css +++ b/packages/gestalt/src/TileData.css @@ -1,7 +1,7 @@ .baseTile { composes: flex from "./Layout.css"; - composes: paddingX4 from "./boxWhitespace.css"; - composes: paddingY4 from "./boxWhitespace.css"; + composes: paddingX400 from "./boxWhitespace.css"; + composes: paddingY400 from "./boxWhitespace.css"; composes: rounding4 from "./Borders.css"; composes: borderBox from "./Layout.css"; composes: sizeLg from "./Borders.css"; diff --git a/packages/gestalt/src/Video.css b/packages/gestalt/src/Video.css index 4d93280b57..c9102f686c 100644 --- a/packages/gestalt/src/Video.css +++ b/packages/gestalt/src/Video.css @@ -25,8 +25,8 @@ composes: bottom0 from "./Layout.css"; composes: left0 from "./Layout.css"; composes: right0 from "./Layout.css"; - composes: paddingX2 from "./boxWhitespace.css"; - composes: paddingY2 from "./boxWhitespace.css"; + composes: paddingX200 from "./boxWhitespace.css"; + composes: paddingY200 from "./boxWhitespace.css"; background-image: linear-gradient( to bottom, rgb(181 181 181 / 0), diff --git a/packages/gestalt/src/Video/__snapshots__/Controls.test.tsx.snap b/packages/gestalt/src/Video/__snapshots__/Controls.test.tsx.snap index 0d6ef4ca1c..2e7b26aa9f 100644 --- a/packages/gestalt/src/Video/__snapshots__/Controls.test.tsx.snap +++ b/packages/gestalt/src/Video/__snapshots__/Controls.test.tsx.snap @@ -5,7 +5,7 @@ exports[`VideoControls for double digit minutes 1`] = ` className="controls" >
Needs attention ActivationCard 1`] = `
Needs attention ActivationCard 1`] = ` } >
Needs attention ActivationCard 1`] = `
Needs attention ActivationCard 1`] = `
Needs attention ActivationCard 1`] = ` exports[` Not started ActivationCard 1`] = `
Not started ActivationCard 1`] = ` } >
Not started ActivationCard 1`] = `
Not started ActivationCard 1`] = `
Not started ActivationCard 1`] = ` exports[` Pending ActivationCard 1`] = `
Pending ActivationCard 1`] = ` } >
Pending ActivationCard 1`] = `
Pending ActivationCard 1`] = `
Pending ActivationCard 1`] = ` exports[` complete ActivationCard 1`] = `
complete ActivationCard 1`] = ` className="box contentCenter xsDisplayFlex" >
complete ActivationCard 1`] = `
complete ActivationCard 1`] = ` exports[` message + title + link + dismissButton 1`] = `
message + title + link + dismissButton 1`] = ` } >
message + title + link + dismissButton 1`] = `
message + title + link + dismissButton 1`] = `
message + title + link + dismissButton 1`] = ` className="box" >
message + title + link + dismissButton 1`] = ` tabIndex={0} >
message + title + link + dismissButton 1`] = ` exports[` message + title + link 1`] = `
message + title + link 1`] = ` } >
message + title + link 1`] = `
message + title + link 1`] = `
message + title + link 1`] = ` className="box" >
message + title + link 1`] = ` tabIndex={0} >
message + title + link 1`] = ` exports[` message + title 1`] = `
message + title 1`] = ` } >
message + title 1`] = `
message + title 1`] = `
Error BannerCallout 1`] = `
Error BannerCallout 1`] = ` } >
Error BannerCallout 1`] = `
Error BannerCallout 1`] = ` exports[` Info BannerCallout 1`] = `
Info BannerCallout 1`] = ` } >
Info BannerCallout 1`] = `
Info BannerCallout 1`] = ` exports[` Warning BannerCallout 1`] = `
Warning BannerCallout 1`] = ` } >
Warning BannerCallout 1`] = `
Warning BannerCallout 1`] = ` exports[` bannercallout with rich text message 1`] = `
bannercallout with rich text message 1`] = ` } >
bannercallout with rich text message 1`] = `
bannercallout with rich text message 1`] = ` className="box marginBottomAuto marginTopAuto smDisplayBlock xsDirectionColumn xsDisplayFlex xsItemsCenter" >
bannercallout with rich text message 1`] = `
Modal content @@ -95,10 +95,10 @@ exports[`ModalAlert Desktop ModalAlert renders (default) 1`] = ` style="z-index: 1;" >
Modal content @@ -209,10 +209,10 @@ exports[`ModalAlert Desktop ModalAlert renders (error) 1`] = ` style="z-index: 1;" >
Modal content @@ -323,10 +323,10 @@ exports[`ModalAlert Desktop ModalAlert renders (warning) 1`] = ` style="z-index: 1;" >
Modal content @@ -454,10 +454,10 @@ exports[`ModalAlert Mobile Desktop ModalAlert renders 1`] = ` style="z-index: 1;" >