Skip to content

Commit 72dd3e5

Browse files
committed
chore: feb 13 and 14 morning
1 parent c7eb78c commit 72dd3e5

File tree

25 files changed

+71
-32
lines changed

25 files changed

+71
-32
lines changed

packages/paste-core/components/anchor/src/DefaultAnchor.tsx

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ const DefaultAnchor = React.forwardRef<HTMLAnchorElement, AnchorProps>((props, r
1414
outline="none"
1515
ref={ref}
1616
textDecoration="underline"
17+
textUnderlineOffset="4px" // TODO: make work
1718
_active={{
1819
color: "colorTextLinkStrongest",
1920
textDecoration: "none",

packages/paste-core/components/button/src/SecondaryButton.tsx

+4-4
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ import type { DirectButtonProps } from "./types";
1212
*/
1313
const defaultStyles: BoxStyleProps = merge(BaseStyles.default, {
1414
color: "colorText",
15-
backgroundColor: "colorBackgroundBody",
15+
backgroundColor: "colorBackgroundWeaker",
1616
boxShadow: "shadowBorderWeak",
1717
_hover: {
1818
color: "colorTextPrimary",
19-
backgroundColor: "colorBackgroundBody",
19+
backgroundColor: "colorBackgroundWeaker",
2020
boxShadow: "shadowBorderPrimary",
2121
},
2222
_focus: {
@@ -31,7 +31,7 @@ const defaultStyles: BoxStyleProps = merge(BaseStyles.default, {
3131

3232
const baseLoadingStyles: BoxStyleProps = {
3333
color: "colorTextPrimary",
34-
backgroundColor: "colorBackgroundBody",
34+
backgroundColor: "colorBackgroundWeaker",
3535
boxShadow: "shadowBorderWeak",
3636
};
3737

@@ -44,7 +44,7 @@ const loadingStyles: BoxStyleProps = merge(BaseStyles.loading, {
4444

4545
const baseDisabledStyles: BoxStyleProps = {
4646
color: "colorTextWeaker",
47-
backgroundColor: "colorBackgroundBody",
47+
backgroundColor: "colorBackgroundWeaker",
4848
boxShadow: "shadowBorderWeaker",
4949
};
5050

packages/paste-core/components/button/src/styles.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ export const SizeStyles: { [key in ButtonSizes]: BoxStyleProps } = {
4242
default: {
4343
paddingTop: "space30",
4444
paddingBottom: "space30",
45-
paddingLeft: "space40",
46-
paddingRight: "space40",
45+
paddingLeft: "space70",
46+
paddingRight: "space70",
4747
borderRadius: "borderRadius20",
4848
fontSize: "fontSize30",
4949
lineHeight: "lineHeight20",

packages/paste-core/components/callout/src/Callout.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ export const Callout = React.forwardRef<HTMLDivElement, CalloutProps>(
131131
display="flex"
132132
marginY={marginY}
133133
padding="space70"
134-
borderLeftStyle="solid"
134+
// borderLeftStyle="solid"
135135
borderLeftWidth="borderWidth20"
136136
variant={variant}
137137
alignItems="start"
@@ -146,7 +146,7 @@ export const Callout = React.forwardRef<HTMLDivElement, CalloutProps>(
146146
{children}
147147
</Box>
148148
{onDismiss && typeof onDismiss === "function" && (
149-
<Button onClick={onDismiss} variant="secondary_icon" size="reset" element={`${element}_DISMISS_BUTTON`}>
149+
<Button onClick={onDismiss} variant="secondary" size="circle_small" element={`${element}_DISMISS_BUTTON`}>
150150
<CloseIcon element={`${element}_DISMISS_ICON`} decorative size="sizeIcon20" />
151151
<ScreenReaderOnly>{i18nDismissLabel}</ScreenReaderOnly>
152152
</Button>

packages/paste-core/components/card/src/Card.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ const Card = React.forwardRef<HTMLElement, CardProps>(
4545
paddingLeft={paddingLeft}
4646
paddingRight={paddingRight}
4747
paddingTop={paddingTop}
48-
backgroundColor="colorBackgroundBody"
48+
backgroundColor="colorBackground"
4949
>
5050
{children}
5151
</Box>

packages/paste-core/components/heading/src/Heading.tsx

+4
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ function getHeadingProps(headingVariant?: HeadingVariants, marginBottom?: "space
2121
fontWeight: "fontWeightSemibold",
2222
lineHeight: "lineHeight60",
2323
letterSpacing: "-.02em",
24+
color: "colorTextWeak",
2425
};
2526
case "heading40":
2627
return {
@@ -29,6 +30,7 @@ function getHeadingProps(headingVariant?: HeadingVariants, marginBottom?: "space
2930
fontWeight: "fontWeightSemibold",
3031
lineHeight: "lineHeight40",
3132
letterSpacing: "-.02em",
33+
color: "colorTextWeak",
3234
};
3335
case "heading50":
3436
return {
@@ -37,6 +39,7 @@ function getHeadingProps(headingVariant?: HeadingVariants, marginBottom?: "space
3739
fontWeight: "fontWeightSemibold",
3840
lineHeight: "lineHeight30",
3941
letterSpacing: "-.02em",
42+
color: "colorTextWeak",
4043
};
4144
case "heading60":
4245
return {
@@ -45,6 +48,7 @@ function getHeadingProps(headingVariant?: HeadingVariants, marginBottom?: "space
4548
fontWeight: "fontWeightSemibold",
4649
lineHeight: "lineHeight20",
4750
letterSpacing: "-.02em",
51+
color: "colorTextWeak",
4852
};
4953
/**
5054
* heading20 is out of order because its also default.

packages/paste-core/components/input-box/src/FauxInput/DefaultFauxInput.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import type { FauxInputProps } from "../types";
66

77
const DefaultFauxInput = React.forwardRef<HTMLDivElement, React.PropsWithChildren<FauxInputProps>>(
88
({ disabled, element, hasError, readOnly, children, type, variant }, ref) => {
9-
let backgroundColor = "colorBackgroundBody" as BackgroundColor;
9+
let backgroundColor = "colorBackgroundWeaker" as BackgroundColor;
1010
let boxShadow = "shadowBorder" as BoxShadow;
1111
let boxShadowHover = "shadowBorderPrimary" as BoxShadow;
1212
let boxShadowActive = "shadowBorderPrimaryStronger" as BoxShadow;

packages/paste-core/components/table/src/THead.tsx

+1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ const THead = React.forwardRef<HTMLTableSectionElement, THeadProps>(
3030
{...safelySpreadBoxProps(props)}
3131
ref={ref}
3232
as={StyledTHead as any}
33+
backgroundColor="colorBackgroundWeakest"
3334
element={element}
3435
top={top}
3536
{...getStickyStyles({ stickyHeader })}

packages/paste-core/components/table/src/Td.tsx

+2-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ const Td = React.forwardRef<HTMLTableCellElement, TdProps>(
1717
element={element}
1818
fontSize="fontSize30"
1919
lineHeight="lineHeight30"
20-
padding="space50"
20+
paddingX="space50"
21+
paddingY="space30"
2122
position="relative"
2223
textAlign={textAlign}
2324
whiteSpace={whiteSpace}

packages/paste-core/components/table/src/Th.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ const Th = React.forwardRef<HTMLTableCellElement, ThProps>(
1717
fontSize="fontSize30"
1818
lineHeight="lineHeight30"
1919
fontWeight="fontWeightSemibold"
20-
paddingBottom="space40"
20+
paddingBottom="space30"
2121
paddingLeft="space50"
2222
paddingRight="space50"
23-
paddingTop="space40"
23+
paddingTop="space30"
2424
position="relative"
2525
textAlign={textAlign}
2626
whiteSpace={whiteSpace}

packages/paste-core/components/table/src/Tr.tsx

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ const Tr = React.forwardRef<HTMLTableRowElement, TrProps>(
1212
{...safelySpreadBoxProps(props)}
1313
ref={ref}
1414
as="tr"
15+
backgroundColor="colorBackgroundWeakest"
1516
element={element}
1617
verticalAlign={verticalAlign}
1718
_even={{ backgroundColor: striped ? "colorBackgroundRowStriped" : "transparent" }}

packages/paste-core/components/visual-picker/src/VisualPickerCheckbox.tsx

+3-2
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,10 @@ export const VisualPickerCheckbox = React.forwardRef<HTMLInputElement, VisualPic
7575
flexDirection="row"
7676
height="100%"
7777
width="100%"
78-
backgroundColor={disabled || groupIsDisabled ? "colorBackgroundWeak" : undefined}
79-
borderStyle="solid"
78+
backgroundColor={disabled || groupIsDisabled ? "colorBackgroundWeak" : "colorBackgroundWeaker"}
79+
// borderStyle="solid"
8080
borderColor={pickerBorderColor}
81+
boxShadow={checked ? "shadowBrand10" : undefined}
8182
borderWidth="borderWidth10"
8283
borderRadius="borderRadius30"
8384
padding="space50"

packages/paste-core/components/visual-picker/src/VisualPickerRadio.tsx

+3-2
Original file line numberDiff line numberDiff line change
@@ -91,11 +91,12 @@ export const VisualPickerRadio = React.forwardRef<HTMLInputElement, VisualPicker
9191
flexDirection="row"
9292
height="100%"
9393
width="100%"
94-
backgroundColor={disabled || groupIsDisabled ? "colorBackgroundWeak" : undefined}
95-
borderStyle="solid"
94+
backgroundColor={disabled || groupIsDisabled ? "colorBackgroundWeak" : "colorBackgroundWeaker"}
95+
// borderStyle="solid"
9696
borderColor={pickerBorderColor}
9797
borderWidth="borderWidth10"
9898
borderRadius="borderRadius30"
99+
boxShadow={state.checked ? "shadowBrand10" : undefined}
99100
padding="space50"
100101
onMouseEnter={() => setIsHovering(true)}
101102
onMouseLeave={() => setIsHovering(false)}

packages/paste-design-tokens/tokens/aliases/color-palette.yml

+2
Original file line numberDiff line numberDiff line change
@@ -154,3 +154,5 @@ aliases:
154154
palette-purple-80: "#380e78"
155155
palette-purple-90: "#22094a"
156156
palette-purple-100: "#160433"
157+
158+
palette-blue-50-transparent-30: "rgb(24, 102, 238, .3)"

packages/paste-design-tokens/tokens/global/background-color.yml

+2
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ props:
3636
color-background-weaker:
3737
value: "{!palette-gray-0}"
3838
comment: Background color for elevated elements. Matches color-background-body in light mode but appears slightly lighter in dark mode to maintain focus.
39+
color-background-weakest:
40+
value: "{!palette-blue-100}"
3941

4042
# brand backgrounds
4143
color-background-brand:

packages/paste-design-tokens/tokens/global/box-shadow.yml

+2
Original file line numberDiff line numberDiff line change
@@ -289,3 +289,5 @@ props:
289289
shadow-elevation-left-20:
290290
value: "{!offset-0} {!offset-0} {!offset-0} {!offset-05} {!palette-gray-05}, {!offset-negative-20} {!offset-0} {!offset-40} {!offset-0} {!palette-gray-110-transparent-10}, {!offset-negative-60} {!offset-0} {!offset-90} {!offset-0} {!palette-gray-110-transparent-05}"
291291
comment: Use for elements that dynamically open from the right side of the screen, appearing above the UI to indicate a greater separation from the underlying surface.
292+
shadow-brand-10:
293+
value: "{!offset-0} {!offset-0} {!offset-80} {!offset-0} {!palette-blue-50-transparent-30}"

packages/paste-design-tokens/tokens/themes/rebrand/aliases/color-palette.yml

+5-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ imports:
33
aliases:
44
## Colors
55
amaranth: "#EF223A"
6+
amaranth-transparent-10: "rgb(239, 34, 58, .1)"
7+
amaranth-transparent-60: "rgb(239, 34, 58, .6)"
68
palette-blue-05: "E4F7FF"
79
palette-blue-10: "A5EBFF"
810
palette-blue-20: "3ACEFA"
@@ -14,7 +16,9 @@ aliases:
1416
palette-blue-80: "0B2A60"
1517
palette-blue-85: "081F47"
1618
palette-blue-90: "000D25"
17-
palette-blue-50-transparent-30: "EEEEEE"
19+
palette-blue-100: "0F1621"
20+
palette-blue-50-transparent-30: "rgb(24, 102, 238, .3)"
21+
palette-blue-20-transparent-40: "rgb(58, 206, 250, .4)"
1822
palette-gray-05: "F3F4F7"
1923
palette-gray-10: "DDE0E6"
2024
palette-gray-20: "BABECC"

packages/paste-design-tokens/tokens/themes/rebrand/global/background-color.yml

+5-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ imports:
66
- ../../../aliases/border-radius.yml
77
props:
88
color-background:
9-
value: "{!palette-gray-80}"
9+
value: "{!palette-gray-85}"
1010
color-background-weaker:
1111
value: "{!palette-gray-85}"
1212
color-background-strong:
@@ -17,3 +17,7 @@ props:
1717
value: "{!palette-gray-110}"
1818
color-background-inverse:
1919
value: "{!palette-gray-110}"
20+
color-background-weakest:
21+
value: "{!palette-blue-100}"
22+
color-background-body-elevation:
23+
value: "{!palette-gray-85}"

packages/paste-design-tokens/tokens/themes/rebrand/global/border-color.yml

+2
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,5 @@ imports:
88
props:
99
color-border-primary:
1010
value: "{!palette-blue-30}"
11+
color-border-weaker:
12+
value: "{!palette-gray-80}"

packages/paste-design-tokens/tokens/themes/rebrand/global/line-height.yml

+3
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,6 @@ global:
33
type: number
44
imports:
55
- ../../twilio-dark/global/line-height.yml
6+
props:
7+
line-height-40:
8+
value: "{!line-height-60}"

packages/paste-design-tokens/tokens/themes/rebrand/global/text-color.yml

+6
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,9 @@ global:
33
category: text-color
44
imports:
55
- ../../twilio-dark/global/text-color.yml
6+
- ../aliases/color-palette.yml
7+
props:
8+
color-text-weak:
9+
value: "{!palette-gray-40}"
10+
color-text-link:
11+
value: "{!palette-gray-0}"

packages/paste-style-props/src/types/typography.ts

+7
Original file line numberDiff line numberDiff line change
@@ -181,4 +181,11 @@ export interface TypographyProps {
181181
* @memberof TypographyProps
182182
*/
183183
listStyleType?: ListStyleType;
184+
/**
185+
* Responsive style prop for the CSS `text-underline-offset` property
186+
*
187+
* @type {ListStyleType}
188+
* @memberof TypographyProps
189+
*/
190+
textUnderlineOffset?: ListStyleType;
184191
}

packages/paste-style-props/src/typography.ts

+1
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,5 @@ export const TYPOGRAPHY_PROPS = [
1414
"wordBreak",
1515
"wordWrap",
1616
"overflowWrap",
17+
"textUnderlineOffset",
1718
];

packages/paste-theme/src/types/themes.ts

+2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import type { DarkTheme } from "../themes/dark";
22
import type { DefaultTheme } from "../themes/default";
33
import type { EvergreenTheme } from "../themes/evergreen";
4+
import type { RebrandTheme } from "../themes/rebrand";
45
import type { SendGridTheme } from "../themes/sendgrid";
56
import type { TwilioTheme } from "../themes/twilio";
67
import type { TwilioDarkTheme } from "../themes/twilio-dark";
@@ -12,3 +13,4 @@ export type ThemeShape = typeof DefaultTheme;
1213
export type EvergreenThemeShape = typeof EvergreenTheme;
1314
export type TwilioThemeShape = typeof TwilioTheme;
1415
export type TwilioDarkThemeShape = typeof TwilioDarkTheme;
16+
export type RebrandThemeThemeShape = typeof RebrandTheme;

packages/paste-theme/stories/rebrandTheme.stories.tsx

+7-13
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { Alert } from "@twilio-paste/alert";
22
import type { AlertProps } from "@twilio-paste/alert";
3+
import { Anchor } from "@twilio-paste/anchor";
34
import { Avatar } from "@twilio-paste/avatar";
45
import type { AvatarProps } from "@twilio-paste/avatar";
56
import { Box } from "@twilio-paste/box";
@@ -43,23 +44,16 @@ export const Rebrand = (): React.ReactNode => (
4344
<DisplayHeading variant="displayHeading30" as="h3">
4445
Display Heading 3
4546
</DisplayHeading>
46-
<Box
47-
borderColor="colorBorder"
48-
borderRadius="borderRadius20"
49-
backgroundColor="colorBackgroundAvailable"
50-
width="size10"
51-
height="size10"
52-
/>
5347
<Heading as="h3" variant="heading20">
5448
Paragraph and Inputs
5549
</Heading>
5650
<Paragraph>
57-
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore
58-
magna aliqua. Nisi porta lorem mollis aliquam ut porttitor leo. Hendrerit gravida rutrum quisque non. A arcu
59-
cursus vitae congue mauris rhoncus aenean vel elit. Tortor dignissim convallis aenean et tortor at risus.
60-
Vestibulum lorem sed risus ultricies. Tempor nec feugiat nisl pretium fusce id. Morbi tempus iaculis urna id
61-
volutpat lacus laoreet non curabitur. In ante metus dictum at. Sit amet risus nullam eget felis eget nunc
62-
lobortis.
51+
Lorem <Anchor href="#">ipsum</Anchor> dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor
52+
incididunt ut labore et dolore magna aliqua. Nisi porta lorem mollis aliquam ut porttitor leo. Hendrerit
53+
gravida rutrum quisque non. A arcu cursus vitae congue mauris rhoncus aenean vel elit. Tortor dignissim
54+
convallis aenean et tortor at risus. Vestibulum lorem sed risus ultricies. Tempor nec feugiat nisl pretium
55+
fusce id. Morbi tempus iaculis urna id volutpat lacus laoreet non curabitur. In ante metus dictum at. Sit amet
56+
risus nullam eget felis eget nunc lobortis.
6357
</Paragraph>
6458
<Stack orientation="vertical" spacing="space50">
6559
<Input aria-label="Search" placeholder="Search options..." type="text" />

0 commit comments

Comments
 (0)