Skip to content

Commit fa8551d

Browse files
committed
chore: mockup feb 18
1 parent fb5a490 commit fa8551d

File tree

12 files changed

+316
-168
lines changed

12 files changed

+316
-168
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import type { DirectButtonProps } from "./types";
1212
*/
1313
const defaultStyles: BoxStyleProps = merge(BaseStyles.default, {
1414
color: "colorText",
15-
backgroundColor: "colorBackgroundWeaker",
15+
backgroundColor: "colorBackgroundWeak",
1616
boxShadow: "shadowBorderWeak",
1717
_hover: {
1818
color: "colorTextPrimary",

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ const variantStyles: Record<CalloutVariants, BoxStyleProps> = {
8484
borderColor: "colorBorderNewWeak",
8585
},
8686
neutral: {
87-
backgroundColor: "colorBackgroundWeak",
87+
backgroundColor: "colorBackground",
8888
color: "colorTextNeutral",
8989
borderColor: "colorBorderNeutralWeak",
9090
},
@@ -133,6 +133,7 @@ export const Callout = React.forwardRef<HTMLDivElement, CalloutProps>(
133133
padding="space70"
134134
// borderLeftStyle="solid"
135135
borderLeftWidth="borderWidth20"
136+
borderRadius="borderRadius40"
136137
variant={variant}
137138
alignItems="start"
138139
columnGap="space50"

packages/paste-core/components/sidebar/src/Sidebar.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,11 @@ const StyledSidebar = React.forwardRef<HTMLDivElement, BoxProps>((props, ref) =>
1818
display="flex"
1919
flexDirection="column"
2020
ref={ref}
21-
borderRightStyle="solid"
21+
boxShadow="shadowElevationRightInverse05"
22+
// borderRightStyle="solid"
2223
borderRightWidth="borderWidth10"
2324
borderRightColor="colorBorderInverseWeaker"
24-
backgroundColor="colorBackgroundInverse"
25+
backgroundColor="colorBackgroundBodyInverse"
2526
zIndex="zIndex50"
2627
position="fixed"
2728
top={0}

packages/paste-core/components/sidebar/src/header/SidebarHeader.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,9 @@ export const SidebarHeader = React.forwardRef<HTMLButtonElement, SidebarHeaderPr
2525
paddingX="space60"
2626
minHeight="sizeTopbar"
2727
borderBottomWidth="borderWidth10"
28-
borderBottomStyle="solid"
28+
// borderBottomStyle="solid"
2929
borderBottomColor="colorBorderInverseWeaker"
30+
boxShadow="shadowElevationBottomInverse05"
3031
display="flex"
3132
alignItems="center"
3233
justifyContent="flex-start"

packages/paste-core/components/sidebar/src/navigation/SidebarNavigation.tsx

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,10 +101,13 @@ export const SidebarNavigation = React.forwardRef<HTMLDivElement, SidebarNavigat
101101
maxHeight="100%"
102102
overflowY="auto"
103103
overflowX="hidden"
104-
paddingY="space50"
105-
paddingLeft="space60"
106-
paddingRight={collapsed ? "space40" : "space60"}
104+
paddingY="space100"
105+
paddingLeft="space30"
106+
paddingRight={collapsed ? "space30" : "space60"}
107107
flexGrow={1}
108+
display="flex"
109+
flexDirection="column"
110+
alignItems="center"
108111
>
109112
{children}
110113
</Box>

packages/paste-core/components/sidebar/src/navigation/SidebarNavigationItem.tsx

Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,8 @@ const SidebarNavigationItem = React.forwardRef<HTMLAnchorElement, SidebarNavigat
8282
...(collapsed && sidebarNavigationItemCollapsedStyles),
8383
...(selected && sidebarNavigationItemSelectedStyles),
8484
display: collapsed && hideItemsOnCollapse ? "none" : "flex",
85-
width: collapsed ? "36px" : "100%",
85+
width: collapsed ? "58px" : "100%",
86+
height: "58px",
8687
}),
8788
[isNested, selected, collapsed, hideItemsOnCollapse, hierarchical],
8889
);
@@ -96,26 +97,30 @@ const SidebarNavigationItem = React.forwardRef<HTMLAnchorElement, SidebarNavigat
9697
as="a"
9798
aria-current={selected ? "page" : undefined}
9899
{...styles}
100+
justifyContent="center"
101+
alignItems="center"
99102
>
100103
{icon && (
101104
<Box as="span" color={selected ? "colorTextInverse" : "colorTextIconInverse"}>
102105
{icon}
103106
</Box>
104107
)}
105-
<Box
106-
as="span"
107-
display="flex"
108-
alignItems="center"
109-
justifyContent="space-between"
110-
columnGap="space20"
111-
transition="all 120ms ease"
112-
flexGrow={1}
113-
float={visible ? "none" : "left"}
114-
opacity={visible ? 1 : 0}
115-
whiteSpace={visible ? "normal" : "nowrap"}
116-
>
117-
{collapsed ? null : children}
118-
</Box>
108+
{!collapsed && (
109+
<Box
110+
as="span"
111+
display="flex"
112+
alignItems="center"
113+
justifyContent="space-between"
114+
columnGap="space20"
115+
transition="all 120ms ease"
116+
flexGrow={1}
117+
float={visible ? "none" : "left"}
118+
opacity={visible ? 1 : 0}
119+
whiteSpace={visible ? "normal" : "nowrap"}
120+
>
121+
{collapsed ? null : children}
122+
</Box>
123+
)}
119124
</Box>
120125
);
121126
},

packages/paste-core/components/sidebar/src/navigation/styles.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import type { BoxProps } from "@twilio-paste/box";
77
export const sidebarNavigationLabelStyles: BoxProps = {
88
fontStyle: "normal",
99
fontWeight: "fontWeightNormal",
10-
fontSize: "fontSize30",
11-
lineHeight: "lineHeight20",
10+
fontSize: "fontSize50",
11+
lineHeight: "lineHeight50",
1212
color: "colorTextInverseWeak",
1313
transition: "all 120ms ease",
1414
borderRadius: "borderRadius20",
@@ -50,7 +50,7 @@ export const sidebarNavigationItemStyles: BoxProps = {
5050
overflow: "hidden",
5151
paddingLeft: "space30",
5252
paddingRight: "space30",
53-
marginBottom: "space30",
53+
marginBottom: "space80",
5454
columnGap: "space30",
5555
_hover: {
5656
textDecoration: "underline",
@@ -83,6 +83,6 @@ export const sidebarNavigationItemCollapsedStyles: BoxProps = {
8383
// Selected item styles
8484
export const sidebarNavigationItemSelectedStyles: BoxProps = {
8585
...sidebarNavigationLabelSelectedStyles,
86-
backgroundColor: "colorBackgroundInverseStrong",
86+
backgroundColor: "colorBackgroundStrong",
8787
color: "colorTextInverse",
8888
};

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

Lines changed: 30 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -5,34 +5,35 @@ aliases:
55
amaranth: "#EF223A"
66
amaranth-transparent-10: "rgb(239, 34, 58, .1)"
77
amaranth-transparent-60: "rgb(239, 34, 58, .6)"
8-
palette-blue-05: "E4F7FF"
9-
palette-blue-10: "A5EBFF"
10-
palette-blue-20: "3ACEFA"
11-
palette-blue-30: "19ABF3"
12-
palette-blue-40: "2188EF"
13-
palette-blue-50: "1866EE"
14-
palette-blue-55: "1866EE"
15-
palette-blue-60: "1953B9"
16-
palette-blue-70: "0E3E92"
17-
palette-blue-80: "0B2A60"
18-
palette-blue-85: "081F47"
19-
palette-blue-90: "081F47"
20-
palette-blue-100: "0F1621"
8+
palette-blue-05: "#E4F7FF"
9+
palette-blue-10: "#A5EBFF"
10+
palette-blue-20: "#3ACEFA"
11+
palette-blue-30: "#19ABF3"
12+
palette-blue-40: "#2188EF"
13+
palette-blue-50: "#1866EE"
14+
palette-blue-55: "#1866EE"
15+
palette-blue-60: "#1953B9"
16+
palette-blue-70: "#0E3E92"
17+
palette-blue-80: "#0B2A60"
18+
palette-blue-85: "#081F47"
19+
palette-blue-90: "#081F47"
20+
palette-blue-100: "#0F1621"
2121
palette-blue-50-transparent-30: "rgb(24, 102, 238, .3)"
2222
palette-blue-20-transparent-40: "rgb(58, 206, 250, .4)"
23-
palette-gray-05: "F3F4F7"
24-
palette-gray-10: "DDE0E6"
25-
palette-gray-15: "EDEEF2"
26-
palette-gray-20: "BABECC"
27-
palette-gray-30: "9AA0B4"
28-
palette-gray-40: "7E869C"
29-
palette-gray-50: "656E87"
30-
palette-gray-55: "67728E"
31-
palette-gray-60: "4D5777"
32-
palette-gray-70: "38425E"
33-
palette-gray-75: "404F6E"
34-
palette-gray-80: "232B45"
35-
palette-gray-85: "191F36"
36-
palette-gray-90: "080C18"
37-
palette-gray-95: "19273E"
38-
palette-gray-100: "080C18"
23+
palette-gray-00: "#FFFFFF"
24+
palette-gray-05: "#F3F4F7"
25+
palette-gray-10: "#DDE0E6"
26+
palette-gray-15: "#EDEEF2"
27+
palette-gray-20: "#BABECC"
28+
palette-gray-30: "#9AA0B4"
29+
palette-gray-40: "#7E869C"
30+
palette-gray-50: "#656E87"
31+
palette-gray-55: "#67728E"
32+
palette-gray-60: "#4D5777"
33+
palette-gray-70: "#38425E"
34+
palette-gray-75: "#404F6E"
35+
palette-gray-80: "#232B45"
36+
palette-gray-85: "#191F36"
37+
palette-gray-90: "#080C18"
38+
palette-gray-95: "#19273E"
39+
palette-gray-100: "#0A0F16"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ props:
1414
color-background-body:
1515
value: "{!palette-gray-100}"
1616
color-background-body-inverse:
17-
value: "{!palette-gray-110}"
17+
value: "{!palette-blue-100}"
1818
color-background-inverse:
1919
value: "{!palette-gray-110}"
2020
color-background-weakest:
@@ -24,6 +24,6 @@ props:
2424
color-background-primary-stronger:
2525
value: "{!palette-gray-0}"
2626
color-background-primary-weakest:
27-
value: "{!palette-blue-90}"
27+
value: "{!palette-gray-70}"
2828
color-background-overlay:
2929
value: "{!palette-gray-100-transparent-70}"

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

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,18 @@ props:
88
shadow-brand-10:
99
value: "{!offset-0} {!offset-0} {!offset-80} {!offset-0} {!palette-blue-50-transparent-30}"
1010
shadow-border-weak:
11-
value: "{!palette-gray-60}"
11+
value: "{!offset-0} {!offset-0} {!offset-0} {!offset-05} {!palette-gray-60}"
1212
shadow-border-primary-stronger:
13-
value: "{!palette-gray-0}"
13+
value: "{!offset-0} {!offset-0} {!offset-0} {!offset-05} {!palette-gray-0}"
14+
shadow-border-primary:
15+
value: "{!offset-0} {!offset-0} {!offset-0} {!offset-05} {!palette-gray-70}"
1416
shadow-border-primary-weaker:
15-
value: "{!palette-blue-90}"
17+
value: "{!offset-0} {!offset-0} {!offset-0} {!offset-05} {!palette-blue-90}"
1618
shadow-elevation-10:
1719
value: "{!offset-0} {!offset-negative-05} {!offset-0} {!offset-0} {!palette-gray-80}, {!offset-0} {!offset-15} {!offset-20} {!offset-0} {!palette-gray-110-transparent-10}"
20+
shadow-elevation-right-inverse-05:
21+
value: "{!offset-10} {!offset-0} {!offset-0} {!offset-0} {!palette-gray-100}"
22+
shadow-elevation-bottom-inverse-05:
23+
value: "{!offset-0} {!offset-05} {!offset-0} {!offset-0} {!palette-gray-100}"
24+
shadow-border-inverse-weaker:
25+
value: "{!offset-0} {!offset-0} {!offset-0} {!offset-05} {!palette-gray-80}"

0 commit comments

Comments
 (0)