diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000000..26d33521af --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000000..94a25f7f4c --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/change/@fluentui-react-native-android-theme-4274a272-d9bc-4ead-90f0-bffbdfe441b0.json b/change/@fluentui-react-native-android-theme-4274a272-d9bc-4ead-90f0-bffbdfe441b0.json new file mode 100644 index 0000000000..883faf5121 --- /dev/null +++ b/change/@fluentui-react-native-android-theme-4274a272-d9bc-4ead-90f0-bffbdfe441b0.json @@ -0,0 +1,7 @@ +{ + "type": "patch", + "comment": "Added theme color tokens support for android", + "packageName": "@fluentui-react-native/android-theme", + "email": "email not defined", + "dependentChangeType": "patch" +} diff --git a/change/@fluentui-react-native-apple-theme-e0b1c4fb-0d91-4b63-ac9e-829e9f19a1ea.json b/change/@fluentui-react-native-apple-theme-e0b1c4fb-0d91-4b63-ac9e-829e9f19a1ea.json new file mode 100644 index 0000000000..293a278850 --- /dev/null +++ b/change/@fluentui-react-native-apple-theme-e0b1c4fb-0d91-4b63-ac9e-829e9f19a1ea.json @@ -0,0 +1,7 @@ +{ + "type": "none", + "comment": "snapshots udpate", + "packageName": "@fluentui-react-native/apple-theme", + "email": "email not defined", + "dependentChangeType": "none" +} diff --git a/change/@fluentui-react-native-avatar-55b164d4-9db3-4a36-92fa-7bd41020d22d.json b/change/@fluentui-react-native-avatar-55b164d4-9db3-4a36-92fa-7bd41020d22d.json new file mode 100644 index 0000000000..872cc3aea3 --- /dev/null +++ b/change/@fluentui-react-native-avatar-55b164d4-9db3-4a36-92fa-7bd41020d22d.json @@ -0,0 +1,7 @@ +{ + "type": "none", + "comment": "mergeandfix", + "packageName": "@fluentui-react-native/avatar", + "email": "email not defined", + "dependentChangeType": "none" +} diff --git a/change/@fluentui-react-native-badge-e562e146-a045-4107-b7c8-97d15d685236.json b/change/@fluentui-react-native-badge-e562e146-a045-4107-b7c8-97d15d685236.json new file mode 100644 index 0000000000..8ec172fb2f --- /dev/null +++ b/change/@fluentui-react-native-badge-e562e146-a045-4107-b7c8-97d15d685236.json @@ -0,0 +1,7 @@ +{ + "type": "none", + "comment": "Snapshots update", + "packageName": "@fluentui-react-native/badge", + "email": "email not defined", + "dependentChangeType": "none" +} diff --git a/change/@fluentui-react-native-button-6e7481bc-d2d1-44f6-9c27-c83a3e89451e.json b/change/@fluentui-react-native-button-6e7481bc-d2d1-44f6-9c27-c83a3e89451e.json new file mode 100644 index 0000000000..de47f9c68e --- /dev/null +++ b/change/@fluentui-react-native-button-6e7481bc-d2d1-44f6-9c27-c83a3e89451e.json @@ -0,0 +1,7 @@ +{ + "type": "none", + "comment": "Snapshots update", + "packageName": "@fluentui-react-native/button", + "email": "email not defined", + "dependentChangeType": "none" +} diff --git a/change/@fluentui-react-native-default-theme-9421b838-27f5-45fe-9a28-c3df533dbac9.json b/change/@fluentui-react-native-default-theme-9421b838-27f5-45fe-9a28-c3df533dbac9.json new file mode 100644 index 0000000000..228689fc94 --- /dev/null +++ b/change/@fluentui-react-native-default-theme-9421b838-27f5-45fe-9a28-c3df533dbac9.json @@ -0,0 +1,7 @@ +{ + "type": "minor", + "comment": "Used alias tokens from theme-tokens pacakge", + "packageName": "@fluentui-react-native/default-theme", + "email": "email not defined", + "dependentChangeType": "patch" +} diff --git a/change/@fluentui-react-native-experimental-radio-group-28e2cb21-bcad-4154-a0da-005be0e9a75d.json b/change/@fluentui-react-native-experimental-radio-group-28e2cb21-bcad-4154-a0da-005be0e9a75d.json new file mode 100644 index 0000000000..44d20bdf56 --- /dev/null +++ b/change/@fluentui-react-native-experimental-radio-group-28e2cb21-bcad-4154-a0da-005be0e9a75d.json @@ -0,0 +1,7 @@ +{ + "type": "none", + "comment": "snapshots update", + "packageName": "@fluentui-react-native/experimental-radio-group", + "email": "email not defined", + "dependentChangeType": "none" +} diff --git a/change/@fluentui-react-native-experimental-tabs-8a5936be-5fcb-498a-95b8-c43c657f8f6e.json b/change/@fluentui-react-native-experimental-tabs-8a5936be-5fcb-498a-95b8-c43c657f8f6e.json new file mode 100644 index 0000000000..d3f7867438 --- /dev/null +++ b/change/@fluentui-react-native-experimental-tabs-8a5936be-5fcb-498a-95b8-c43c657f8f6e.json @@ -0,0 +1,7 @@ +{ + "type": "none", + "comment": "snapshots update", + "packageName": "@fluentui-react-native/experimental-tabs", + "email": "email not defined", + "dependentChangeType": "none" +} diff --git a/change/@fluentui-react-native-link-96248e0a-322f-44f5-bfa8-6b49461d3a7d.json b/change/@fluentui-react-native-link-96248e0a-322f-44f5-bfa8-6b49461d3a7d.json new file mode 100644 index 0000000000..9b1570b73e --- /dev/null +++ b/change/@fluentui-react-native-link-96248e0a-322f-44f5-bfa8-6b49461d3a7d.json @@ -0,0 +1,7 @@ +{ + "type": "none", + "comment": "snapshots update", + "packageName": "@fluentui-react-native/link", + "email": "email not defined", + "dependentChangeType": "none" +} diff --git a/change/@fluentui-react-native-menu-0f6cc7dd-c68e-4149-91ce-a7b10bb3a24f.json b/change/@fluentui-react-native-menu-0f6cc7dd-c68e-4149-91ce-a7b10bb3a24f.json new file mode 100644 index 0000000000..4a988d1df5 --- /dev/null +++ b/change/@fluentui-react-native-menu-0f6cc7dd-c68e-4149-91ce-a7b10bb3a24f.json @@ -0,0 +1,7 @@ +{ + "type": "none", + "comment": "snapsots update", + "packageName": "@fluentui-react-native/menu", + "email": "email not defined", + "dependentChangeType": "none" +} diff --git a/change/@fluentui-react-native-stack-4e38e1d3-74a5-4651-b5cb-2c9a06f3798d.json b/change/@fluentui-react-native-stack-4e38e1d3-74a5-4651-b5cb-2c9a06f3798d.json new file mode 100644 index 0000000000..92d189d80f --- /dev/null +++ b/change/@fluentui-react-native-stack-4e38e1d3-74a5-4651-b5cb-2c9a06f3798d.json @@ -0,0 +1,7 @@ +{ + "type": "none", + "comment": "snapshots update", + "packageName": "@fluentui-react-native/stack", + "email": "email not defined", + "dependentChangeType": "none" +} diff --git a/change/@fluentui-react-native-switch-4d8a5a36-1aee-4b0c-a4a9-eb6e35b7b0fb.json b/change/@fluentui-react-native-switch-4d8a5a36-1aee-4b0c-a4a9-eb6e35b7b0fb.json new file mode 100644 index 0000000000..e4215ecdf2 --- /dev/null +++ b/change/@fluentui-react-native-switch-4d8a5a36-1aee-4b0c-a4a9-eb6e35b7b0fb.json @@ -0,0 +1,7 @@ +{ + "type": "none", + "comment": "snapshosts update", + "packageName": "@fluentui-react-native/switch", + "email": "email not defined", + "dependentChangeType": "none" +} diff --git a/change/@fluentui-react-native-tabs-7da1ae27-48c5-44e4-ad91-2ac9bc51b61a.json b/change/@fluentui-react-native-tabs-7da1ae27-48c5-44e4-ad91-2ac9bc51b61a.json new file mode 100644 index 0000000000..1802315d4e --- /dev/null +++ b/change/@fluentui-react-native-tabs-7da1ae27-48c5-44e4-ad91-2ac9bc51b61a.json @@ -0,0 +1,7 @@ +{ + "type": "none", + "comment": "snapshots update", + "packageName": "@fluentui-react-native/tabs", + "email": "email not defined", + "dependentChangeType": "none" +} diff --git a/change/@fluentui-react-native-text-b082706a-2d6c-4991-951e-e38f4867f993.json b/change/@fluentui-react-native-text-b082706a-2d6c-4991-951e-e38f4867f993.json new file mode 100644 index 0000000000..f466252dd2 --- /dev/null +++ b/change/@fluentui-react-native-text-b082706a-2d6c-4991-951e-e38f4867f993.json @@ -0,0 +1,7 @@ +{ + "type": "none", + "comment": "snapshots update", + "packageName": "@fluentui-react-native/text", + "email": "email not defined", + "dependentChangeType": "none" +} diff --git a/change/@fluentui-react-native-theme-tokens-7260d383-5025-423e-b334-99f4026db9e4.json b/change/@fluentui-react-native-theme-tokens-7260d383-5025-423e-b334-99f4026db9e4.json new file mode 100644 index 0000000000..65c0de190f --- /dev/null +++ b/change/@fluentui-react-native-theme-tokens-7260d383-5025-423e-b334-99f4026db9e4.json @@ -0,0 +1,7 @@ +{ + "type": "none", + "comment": "Added implmemtations for android tokens", + "packageName": "@fluentui-react-native/theme-tokens", + "email": "email not defined", + "dependentChangeType": "none" +} diff --git a/change/@fluentui-react-native-theme-types-568f12c4-f282-4a7e-b76a-6a5c83256e2f.json b/change/@fluentui-react-native-theme-types-568f12c4-f282-4a7e-b76a-6a5c83256e2f.json new file mode 100644 index 0000000000..bbf6701805 --- /dev/null +++ b/change/@fluentui-react-native-theme-types-568f12c4-f282-4a7e-b76a-6a5c83256e2f.json @@ -0,0 +1,7 @@ +{ + "type": "minor", + "comment": "Made color type properties optional", + "packageName": "@fluentui-react-native/theme-types", + "email": "email not defined", + "dependentChangeType": "patch" +} diff --git a/change/@fluentui-react-native-theming-utils-6cc91bd3-afb8-42e0-876b-25d7b50d9759.json b/change/@fluentui-react-native-theming-utils-6cc91bd3-afb8-42e0-876b-25d7b50d9759.json new file mode 100644 index 0000000000..a826592986 --- /dev/null +++ b/change/@fluentui-react-native-theming-utils-6cc91bd3-afb8-42e0-876b-25d7b50d9759.json @@ -0,0 +1,7 @@ +{ + "type": "minor", + "comment": "Added new api fro android", + "packageName": "@fluentui-react-native/theming-utils", + "email": "email not defined", + "dependentChangeType": "patch" +} diff --git a/change/@fluentui-react-native-win32-theme-9b723b10-1f38-4b69-aca3-48e88b9e1059.json b/change/@fluentui-react-native-win32-theme-9b723b10-1f38-4b69-aca3-48e88b9e1059.json new file mode 100644 index 0000000000..b637f221a6 --- /dev/null +++ b/change/@fluentui-react-native-win32-theme-9b723b10-1f38-4b69-aca3-48e88b9e1059.json @@ -0,0 +1,7 @@ +{ + "type": "none", + "comment": "snapshots", + "packageName": "@fluentui-react-native/win32-theme", + "email": "email not defined", + "dependentChangeType": "none" +} diff --git a/packages/components/Avatar/src/__tests__/__snapshots__/Avatar.test.jsx.snap b/packages/components/Avatar/src/__tests__/__snapshots__/Avatar.test.jsx.snap index 326d533618..f399836333 100644 --- a/packages/components/Avatar/src/__tests__/__snapshots__/Avatar.test.jsx.snap +++ b/packages/components/Avatar/src/__tests__/__snapshots__/Avatar.test.jsx.snap @@ -33,7 +33,7 @@ exports[`Avatar rendering renders Avatar 1`] = ` Object { "alignItems": "center", "aspectRatio": 1, - "backgroundColor": "#e6e6e6", + "backgroundColor": "#5c5c5c", "borderColor": "#d1d1d1", "borderRadius": 9999, "borderWidth": 0, @@ -47,7 +47,7 @@ exports[`Avatar rendering renders Avatar 1`] = ` align="xMidYMid" bbHeight={16} bbWidth={16} - color={-10395295} + color={-8355712} focusable={false} height={16} meetOrSlice={0} @@ -66,7 +66,7 @@ exports[`Avatar rendering renders Avatar 1`] = ` }, ] } - tintColor={-10395295} + tintColor={-8355712} vbHeight={16} vbWidth={14} width={16} diff --git a/packages/components/Badge/src/__tests__/__snapshots__/Badge.test.tsx.snap b/packages/components/Badge/src/__tests__/__snapshots__/Badge.test.tsx.snap index 5f08b65e4b..268049f555 100644 --- a/packages/components/Badge/src/__tests__/__snapshots__/Badge.test.tsx.snap +++ b/packages/components/Badge/src/__tests__/__snapshots__/Badge.test.tsx.snap @@ -8,8 +8,7 @@ exports[`Badge component tests Badge all props 1`] = ` Object { "alignItems": "center", "alignSelf": "flex-start", - "backgroundColor": "transparent", - "borderColor": "transparent", + "backgroundColor": undefined, "borderRadius": 4, "borderWidth": 1, "bottom": 0, @@ -43,9 +42,8 @@ exports[`Badge component tests Badge all props 1`] = ` numberOfLines={0} style={ Object { - "color": "#ffffff", "fontFamily": "Segoe UI", - "fontSize": 12, + "fontSize": 13, "fontWeight": "400", "margin": 0, "marginEnd": 2, @@ -84,9 +82,8 @@ exports[`Badge component tests Badge tokens 1`] = ` numberOfLines={0} style={ Object { - "color": "#ffffff", "fontFamily": "Segoe UI", - "fontSize": 12, + "fontSize": 13, "fontWeight": "400", "margin": 0, } @@ -103,8 +100,7 @@ exports[`Badge component tests Empty Badge 1`] = ` Object { "alignItems": "center", "alignSelf": "flex-start", - "backgroundColor": "#0078d4", - "borderColor": "transparent", + "backgroundColor": undefined, "borderRadius": 9999, "borderWidth": 1, "bottom": 0, @@ -130,8 +126,7 @@ exports[`CounterBadge component tests CounterBadge all props 1`] = ` Object { "alignItems": "center", "alignSelf": "flex-start", - "backgroundColor": "transparent", - "borderColor": "transparent", + "backgroundColor": undefined, "borderRadius": 4, "borderWidth": 1, "bottom": 0, @@ -163,9 +158,9 @@ exports[`CounterBadge component tests CounterBadge all props 1`] = ` numberOfLines={0} style={ Object { - "color": "#ffffff", + "color": "#323130", "fontFamily": "Segoe UI", - "fontSize": 12, + "fontSize": 13, "fontStyle": undefined, "fontWeight": "400", "letterSpacing": undefined, @@ -187,8 +182,7 @@ exports[`CounterBadge component tests CounterBadge shows 99+ 1`] = ` Object { "alignItems": "center", "alignSelf": "flex-start", - "backgroundColor": "#0078d4", - "borderColor": "transparent", + "backgroundColor": undefined, "borderRadius": 9999, "borderWidth": 1, "bottom": 0, @@ -206,9 +200,9 @@ exports[`CounterBadge component tests CounterBadge shows 99+ 1`] = ` numberOfLines={0} style={ Object { - "color": "#ffffff", + "color": "#323130", "fontFamily": "Segoe UI", - "fontSize": 12, + "fontSize": 13, "fontStyle": undefined, "fontWeight": "400", "letterSpacing": undefined, @@ -230,8 +224,7 @@ exports[`CounterBadge component tests CounterBadge shows 1000+ 1`] = ` Object { "alignItems": "center", "alignSelf": "flex-start", - "backgroundColor": "#0078d4", - "borderColor": "transparent", + "backgroundColor": undefined, "borderRadius": 9999, "borderWidth": 1, "bottom": 0, @@ -249,9 +242,9 @@ exports[`CounterBadge component tests CounterBadge shows 1000+ 1`] = ` numberOfLines={0} style={ Object { - "color": "#ffffff", + "color": "#323130", "fontFamily": "Segoe UI", - "fontSize": 12, + "fontSize": 13, "fontStyle": undefined, "fontWeight": "400", "letterSpacing": undefined, @@ -274,8 +267,7 @@ exports[`CounterBadge component tests CounterBadge shows zero 1`] = ` Object { "alignItems": "center", "alignSelf": "flex-start", - "backgroundColor": "#0078d4", - "borderColor": "transparent", + "backgroundColor": undefined, "borderRadius": 9999, "borderWidth": 1, "bottom": 0, @@ -293,9 +285,9 @@ exports[`CounterBadge component tests CounterBadge shows zero 1`] = ` numberOfLines={0} style={ Object { - "color": "#ffffff", + "color": "#323130", "fontFamily": "Segoe UI", - "fontSize": 12, + "fontSize": 13, "fontStyle": undefined, "fontWeight": "400", "letterSpacing": undefined, @@ -336,9 +328,9 @@ exports[`CounterBadge component tests CounterBadge tokens 1`] = ` numberOfLines={0} style={ Object { - "color": "#ffffff", + "color": "#323130", "fontFamily": "Segoe UI", - "fontSize": 12, + "fontSize": 13, "fontStyle": undefined, "fontWeight": "400", "letterSpacing": undefined, @@ -365,7 +357,7 @@ exports[`PresenceBadge component tests PresenceBadge props 1`] = ` "alignItems": "center", "alignSelf": "flex-start", "aspectRatio": 1, - "backgroundColor": "#ffffff", + "backgroundColor": "#000000", "borderColor": "#ffffff", "borderRadius": 9999, "borderWidth": 2, diff --git a/packages/components/Button/src/CompoundButton/__snapshots__/CompoundButton.test.tsx.snap b/packages/components/Button/src/CompoundButton/__snapshots__/CompoundButton.test.tsx.snap index 44eedb2ecb..d470d7a899 100644 --- a/packages/components/Button/src/CompoundButton/__snapshots__/CompoundButton.test.tsx.snap +++ b/packages/components/Button/src/CompoundButton/__snapshots__/CompoundButton.test.tsx.snap @@ -74,7 +74,7 @@ exports[`CompoundButton default 1`] = ` style={ Object { "fontFamily": "Segoe UI", - "fontSize": 12, + "fontSize": 13, "fontWeight": "400", "margin": 0, "marginBottom": 0, diff --git a/packages/components/Button/src/FAB/__snapshots__/FAB.test.tsx.snap b/packages/components/Button/src/FAB/__snapshots__/FAB.test.tsx.snap index fd359b2d09..bf5ec50e68 100644 --- a/packages/components/Button/src/FAB/__snapshots__/FAB.test.tsx.snap +++ b/packages/components/Button/src/FAB/__snapshots__/FAB.test.tsx.snap @@ -48,7 +48,7 @@ exports[`Custom FAB with no shadow(iOS) 1`] = ` Object { "color": "#ffffff", "fontFamily": "Segoe UI", - "fontSize": 12, + "fontSize": 13, "fontWeight": "400", "margin": 0, "marginBottom": 0, @@ -166,7 +166,7 @@ exports[`Default FAB (iOS) 1`] = ` Object { "color": "#ffffff", "fontFamily": "Segoe UI", - "fontSize": 12, + "fontSize": 13, "fontWeight": "400", "margin": 0, "marginBottom": 0, diff --git a/packages/components/Button/src/__snapshots__/Button.test.tsx.snap b/packages/components/Button/src/__snapshots__/Button.test.tsx.snap index b9d54c83bc..44dae9f246 100644 --- a/packages/components/Button/src/__snapshots__/Button.test.tsx.snap +++ b/packages/components/Button/src/__snapshots__/Button.test.tsx.snap @@ -429,7 +429,7 @@ exports[`Button component tests Button small 1`] = ` Object { "color": "#323130", "fontFamily": "Segoe UI", - "fontSize": 12, + "fontSize": 13, "fontWeight": "400", "margin": 0, "marginBottom": 0, diff --git a/packages/components/Link/src/__tests__/__snapshots__/Link.test.tsx.snap b/packages/components/Link/src/__tests__/__snapshots__/Link.test.tsx.snap index f4aa3aced9..d606670b1a 100644 --- a/packages/components/Link/src/__tests__/__snapshots__/Link.test.tsx.snap +++ b/packages/components/Link/src/__tests__/__snapshots__/Link.test.tsx.snap @@ -34,7 +34,7 @@ exports[`Link all props 1`] = ` "borderWidth": 2, "color": "#0078d4", "fontFamily": "Segoe UI", - "fontSize": 12, + "fontSize": 13, "fontWeight": "400", "margin": 0, "textAlign": "center", @@ -81,7 +81,7 @@ exports[`Link with child 1`] = ` "borderWidth": 2, "color": "#0078d4", "fontFamily": "Segoe UI", - "fontSize": 12, + "fontSize": 13, "fontWeight": "400", "margin": 0, "textAlign": "center", diff --git a/packages/components/Menu/src/__tests__/__snapshots__/Menu.test.tsx.snap b/packages/components/Menu/src/__tests__/__snapshots__/Menu.test.tsx.snap index 6adf3a2f98..7606e914b3 100644 --- a/packages/components/Menu/src/__tests__/__snapshots__/Menu.test.tsx.snap +++ b/packages/components/Menu/src/__tests__/__snapshots__/Menu.test.tsx.snap @@ -162,7 +162,7 @@ Array [ + + Your component + + +`; diff --git a/packages/experimental/Switch/src/__tests__/__snapshots__/Switch.test.tsx.snap b/packages/experimental/Switch/src/__tests__/__snapshots__/Switch.test.tsx.snap index 1a5a6f8154..09a1e2ca4e 100644 --- a/packages/experimental/Switch/src/__tests__/__snapshots__/Switch.test.tsx.snap +++ b/packages/experimental/Switch/src/__tests__/__snapshots__/Switch.test.tsx.snap @@ -35,7 +35,7 @@ exports[`Switch Default 1`] = ` Object { "alignItems": "center", "alignSelf": "flex-start", - "borderColor": "transparent", + "borderColor": undefined, "borderRadius": 4, "borderWidth": 2, "flexDirection": "row-reverse", @@ -48,9 +48,9 @@ exports[`Switch Default 1`] = ` =0.19.2 <1.0.0", - "@fluentui-react-native/theme": ">=0.7.3 <1.0.0" + "@fluentui-react-native/theme": ">=0.7.3 <1.0.0", + "@fluentui-react-native/theming-utils": ">=0.15.3 <1.0.0", + "@fluentui-react-native/memo-cache": "^1.1.7" }, "devDependencies": { "@fluentui-react-native/eslint-config-rules": "^0.1.1", diff --git a/packages/theming/android-theme/src/__tests__/__snapshots__/android-theme.test.ts.snap b/packages/theming/android-theme/src/__tests__/__snapshots__/android-theme.test.ts.snap index 1cf892cbc7..4de18921c2 100644 --- a/packages/theming/android-theme/src/__tests__/__snapshots__/android-theme.test.ts.snap +++ b/packages/theming/android-theme/src/__tests__/__snapshots__/android-theme.test.ts.snap @@ -147,6 +147,60 @@ Object { "menuItemBackgroundPressed": "transparent", "menuItemText": "#E1E1E1", "menuItemTextHovered": "#212121", + "neutralBackground1": "#ffffff", + "neutralBackground1Hover": undefined, + "neutralBackground1Pressed": "#e0e0e0", + "neutralBackground1Selected": "#ebebeb", + "neutralBackground2": "#ffffff", + "neutralBackground2Hover": undefined, + "neutralBackground2Pressed": "#e0e0e0", + "neutralBackground2Selected": "#ebebeb", + "neutralBackground3": "#ffffff", + "neutralBackground3Hover": undefined, + "neutralBackground3Pressed": "#e0e0e0", + "neutralBackground3Selected": "#ebebeb", + "neutralBackground4": "#fafafa", + "neutralBackground4Hover": undefined, + "neutralBackground4Pressed": "#dbdbdb", + "neutralBackground4Selected": "#e6e6e6", + "neutralBackground5": "#ebebeb", + "neutralBackground5Hover": undefined, + "neutralBackground5Pressed": "#d1d1d1", + "neutralBackground5Selected": "#dbdbdb", + "neutralBackground6": "#d1d1d1", + "neutralBackgroundDisabled": "#e0e0e0", + "neutralBackgroundInverted": "#242424", + "neutralForeground1": "#ffffff", + "neutralForeground1Hover": undefined, + "neutralForeground1Pressed": undefined, + "neutralForeground1Selected": undefined, + "neutralForeground2": "#d6d6d6", + "neutralForeground2BrandHover": undefined, + "neutralForeground2BrandPressed": undefined, + "neutralForeground2BrandSelected": undefined, + "neutralForeground2Hover": undefined, + "neutralForeground2Pressed": undefined, + "neutralForeground2Selected": undefined, + "neutralForeground3": "#adadad", + "neutralForeground3BrandHover": undefined, + "neutralForeground3BrandPressed": undefined, + "neutralForeground3BrandSelected": undefined, + "neutralForeground3Hover": undefined, + "neutralForeground3Pressed": undefined, + "neutralForeground3Selected": undefined, + "neutralForegroundInverted": "#ffffff", + "neutralStencil1": "#e6e6e6", + "neutralStencil2": "#fafafa", + "neutralStroke1": "#525252", + "neutralStroke1Hover": undefined, + "neutralStroke1Pressed": undefined, + "neutralStroke1Selected": undefined, + "neutralStroke2": "#3d3d3d", + "neutralStrokeAccessible": "#9e9e9e", + "neutralStrokeAccessibleHover": undefined, + "neutralStrokeAccessiblePressed": undefined, + "neutralStrokeAccessibleSelected": undefined, + "neutralStrokeDisabled": "#424242", "personaActivityGlow": "#0086F0", "personaActivityRing": "#000000", "primaryButtonBackground": "#0086F0", @@ -648,6 +702,60 @@ Object { "menuItemBackgroundPressed": "transparent", "menuItemText": "#E1E1E1", "menuItemTextHovered": "#212121", + "neutralBackground1": "#ffffff", + "neutralBackground1Hover": undefined, + "neutralBackground1Pressed": "#e0e0e0", + "neutralBackground1Selected": "#ebebeb", + "neutralBackground2": "#ffffff", + "neutralBackground2Hover": undefined, + "neutralBackground2Pressed": "#e0e0e0", + "neutralBackground2Selected": "#ebebeb", + "neutralBackground3": "#ffffff", + "neutralBackground3Hover": undefined, + "neutralBackground3Pressed": "#e0e0e0", + "neutralBackground3Selected": "#ebebeb", + "neutralBackground4": "#fafafa", + "neutralBackground4Hover": undefined, + "neutralBackground4Pressed": "#dbdbdb", + "neutralBackground4Selected": "#e6e6e6", + "neutralBackground5": "#ebebeb", + "neutralBackground5Hover": undefined, + "neutralBackground5Pressed": "#d1d1d1", + "neutralBackground5Selected": "#dbdbdb", + "neutralBackground6": "#d1d1d1", + "neutralBackgroundDisabled": "#e0e0e0", + "neutralBackgroundInverted": "#242424", + "neutralForeground1": "#ffffff", + "neutralForeground1Hover": undefined, + "neutralForeground1Pressed": undefined, + "neutralForeground1Selected": undefined, + "neutralForeground2": "#d6d6d6", + "neutralForeground2BrandHover": undefined, + "neutralForeground2BrandPressed": undefined, + "neutralForeground2BrandSelected": undefined, + "neutralForeground2Hover": undefined, + "neutralForeground2Pressed": undefined, + "neutralForeground2Selected": undefined, + "neutralForeground3": "#adadad", + "neutralForeground3BrandHover": undefined, + "neutralForeground3BrandPressed": undefined, + "neutralForeground3BrandSelected": undefined, + "neutralForeground3Hover": undefined, + "neutralForeground3Pressed": undefined, + "neutralForeground3Selected": undefined, + "neutralForegroundInverted": "#ffffff", + "neutralStencil1": "#e6e6e6", + "neutralStencil2": "#fafafa", + "neutralStroke1": "#525252", + "neutralStroke1Hover": undefined, + "neutralStroke1Pressed": undefined, + "neutralStroke1Selected": undefined, + "neutralStroke2": "#3d3d3d", + "neutralStrokeAccessible": "#9e9e9e", + "neutralStrokeAccessibleHover": undefined, + "neutralStrokeAccessiblePressed": undefined, + "neutralStrokeAccessibleSelected": undefined, + "neutralStrokeDisabled": "#424242", "personaActivityGlow": "#0086F0", "personaActivityRing": "#000000", "primaryButtonBackground": "#0086F0", @@ -1149,6 +1257,60 @@ Object { "menuItemBackgroundPressed": "transparent", "menuItemText": "#E1E1E1", "menuItemTextHovered": "#212121", + "neutralBackground1": "#ffffff", + "neutralBackground1Hover": undefined, + "neutralBackground1Pressed": "#e0e0e0", + "neutralBackground1Selected": "#ebebeb", + "neutralBackground2": "#ffffff", + "neutralBackground2Hover": undefined, + "neutralBackground2Pressed": "#e0e0e0", + "neutralBackground2Selected": "#ebebeb", + "neutralBackground3": "#ffffff", + "neutralBackground3Hover": undefined, + "neutralBackground3Pressed": "#e0e0e0", + "neutralBackground3Selected": "#ebebeb", + "neutralBackground4": "#fafafa", + "neutralBackground4Hover": undefined, + "neutralBackground4Pressed": "#dbdbdb", + "neutralBackground4Selected": "#e6e6e6", + "neutralBackground5": "#ebebeb", + "neutralBackground5Hover": undefined, + "neutralBackground5Pressed": "#d1d1d1", + "neutralBackground5Selected": "#dbdbdb", + "neutralBackground6": "#d1d1d1", + "neutralBackgroundDisabled": "#e0e0e0", + "neutralBackgroundInverted": "#242424", + "neutralForeground1": "#ffffff", + "neutralForeground1Hover": undefined, + "neutralForeground1Pressed": undefined, + "neutralForeground1Selected": undefined, + "neutralForeground2": "#d6d6d6", + "neutralForeground2BrandHover": undefined, + "neutralForeground2BrandPressed": undefined, + "neutralForeground2BrandSelected": undefined, + "neutralForeground2Hover": undefined, + "neutralForeground2Pressed": undefined, + "neutralForeground2Selected": undefined, + "neutralForeground3": "#adadad", + "neutralForeground3BrandHover": undefined, + "neutralForeground3BrandPressed": undefined, + "neutralForeground3BrandSelected": undefined, + "neutralForeground3Hover": undefined, + "neutralForeground3Pressed": undefined, + "neutralForeground3Selected": undefined, + "neutralForegroundInverted": "#ffffff", + "neutralStencil1": "#e6e6e6", + "neutralStencil2": "#fafafa", + "neutralStroke1": "#525252", + "neutralStroke1Hover": undefined, + "neutralStroke1Pressed": undefined, + "neutralStroke1Selected": undefined, + "neutralStroke2": "#3d3d3d", + "neutralStrokeAccessible": "#9e9e9e", + "neutralStrokeAccessibleHover": undefined, + "neutralStrokeAccessiblePressed": undefined, + "neutralStrokeAccessibleSelected": undefined, + "neutralStrokeDisabled": "#424242", "personaActivityGlow": "#0086F0", "personaActivityRing": "#000000", "primaryButtonBackground": "#0086F0", @@ -1650,6 +1812,60 @@ Object { "menuItemBackgroundPressed": "transparent", "menuItemText": "#212121", "menuItemTextHovered": "#212121", + "neutralBackground1": "#000000", + "neutralBackground1Hover": undefined, + "neutralBackground1Pressed": "#2e2e2e", + "neutralBackground1Selected": "#242424", + "neutralBackground2": "#1f1f1f", + "neutralBackground2Hover": undefined, + "neutralBackground2Pressed": "#4d4d4d", + "neutralBackground2Selected": "#424242", + "neutralBackground3": "#ffffff", + "neutralBackground3Hover": undefined, + "neutralBackground3Pressed": "#e0e0e0", + "neutralBackground3Selected": "#ebebeb", + "neutralBackground4": "#333333", + "neutralBackground4Hover": undefined, + "neutralBackground4Pressed": "#616161", + "neutralBackground4Selected": "#575757", + "neutralBackground5": "#3d3d3d", + "neutralBackground5Hover": undefined, + "neutralBackground5Pressed": "#6b6b6b", + "neutralBackground5Selected": "#616161", + "neutralBackground6": "#5c5c5c", + "neutralBackgroundDisabled": "#e0e0e0", + "neutralBackgroundInverted": "#575757", + "neutralForeground1": "#242424", + "neutralForeground1Hover": undefined, + "neutralForeground1Pressed": undefined, + "neutralForeground1Selected": undefined, + "neutralForeground2": "#616161", + "neutralForeground2BrandHover": undefined, + "neutralForeground2BrandPressed": undefined, + "neutralForeground2BrandSelected": undefined, + "neutralForeground2Hover": undefined, + "neutralForeground2Pressed": undefined, + "neutralForeground2Selected": undefined, + "neutralForeground3": "#808080", + "neutralForeground3BrandHover": undefined, + "neutralForeground3BrandPressed": undefined, + "neutralForeground3BrandSelected": undefined, + "neutralForeground3Hover": undefined, + "neutralForeground3Pressed": undefined, + "neutralForeground3Selected": undefined, + "neutralForegroundInverted": "#ffffff", + "neutralStencil1": "#575757", + "neutralStencil2": "#333333", + "neutralStroke1": "#d1d1d1", + "neutralStroke1Hover": undefined, + "neutralStroke1Pressed": undefined, + "neutralStroke1Selected": undefined, + "neutralStroke2": "#e0e0e0", + "neutralStrokeAccessible": "#616161", + "neutralStrokeAccessibleHover": undefined, + "neutralStrokeAccessiblePressed": undefined, + "neutralStrokeAccessibleSelected": undefined, + "neutralStrokeDisabled": "#e0e0e0", "personaActivityGlow": "#0078D4", "personaActivityRing": "#FFFFFF", "primaryButtonBackground": "#0078D4", @@ -2151,6 +2367,60 @@ Object { "menuItemBackgroundPressed": "transparent", "menuItemText": "#E1E1E1", "menuItemTextHovered": "#212121", + "neutralBackground1": "#ffffff", + "neutralBackground1Hover": undefined, + "neutralBackground1Pressed": "#e0e0e0", + "neutralBackground1Selected": "#ebebeb", + "neutralBackground2": "#ffffff", + "neutralBackground2Hover": undefined, + "neutralBackground2Pressed": "#e0e0e0", + "neutralBackground2Selected": "#ebebeb", + "neutralBackground3": "#ffffff", + "neutralBackground3Hover": undefined, + "neutralBackground3Pressed": "#e0e0e0", + "neutralBackground3Selected": "#ebebeb", + "neutralBackground4": "#fafafa", + "neutralBackground4Hover": undefined, + "neutralBackground4Pressed": "#dbdbdb", + "neutralBackground4Selected": "#e6e6e6", + "neutralBackground5": "#ebebeb", + "neutralBackground5Hover": undefined, + "neutralBackground5Pressed": "#d1d1d1", + "neutralBackground5Selected": "#dbdbdb", + "neutralBackground6": "#d1d1d1", + "neutralBackgroundDisabled": "#e0e0e0", + "neutralBackgroundInverted": "#242424", + "neutralForeground1": "#ffffff", + "neutralForeground1Hover": undefined, + "neutralForeground1Pressed": undefined, + "neutralForeground1Selected": undefined, + "neutralForeground2": "#d6d6d6", + "neutralForeground2BrandHover": undefined, + "neutralForeground2BrandPressed": undefined, + "neutralForeground2BrandSelected": undefined, + "neutralForeground2Hover": undefined, + "neutralForeground2Pressed": undefined, + "neutralForeground2Selected": undefined, + "neutralForeground3": "#adadad", + "neutralForeground3BrandHover": undefined, + "neutralForeground3BrandPressed": undefined, + "neutralForeground3BrandSelected": undefined, + "neutralForeground3Hover": undefined, + "neutralForeground3Pressed": undefined, + "neutralForeground3Selected": undefined, + "neutralForegroundInverted": "#ffffff", + "neutralStencil1": "#e6e6e6", + "neutralStencil2": "#fafafa", + "neutralStroke1": "#525252", + "neutralStroke1Hover": undefined, + "neutralStroke1Pressed": undefined, + "neutralStroke1Selected": undefined, + "neutralStroke2": "#3d3d3d", + "neutralStrokeAccessible": "#9e9e9e", + "neutralStrokeAccessibleHover": undefined, + "neutralStrokeAccessiblePressed": undefined, + "neutralStrokeAccessibleSelected": undefined, + "neutralStrokeDisabled": "#424242", "personaActivityGlow": "#0086F0", "personaActivityRing": "#000000", "primaryButtonBackground": "#0086F0", @@ -2652,6 +2922,60 @@ Object { "menuItemBackgroundPressed": "transparent", "menuItemText": "#212121", "menuItemTextHovered": "#212121", + "neutralBackground1": "#000000", + "neutralBackground1Hover": undefined, + "neutralBackground1Pressed": "#2e2e2e", + "neutralBackground1Selected": "#242424", + "neutralBackground2": "#1f1f1f", + "neutralBackground2Hover": undefined, + "neutralBackground2Pressed": "#4d4d4d", + "neutralBackground2Selected": "#424242", + "neutralBackground3": "#ffffff", + "neutralBackground3Hover": undefined, + "neutralBackground3Pressed": "#e0e0e0", + "neutralBackground3Selected": "#ebebeb", + "neutralBackground4": "#333333", + "neutralBackground4Hover": undefined, + "neutralBackground4Pressed": "#616161", + "neutralBackground4Selected": "#575757", + "neutralBackground5": "#3d3d3d", + "neutralBackground5Hover": undefined, + "neutralBackground5Pressed": "#6b6b6b", + "neutralBackground5Selected": "#616161", + "neutralBackground6": "#5c5c5c", + "neutralBackgroundDisabled": "#e0e0e0", + "neutralBackgroundInverted": "#575757", + "neutralForeground1": "#242424", + "neutralForeground1Hover": undefined, + "neutralForeground1Pressed": undefined, + "neutralForeground1Selected": undefined, + "neutralForeground2": "#616161", + "neutralForeground2BrandHover": undefined, + "neutralForeground2BrandPressed": undefined, + "neutralForeground2BrandSelected": undefined, + "neutralForeground2Hover": undefined, + "neutralForeground2Pressed": undefined, + "neutralForeground2Selected": undefined, + "neutralForeground3": "#808080", + "neutralForeground3BrandHover": undefined, + "neutralForeground3BrandPressed": undefined, + "neutralForeground3BrandSelected": undefined, + "neutralForeground3Hover": undefined, + "neutralForeground3Pressed": undefined, + "neutralForeground3Selected": undefined, + "neutralForegroundInverted": "#ffffff", + "neutralStencil1": "#575757", + "neutralStencil2": "#333333", + "neutralStroke1": "#d1d1d1", + "neutralStroke1Hover": undefined, + "neutralStroke1Pressed": undefined, + "neutralStroke1Selected": undefined, + "neutralStroke2": "#e0e0e0", + "neutralStrokeAccessible": "#616161", + "neutralStrokeAccessibleHover": undefined, + "neutralStrokeAccessiblePressed": undefined, + "neutralStrokeAccessibleSelected": undefined, + "neutralStrokeDisabled": "#e0e0e0", "personaActivityGlow": "#0078D4", "personaActivityRing": "#FFFFFF", "primaryButtonBackground": "#0078D4", diff --git a/packages/theming/android-theme/src/androidTheme.ts b/packages/theming/android-theme/src/androidTheme.ts index b4d478637f..80620c9389 100644 --- a/packages/theming/android-theme/src/androidTheme.ts +++ b/packages/theming/android-theme/src/androidTheme.ts @@ -34,7 +34,6 @@ export const androidComponents = { }, }; -// mocked out const androidShadows = { shadow2: { ambient: { x: 0, y: 0, blur: 2, color: '#0000001f' }, diff --git a/packages/theming/android-theme/src/androidTypography.ts b/packages/theming/android-theme/src/androidTypography.ts index b8d912de77..b45bbb6144 100644 --- a/packages/theming/android-theme/src/androidTypography.ts +++ b/packages/theming/android-theme/src/androidTypography.ts @@ -1,10 +1,5 @@ import { FontSize, FontSizes, FontWeightValue, Typography, Variants } from '@fluentui-react-native/theme-types'; -/** - * The primary font used in Fluent Android is Roboto as in [Figma](https://www.figma.com/file/MkkE13z6zALstwLlbczIMXrA/Fluent-Android?node-id=7455%3A94) - * The other fontFamily equivalents are filled from available React Native fonts for Android. Weights are defined from Figma. - */ - export function androidTypography(): Typography { const androidDict = { sizes: { diff --git a/packages/theming/android-theme/src/colorsTokens.ts b/packages/theming/android-theme/src/colorsTokens.ts index 0360d69dba..e0f04ba23e 100644 --- a/packages/theming/android-theme/src/colorsTokens.ts +++ b/packages/theming/android-theme/src/colorsTokens.ts @@ -1,11 +1,11 @@ import { ThemeColorDefinition } from '@fluentui-react-native/theme-types'; import { FluentUIAndroidPalette } from './colorsSemantic'; +import { createColorAliasTokens } from './createAliasTokens'; -/** creates a palette of colors for the android theme, given the FluentUI Android Palette */ +/** Creates a palette of colors for the android theme, given the FluentUI Android Palette. */ export function paletteFromAndroidColors(p: FluentUIAndroidPalette): ThemeColorDefinition { + /* PaletteBackgroundColors & PaletteTextColors */ return { - /* PaletteBackgroundColors & PaletteTextColors */ - background: p.surfacesPrimary, bodyStandoutBackground: p.surfacesSecondary, bodyFrameBackground: p.surfacesTertiary, @@ -204,5 +204,6 @@ export function paletteFromAndroidColors(p: FluentUIAndroidPalette): ThemeColorD personaActivityRing: p.surfacesPrimary, personaActivityGlow: p.buttonBackground, + ...createColorAliasTokens(p.variant == 'light' ? 'light' : 'dark'), }; } diff --git a/packages/theming/android-theme/src/createAliasTokens.ts b/packages/theming/android-theme/src/createAliasTokens.ts new file mode 100644 index 0000000000..0ffefb93b2 --- /dev/null +++ b/packages/theming/android-theme/src/createAliasTokens.ts @@ -0,0 +1,18 @@ +import { getAliasTokens, getShadowTokens } from '@fluentui-react-native/theme-tokens'; +import { AliasColorTokens, AppearanceOptions, ThemeShadowDefinition } from '@fluentui-react-native/theme-types'; +import { memoize } from '@fluentui-react-native/memo-cache'; +import { mapPipelineToShadow, mapPipelineToTheme } from '@fluentui-react-native/theming-utils'; + +function createColorAliasTokensWorker(mode: AppearanceOptions): AliasColorTokens { + const aliasTokens = getAliasTokens(mode); + return mapPipelineToTheme(aliasTokens); +} + +export const createColorAliasTokens = memoize(createColorAliasTokensWorker); + +function createShadowAliasTokensWorker(mode: AppearanceOptions): ThemeShadowDefinition { + const aliasTokens = getShadowTokens(mode); + return mapPipelineToShadow(aliasTokens); +} + +export const createShadowAliasTokens = memoize(createShadowAliasTokensWorker); diff --git a/packages/theming/apple-theme/src/__tests__/__snapshots__/apple-theme.test.ts.snap b/packages/theming/apple-theme/src/__tests__/__snapshots__/apple-theme.test.ts.snap index 992d97fc57..854e409b47 100644 --- a/packages/theming/apple-theme/src/__tests__/__snapshots__/apple-theme.test.ts.snap +++ b/packages/theming/apple-theme/src/__tests__/__snapshots__/apple-theme.test.ts.snap @@ -15,23 +15,6 @@ Object { "bodyStandoutBackground": "#faf9f8", "bodyText": "#323130", "bodyTextChecked": "#000000", - "brandBackground": "#0078d4", - "brandBackground2": "#eff6fc", - "brandBackgroundDisabled": undefined, - "brandBackgroundHover": "#106ebe", - "brandBackgroundPressed": "#004578", - "brandBackgroundSelected": "#005a9e", - "brandBackgroundStatic": "#0078d4", - "brandForeground1": "#0078d4", - "brandForeground1Disabled": undefined, - "brandForeground1Pressed": undefined, - "brandForeground2": "#106ebe", - "brandForegroundLink": "#106ebe", - "brandForegroundLinkHover": "#005a9e", - "brandForegroundLinkPressed": "#004578", - "brandForegroundLinkSelected": "#106ebe", - "brandStroke1": "#0078d4", - "brandStroke2": "#c7e0f4", "brandedBackground": "#0078d4", "brandedBorder": "#005a9e", "brandedCheckedBackground": "#c8c6c4", @@ -79,15 +62,6 @@ Object { "checkboxBackgroundDisabled": "#f3f2f1", "checkboxBorderColor": "#8a8886", "checkmarkColor": "#ffffff", - "compoundBrandBackground1": "#0078d4", - "compoundBrandBackground1Hover": "#106ebe", - "compoundBrandBackground1Pressed": "#005a9e", - "compoundBrandForeground1": "#0078d4", - "compoundBrandForeground1Hover": "#106ebe", - "compoundBrandForeground1Pressed": "#005a9e", - "compoundBrandStroke1": "#0078d4", - "compoundBrandStroke1Hover": "#106ebe", - "compoundBrandStroke1Pressed": "#005a9e", "defaultBackground": "#f3f2f1", "defaultBorder": "#8a8886", "defaultCheckedBackground": "#c8c6c4", @@ -181,70 +155,59 @@ Object { "menuItemBackgroundPressed": "#edebe9", "menuItemText": "#323130", "menuItemTextHovered": "#201f1e", - "neutralBackground1": "#ffffff", - "neutralBackground1Hover": "#f5f5f5", - "neutralBackground1Pressed": "#e0e0e0", - "neutralBackground1Selected": "#ebebeb", - "neutralBackground2": "#fafafa", - "neutralBackground2Hover": "#f0f0f0", - "neutralBackground2Pressed": "#dbdbdb", - "neutralBackground2Selected": "#e6e6e6", - "neutralBackground3": "#f5f5f5", - "neutralBackground3Hover": "#ebebeb", - "neutralBackground3Pressed": "#d6d6d6", - "neutralBackground3Selected": "#e0e0e0", - "neutralBackground4": "#f0f0f0", - "neutralBackground4Hover": "#fafafa", - "neutralBackground4Pressed": "#f5f5f5", - "neutralBackground4Selected": "#ffffff", - "neutralBackground5": "#ebebeb", - "neutralBackground5Hover": "#f5f5f5", - "neutralBackground5Pressed": "#f0f0f0", - "neutralBackground5Selected": "#fafafa", - "neutralBackground6": "#e6e6e6", - "neutralBackgroundDisabled": "#f0f0f0", - "neutralBackgroundInverted": "#616161", + "neutralBackground1": "#000000", + "neutralBackground1Hover": undefined, + "neutralBackground1Pressed": "#2e2e2e", + "neutralBackground1Selected": "#242424", + "neutralBackground2": "#1f1f1f", + "neutralBackground2Hover": undefined, + "neutralBackground2Pressed": "#4d4d4d", + "neutralBackground2Selected": "#424242", + "neutralBackground3": "#ffffff", + "neutralBackground3Hover": undefined, + "neutralBackground3Pressed": "#e0e0e0", + "neutralBackground3Selected": "#ebebeb", + "neutralBackground4": "#333333", + "neutralBackground4Hover": undefined, + "neutralBackground4Pressed": "#616161", + "neutralBackground4Selected": "#575757", + "neutralBackground5": "#3d3d3d", + "neutralBackground5Hover": undefined, + "neutralBackground5Pressed": "#6b6b6b", + "neutralBackground5Selected": "#616161", + "neutralBackground6": "#5c5c5c", + "neutralBackgroundDisabled": "#e0e0e0", + "neutralBackgroundInverted": "#575757", "neutralForeground1": "#242424", - "neutralForeground1Hover": "#242424", - "neutralForeground1Pressed": "#242424", - "neutralForeground1Selected": "#242424", - "neutralForeground2": "#424242", - "neutralForeground2BrandHover": "#0078d4", - "neutralForeground2BrandPressed": "#106ebe", - "neutralForeground2BrandSelected": "#0078d4", - "neutralForeground2Hover": "#242424", - "neutralForeground2Pressed": "#242424", - "neutralForeground2Selected": "#242424", - "neutralForeground3": "#616161", - "neutralForeground3BrandHover": "#0078d4", - "neutralForeground3BrandPressed": "#106ebe", - "neutralForeground3BrandSelected": "#0078d4", - "neutralForeground3Hover": "#424242", - "neutralForeground3Pressed": "#424242", - "neutralForeground3Selected": "#424242", - "neutralForeground4": "#707070", - "neutralForegroundDisabled": "#bdbdbd", + "neutralForeground1Hover": undefined, + "neutralForeground1Pressed": undefined, + "neutralForeground1Selected": undefined, + "neutralForeground2": "#616161", + "neutralForeground2BrandHover": undefined, + "neutralForeground2BrandPressed": undefined, + "neutralForeground2BrandSelected": undefined, + "neutralForeground2Hover": undefined, + "neutralForeground2Pressed": undefined, + "neutralForeground2Selected": undefined, + "neutralForeground3": "#808080", + "neutralForeground3BrandHover": undefined, + "neutralForeground3BrandPressed": undefined, + "neutralForeground3BrandSelected": undefined, + "neutralForeground3Hover": undefined, + "neutralForeground3Pressed": undefined, + "neutralForeground3Selected": undefined, "neutralForegroundInverted": "#ffffff", - "neutralForegroundInvertedLink": "#ffffff", - "neutralForegroundInvertedLinkHover": "#ffffff", - "neutralForegroundInvertedLinkPressed": "#ffffff", - "neutralForegroundInvertedLinkSelected": "#ffffff", - "neutralForegroundOnBrand": "#ffffff", - "neutralForegroundOnBrandHover": "#ffffff", - "neutralForegroundOnBrandPressed": "#ffffff", - "neutralForegroundOnBrandSelected": "#ffffff", - "neutralStencil1": "#e6e6e6", - "neutralStencil2": "#fafafa", + "neutralStencil1": "#575757", + "neutralStencil2": "#333333", "neutralStroke1": "#d1d1d1", - "neutralStroke1Hover": "#c7c7c7", - "neutralStroke1Pressed": "#b3b3b3", - "neutralStroke1Selected": "#bdbdbd", + "neutralStroke1Hover": undefined, + "neutralStroke1Pressed": undefined, + "neutralStroke1Selected": undefined, "neutralStroke2": "#e0e0e0", - "neutralStroke3": "#f0f0f0", "neutralStrokeAccessible": "#616161", - "neutralStrokeAccessibleHover": "#575757", - "neutralStrokeAccessiblePressed": "#4d4d4d", - "neutralStrokeAccessibleSelected": "#0078d4", + "neutralStrokeAccessibleHover": undefined, + "neutralStrokeAccessiblePressed": undefined, + "neutralStrokeAccessibleSelected": undefined, "neutralStrokeDisabled": "#e0e0e0", "personaActivityGlow": "#0078d4", "personaActivityRing": "#ffffff", @@ -258,31 +221,9 @@ Object { "primaryButtonTextDisabled": "#d2d0ce", "primaryButtonTextHovered": "#ffffff", "primaryButtonTextPressed": "#ffffff", - "redBackground1": "#f9f0f2", - "redBackground2": "#d69ca5", - "redBackground3": "#750b1c", - "redBorder1": "#d69ca5", - "redBorder2": "#750b1c", - "redBorderActive": "#750b1c", - "redForeground1": "#690a19", - "redForeground2": "#d69ca5", - "redForeground3": "#750b1c", "smallInputBorder": "#605e5c", - "strokeFocus1": "#ffffff", - "strokeFocus2": "#000000", "subText": "#605e5c", - "subtleBackground": "transparent", - "subtleBackgroundHover": "#f5f5f5", - "subtleBackgroundPressed": "#e0e0e0", - "subtleBackgroundSelected": "#ebebeb", "successBackground": "rgba(95, 210, 85, .2)", - "transparentBackground": "transparent", - "transparentBackgroundHover": "transparent", - "transparentBackgroundPressed": "transparent", - "transparentBackgroundSelected": "transparent", - "transparentStroke": "transparent", - "transparentStrokeDisabled": "transparent", - "transparentStrokeInteractive": "transparent", "variantBorder": "#edebe9", "variantBorderHovered": "#a19f9d", "warningBackground": "rgba(255, 200, 10, .2)", @@ -481,11 +422,11 @@ Object { }, "sizes": Object { "body": 14, - "caption": 10, - "header": 20, - "hero": 28, - "heroLarge": 40, - "secondary": 12, + "caption": 12, + "header": 18, + "hero": 24, + "heroLarge": 60, + "secondary": 13, "subheader": 16, }, "variants": Object { @@ -630,32 +571,6 @@ Object { exports[`createMacOSColorAliasTokens test mode: dark, isHighContrast: false 1`] = ` Object { - "brandBackground": "#0086f0", - "brandBackground2": "#092c47", - "brandBackgroundDisabled": "#575757", - "brandBackgroundHover": "#1890f1", - "brandBackgroundPressed": "#1890f1", - "brandBackgroundSelected": "#3aa0f3", - "brandBackgroundStatic": "#0086f0", - "brandForeground1": "#0086f0", - "brandForeground1Disabled": "#c2c2c2", - "brandForeground1Pressed": "#6cb8f6", - "brandForeground2": "#092c47", - "brandForegroundLink": "#043862", - "brandForegroundLinkHover": "#092c47", - "brandForegroundLinkPressed": "#0078d4", - "brandForegroundLinkSelected": "#092c47", - "brandStroke1": "#0086f0", - "brandStroke2": "#004c87", - "compoundBrandBackground1": "#0086f0", - "compoundBrandBackground1Hover": "#1890f1", - "compoundBrandBackground1Pressed": "#6cb8f6", - "compoundBrandForeground1": "#043862", - "compoundBrandForeground1Hover": "#092c47", - "compoundBrandForeground1Pressed": "#0078d4", - "compoundBrandStroke1": "#0086f0", - "compoundBrandStroke1Hover": "#1890f1", - "compoundBrandStroke1Pressed": "#6cb8f6", "neutralBackground1": "#000000", "neutralBackground1Hover": "#3d3d3d", "neutralBackground1Pressed": "#5c5c5c", @@ -697,17 +612,7 @@ Object { "neutralForeground3Hover": "#d6d6d6", "neutralForeground3Pressed": "#d6d6d6", "neutralForeground3Selected": "#d6d6d6", - "neutralForeground4": "#858585", - "neutralForegroundDisabled": "#b8b8b8", "neutralForegroundInverted": "#ffffff", - "neutralForegroundInvertedLink": "#292929", - "neutralForegroundInvertedLinkHover": "#292929", - "neutralForegroundInvertedLinkPressed": "#292929", - "neutralForegroundInvertedLinkSelected": "#292929", - "neutralForegroundOnBrand": "#ffffff", - "neutralForegroundOnBrandHover": "#ffffff", - "neutralForegroundOnBrandPressed": "#ffffff", - "neutralForegroundOnBrandSelected": "#ffffff", "neutralStencil1": "#333333", "neutralStencil2": "#575757", "neutralStroke1": "#3d3d3d", @@ -715,65 +620,16 @@ Object { "neutralStroke1Pressed": "#6b6b6b", "neutralStroke1Selected": "#707070", "neutralStroke2": "#575757", - "neutralStroke3": "#666666", "neutralStrokeAccessible": "#adadad", "neutralStrokeAccessibleHover": "#bdbdbd", "neutralStrokeAccessiblePressed": "#b3b3b3", "neutralStrokeAccessibleSelected": "#0086f0", "neutralStrokeDisabled": "#525252", - "redBackground1": "#230308", - "redBackground2": "#420610", - "redBackground3": "#750b1c", - "redBorder1": "#750b1c", - "redBorder2": "#962f3f", - "redBorderActive": "#ac4f5e", - "redForeground1": "#ac4f5e", - "redForeground2": "#420610", - "redForeground3": "#750b1c", - "strokeFocus1": "#000000", - "strokeFocus2": "#ffffff", - "subtleBackground": "transparent", - "subtleBackgroundHover": "#3d3d3d", - "subtleBackgroundPressed": "#1f1f1f", - "subtleBackgroundSelected": "#383838", - "transparentBackground": "transparent", - "transparentBackgroundHover": "transparent", - "transparentBackgroundPressed": "transparent", - "transparentBackgroundSelected": "transparent", - "transparentStroke": "transparent", - "transparentStrokeDisabled": "transparent", - "transparentStrokeInteractive": "transparent", } `; exports[`createMacOSColorAliasTokens test mode: dark, isHighContrast: true 1`] = ` Object { - "brandBackground": "#0086f0", - "brandBackground2": "#092c47", - "brandBackgroundDisabled": "#575757", - "brandBackgroundHover": "#1890f1", - "brandBackgroundPressed": "#1890f1", - "brandBackgroundSelected": "#3aa0f3", - "brandBackgroundStatic": "#0086f0", - "brandForeground1": "#0086f0", - "brandForeground1Disabled": "#c2c2c2", - "brandForeground1Pressed": "#6cb8f6", - "brandForeground2": "#092c47", - "brandForegroundLink": "#043862", - "brandForegroundLinkHover": "#092c47", - "brandForegroundLinkPressed": "#0078d4", - "brandForegroundLinkSelected": "#092c47", - "brandStroke1": "#0086f0", - "brandStroke2": "#004c87", - "compoundBrandBackground1": "#0086f0", - "compoundBrandBackground1Hover": "#1890f1", - "compoundBrandBackground1Pressed": "#6cb8f6", - "compoundBrandForeground1": "#043862", - "compoundBrandForeground1Hover": "#092c47", - "compoundBrandForeground1Pressed": "#0078d4", - "compoundBrandStroke1": "#0086f0", - "compoundBrandStroke1Hover": "#1890f1", - "compoundBrandStroke1Pressed": "#6cb8f6", "neutralBackground1": "#000000", "neutralBackground1Hover": "#3d3d3d", "neutralBackground1Pressed": "#5c5c5c", @@ -815,17 +671,7 @@ Object { "neutralForeground3Hover": "#d6d6d6", "neutralForeground3Pressed": "#d6d6d6", "neutralForeground3Selected": "#d6d6d6", - "neutralForeground4": "#d6d6d6", - "neutralForegroundDisabled": "#b8b8b8", "neutralForegroundInverted": "#ffffff", - "neutralForegroundInvertedLink": "#292929", - "neutralForegroundInvertedLinkHover": "#292929", - "neutralForegroundInvertedLinkPressed": "#292929", - "neutralForegroundInvertedLinkSelected": "#292929", - "neutralForegroundOnBrand": "#ffffff", - "neutralForegroundOnBrandHover": "#ffffff", - "neutralForegroundOnBrandPressed": "#ffffff", - "neutralForegroundOnBrandSelected": "#ffffff", "neutralStencil1": "#333333", "neutralStencil2": "#575757", "neutralStroke1": "#adadad", @@ -833,65 +679,16 @@ Object { "neutralStroke1Pressed": "#6b6b6b", "neutralStroke1Selected": "#707070", "neutralStroke2": "#a8a8a8", - "neutralStroke3": "#adadad", "neutralStrokeAccessible": "#d6d6d6", "neutralStrokeAccessibleHover": "#bdbdbd", "neutralStrokeAccessiblePressed": "#b3b3b3", "neutralStrokeAccessibleSelected": "#0086f0", "neutralStrokeDisabled": "#525252", - "redBackground1": "#230308", - "redBackground2": "#420610", - "redBackground3": "#750b1c", - "redBorder1": "#750b1c", - "redBorder2": "#962f3f", - "redBorderActive": "#ac4f5e", - "redForeground1": "#ac4f5e", - "redForeground2": "#420610", - "redForeground3": "#750b1c", - "strokeFocus1": "#000000", - "strokeFocus2": "#ffffff", - "subtleBackground": "transparent", - "subtleBackgroundHover": "#3d3d3d", - "subtleBackgroundPressed": "#1f1f1f", - "subtleBackgroundSelected": "#383838", - "transparentBackground": "transparent", - "transparentBackgroundHover": "transparent", - "transparentBackgroundPressed": "transparent", - "transparentBackgroundSelected": "transparent", - "transparentStroke": "#3aa0f3", - "transparentStrokeDisabled": "#d6d6d6", - "transparentStrokeInteractive": "#a8a8a8", } `; exports[`createMacOSColorAliasTokens test mode: light, isHighContrast: false 1`] = ` Object { - "brandBackground": "#0078d4", - "brandBackground2": "#eff6fc", - "brandBackgroundDisabled": "#d1d1d1", - "brandBackgroundHover": "#106ebe", - "brandBackgroundPressed": "#106ebe", - "brandBackgroundSelected": "#005a9e", - "brandBackgroundStatic": "#0078d4", - "brandForeground1": "#0078d4", - "brandForeground1Disabled": "#757575", - "brandForeground1Pressed": "#004578", - "brandForeground2": "#106ebe", - "brandForegroundLink": "#0078d4", - "brandForegroundLinkHover": "#106ebe", - "brandForegroundLinkPressed": "#004578", - "brandForegroundLinkSelected": "#005a9e", - "brandStroke1": "#0078d4", - "brandStroke2": "#c7e0f4", - "compoundBrandBackground1": "#0078d4", - "compoundBrandBackground1Hover": "#106ebe", - "compoundBrandBackground1Pressed": "#004578", - "compoundBrandForeground1": "#0078d4", - "compoundBrandForeground1Hover": "#106ebe", - "compoundBrandForeground1Pressed": "#004578", - "compoundBrandStroke1": "#0078d4", - "compoundBrandStroke1Hover": "#106ebe", - "compoundBrandStroke1Pressed": "#004578", "neutralBackground1": "#ffffff", "neutralBackground1Hover": "#f5f5f5", "neutralBackground1Pressed": "#ebebeb", @@ -933,17 +730,7 @@ Object { "neutralForeground3Hover": "#424242", "neutralForeground3Pressed": "#424242", "neutralForeground3Selected": "#424242", - "neutralForeground4": "#808080", - "neutralForegroundDisabled": "#757575", "neutralForegroundInverted": "#ffffff", - "neutralForegroundInvertedLink": "#ffffff", - "neutralForegroundInvertedLinkHover": "#ffffff", - "neutralForegroundInvertedLinkPressed": "#ffffff", - "neutralForegroundInvertedLinkSelected": "#ffffff", - "neutralForegroundOnBrand": "#ffffff", - "neutralForegroundOnBrandHover": "#ffffff", - "neutralForegroundOnBrandPressed": "#ffffff", - "neutralForegroundOnBrandSelected": "#ffffff", "neutralStencil1": "#e6e6e6", "neutralStencil2": "#fafafa", "neutralStroke1": "#f0f0f0", @@ -951,65 +738,16 @@ Object { "neutralStroke1Pressed": "#b3b3b3", "neutralStroke1Selected": "#bdbdbd", "neutralStroke2": "#d6d6d6", - "neutralStroke3": "#f0f0f0", "neutralStrokeAccessible": "#616161", "neutralStrokeAccessibleHover": "#575757", "neutralStrokeAccessiblePressed": "#4d4d4d", "neutralStrokeAccessibleSelected": "#0078d4", "neutralStrokeDisabled": "#e0e0e0", - "redBackground1": "#f9f0f2", - "redBackground2": "#d69ca5", - "redBackground3": "#750b1c", - "redBorder1": "#d69ca5", - "redBorder2": "#750b1c", - "redBorderActive": "#750b1c", - "redForeground1": "#690a19", - "redForeground2": "#d69ca5", - "redForeground3": "#750b1c", - "strokeFocus1": "#ffffff", - "strokeFocus2": "#000000", - "subtleBackground": "transparent", - "subtleBackgroundHover": "#f5f5f5", - "subtleBackgroundPressed": "#e0e0e0", - "subtleBackgroundSelected": "#ebebeb", - "transparentBackground": "transparent", - "transparentBackgroundHover": "transparent", - "transparentBackgroundPressed": "transparent", - "transparentBackgroundSelected": "transparent", - "transparentStroke": "transparent", - "transparentStrokeDisabled": "transparent", - "transparentStrokeInteractive": "transparent", } `; exports[`createMacOSColorAliasTokens test mode: light, isHighContrast: true 1`] = ` Object { - "brandBackground": "#0078d4", - "brandBackground2": "#eff6fc", - "brandBackgroundDisabled": "#d1d1d1", - "brandBackgroundHover": "#106ebe", - "brandBackgroundPressed": "#106ebe", - "brandBackgroundSelected": "#005a9e", - "brandBackgroundStatic": "#0078d4", - "brandForeground1": "#0078d4", - "brandForeground1Disabled": "#757575", - "brandForeground1Pressed": "#004578", - "brandForeground2": "#106ebe", - "brandForegroundLink": "#0078d4", - "brandForegroundLinkHover": "#106ebe", - "brandForegroundLinkPressed": "#004578", - "brandForegroundLinkSelected": "#005a9e", - "brandStroke1": "#0078d4", - "brandStroke2": "#c7e0f4", - "compoundBrandBackground1": "#0078d4", - "compoundBrandBackground1Hover": "#106ebe", - "compoundBrandBackground1Pressed": "#004578", - "compoundBrandForeground1": "#0078d4", - "compoundBrandForeground1Hover": "#106ebe", - "compoundBrandForeground1Pressed": "#004578", - "compoundBrandStroke1": "#0078d4", - "compoundBrandStroke1Hover": "#106ebe", - "compoundBrandStroke1Pressed": "#004578", "neutralBackground1": "#ffffff", "neutralBackground1Hover": "#f5f5f5", "neutralBackground1Pressed": "#ebebeb", @@ -1051,17 +789,7 @@ Object { "neutralForeground3Hover": "#424242", "neutralForeground3Pressed": "#424242", "neutralForeground3Selected": "#424242", - "neutralForeground4": "#424242", - "neutralForegroundDisabled": "#757575", "neutralForegroundInverted": "#ffffff", - "neutralForegroundInvertedLink": "#ffffff", - "neutralForegroundInvertedLinkHover": "#ffffff", - "neutralForegroundInvertedLinkPressed": "#ffffff", - "neutralForegroundInvertedLinkSelected": "#ffffff", - "neutralForegroundOnBrand": "#ffffff", - "neutralForegroundOnBrandHover": "#ffffff", - "neutralForegroundOnBrandPressed": "#ffffff", - "neutralForegroundOnBrandSelected": "#ffffff", "neutralStencil1": "#e6e6e6", "neutralStencil2": "#fafafa", "neutralStroke1": "#616161", @@ -1069,34 +797,11 @@ Object { "neutralStroke1Pressed": "#b3b3b3", "neutralStroke1Selected": "#bdbdbd", "neutralStroke2": "#000000", - "neutralStroke3": "#616161", "neutralStrokeAccessible": "#242424", "neutralStrokeAccessibleHover": "#575757", "neutralStrokeAccessiblePressed": "#4d4d4d", "neutralStrokeAccessibleSelected": "#0078d4", "neutralStrokeDisabled": "#e0e0e0", - "redBackground1": "#f9f0f2", - "redBackground2": "#d69ca5", - "redBackground3": "#750b1c", - "redBorder1": "#d69ca5", - "redBorder2": "#750b1c", - "redBorderActive": "#750b1c", - "redForeground1": "#690a19", - "redForeground2": "#d69ca5", - "redForeground3": "#750b1c", - "strokeFocus1": "#ffffff", - "strokeFocus2": "#000000", - "subtleBackground": "transparent", - "subtleBackgroundHover": "#f5f5f5", - "subtleBackgroundPressed": "#e0e0e0", - "subtleBackgroundSelected": "#ebebeb", - "transparentBackground": "transparent", - "transparentBackgroundHover": "transparent", - "transparentBackgroundPressed": "transparent", - "transparentBackgroundSelected": "transparent", - "transparentStroke": "#000000", - "transparentStrokeDisabled": "#bdbdbd", - "transparentStrokeInteractive": "#666666", } `; diff --git a/packages/theming/default-theme/package.json b/packages/theming/default-theme/package.json index 794a00e220..34cf8d7d30 100644 --- a/packages/theming/default-theme/package.json +++ b/packages/theming/default-theme/package.json @@ -31,8 +31,6 @@ "author": "", "license": "MIT", "dependencies": { - "@fluentui-react-native/design-tokens-win32": "^0.13.0", - "@fluentui-react-native/design-tokens-windows": "^0.13.0", "@fluentui-react-native/memo-cache": "^1.1.7", "@fluentui-react-native/theme-tokens": "^0.19.1", "@fluentui-react-native/theme-types": ">=0.19.2 <1.0.0", diff --git a/packages/theming/default-theme/src/__tests__/__snapshots__/default-theme.test.ts.snap b/packages/theming/default-theme/src/__tests__/__snapshots__/default-theme.test.ts.snap index 337d6c067b..322408fe86 100644 --- a/packages/theming/default-theme/src/__tests__/__snapshots__/default-theme.test.ts.snap +++ b/packages/theming/default-theme/src/__tests__/__snapshots__/default-theme.test.ts.snap @@ -2,767 +2,178 @@ exports[`createColorAliasTokens test appearanceOptions - dark 1`] = ` Object { - "brandBackground": "#106ebe", - "brandBackground2": "#004578", - "brandBackgroundDisabled": undefined, - "brandBackgroundHover": "#0078d4", - "brandBackgroundPressed": "#004578", - "brandBackgroundSelected": "#005a9e", - "brandBackgroundStatic": "#0078d4", - "brandForeground1": "#3aa0f3", - "brandForeground1Disabled": undefined, - "brandForeground1Pressed": undefined, - "brandForeground2": "#6cb8f6", - "brandForegroundLink": "#2899f5", - "brandForegroundLinkHover": "#6cb8f6", - "brandForegroundLinkPressed": "#3aa0f3", - "brandForegroundLinkSelected": "#2899f5", - "brandStroke1": "#2899f5", - "brandStroke2": "#004c87", - "compoundBrandBackground1": "#2899f5", - "compoundBrandBackground1Hover": "#3aa0f3", - "compoundBrandBackground1Pressed": "#0078d4", - "compoundBrandForeground1": "#2899f5", - "compoundBrandForeground1Hover": "#3aa0f3", - "compoundBrandForeground1Pressed": "#0078d4", - "compoundBrandStroke1": "#2899f5", - "compoundBrandStroke1Hover": "#3aa0f3", - "compoundBrandStroke1Pressed": "#0078d4", - "neutralBackground1": "#292929", - "neutralBackground1Hover": "#3d3d3d", - "neutralBackground1Pressed": "#1f1f1f", - "neutralBackground1Selected": "#383838", - "neutralBackground2": "#1f1f1f", - "neutralBackground2Hover": "#333333", - "neutralBackground2Pressed": "#141414", - "neutralBackground2Selected": "#2e2e2e", - "neutralBackground3": "#141414", - "neutralBackground3Hover": "#292929", - "neutralBackground3Pressed": "#0a0a0a", - "neutralBackground3Selected": "#242424", - "neutralBackground4": "#0a0a0a", - "neutralBackground4Hover": "#1f1f1f", - "neutralBackground4Pressed": "#000000", - "neutralBackground4Selected": "#1a1a1a", - "neutralBackground5": "#000000", - "neutralBackground5Hover": "#141414", - "neutralBackground5Pressed": "#050505", - "neutralBackground5Selected": "#0f0f0f", - "neutralBackground6": "#333333", - "neutralBackgroundDisabled": "#141414", - "neutralBackgroundInverted": "#ffffff", + "neutralBackground1": "#ffffff", + "neutralBackground1Hover": undefined, + "neutralBackground1Pressed": "#e0e0e0", + "neutralBackground1Selected": "#ebebeb", + "neutralBackground2": "#ffffff", + "neutralBackground2Hover": undefined, + "neutralBackground2Pressed": "#e0e0e0", + "neutralBackground2Selected": "#ebebeb", + "neutralBackground3": "#ffffff", + "neutralBackground3Hover": undefined, + "neutralBackground3Pressed": "#e0e0e0", + "neutralBackground3Selected": "#ebebeb", + "neutralBackground4": "#fafafa", + "neutralBackground4Hover": undefined, + "neutralBackground4Pressed": "#dbdbdb", + "neutralBackground4Selected": "#e6e6e6", + "neutralBackground5": "#ebebeb", + "neutralBackground5Hover": undefined, + "neutralBackground5Pressed": "#d1d1d1", + "neutralBackground5Selected": "#dbdbdb", + "neutralBackground6": "#d1d1d1", + "neutralBackgroundDisabled": "#e0e0e0", + "neutralBackgroundInverted": "#242424", "neutralForeground1": "#ffffff", - "neutralForeground1Hover": "#ffffff", - "neutralForeground1Pressed": "#ffffff", - "neutralForeground1Selected": "#ffffff", + "neutralForeground1Hover": undefined, + "neutralForeground1Pressed": undefined, + "neutralForeground1Selected": undefined, "neutralForeground2": "#d6d6d6", - "neutralForeground2BrandHover": "#3aa0f3", - "neutralForeground2BrandPressed": "#2899f5", - "neutralForeground2BrandSelected": "#3aa0f3", - "neutralForeground2Hover": "#ffffff", - "neutralForeground2Pressed": "#ffffff", - "neutralForeground2Selected": "#ffffff", + "neutralForeground2BrandHover": undefined, + "neutralForeground2BrandPressed": undefined, + "neutralForeground2BrandSelected": undefined, + "neutralForeground2Hover": undefined, + "neutralForeground2Pressed": undefined, + "neutralForeground2Selected": undefined, "neutralForeground3": "#adadad", - "neutralForeground3BrandHover": "#3aa0f3", - "neutralForeground3BrandPressed": "#2899f5", - "neutralForeground3BrandSelected": "#3aa0f3", - "neutralForeground3Hover": "#d6d6d6", - "neutralForeground3Pressed": "#d6d6d6", - "neutralForeground3Selected": "#d6d6d6", - "neutralForeground4": "#999999", - "neutralForegroundDisabled": "#5c5c5c", - "neutralForegroundInverted": "#242424", - "neutralForegroundInvertedLink": "#ffffff", - "neutralForegroundInvertedLinkHover": "#ffffff", - "neutralForegroundInvertedLinkPressed": "#ffffff", - "neutralForegroundInvertedLinkSelected": "#ffffff", - "neutralForegroundOnBrand": "#ffffff", - "neutralForegroundOnBrandHover": "#ffffff", - "neutralForegroundOnBrandPressed": "#ffffff", - "neutralForegroundOnBrandSelected": "#ffffff", - "neutralStencil1": "#333333", - "neutralStencil2": "#575757", - "neutralStroke1": "#666666", - "neutralStroke1Hover": "#757575", - "neutralStroke1Pressed": "#6b6b6b", - "neutralStroke1Selected": "#707070", - "neutralStroke2": "#525252", - "neutralStroke3": "#3d3d3d", - "neutralStrokeAccessible": "#adadad", - "neutralStrokeAccessibleHover": "#bdbdbd", - "neutralStrokeAccessiblePressed": "#b3b3b3", - "neutralStrokeAccessibleSelected": "#3aa0f3", + "neutralForeground3BrandHover": undefined, + "neutralForeground3BrandPressed": undefined, + "neutralForeground3BrandSelected": undefined, + "neutralForeground3Hover": undefined, + "neutralForeground3Pressed": undefined, + "neutralForeground3Selected": undefined, + "neutralForegroundInverted": "#ffffff", + "neutralStencil1": "#e6e6e6", + "neutralStencil2": "#fafafa", + "neutralStroke1": "#525252", + "neutralStroke1Hover": undefined, + "neutralStroke1Pressed": undefined, + "neutralStroke1Selected": undefined, + "neutralStroke2": "#3d3d3d", + "neutralStrokeAccessible": "#9e9e9e", + "neutralStrokeAccessibleHover": undefined, + "neutralStrokeAccessiblePressed": undefined, + "neutralStrokeAccessibleSelected": undefined, "neutralStrokeDisabled": "#424242", - "redBackground1": "#230308", - "redBackground2": "#420610", - "redBackground3": "#750b1c", - "redBorder1": "#750b1c", - "redBorder2": "#962f3f", - "redBorderActive": "#ac4f5e", - "redForeground1": "#ac4f5e", - "redForeground2": "#420610", - "redForeground3": "#750b1c", - "strokeFocus1": "#000000", - "strokeFocus2": "#ffffff", - "subtleBackground": "transparent", - "subtleBackgroundHover": "#383838", - "subtleBackgroundPressed": "#2e2e2e", - "subtleBackgroundSelected": "#333333", - "transparentBackground": "transparent", - "transparentBackgroundHover": "transparent", - "transparentBackgroundPressed": "transparent", - "transparentBackgroundSelected": "transparent", - "transparentStroke": "transparent", - "transparentStrokeDisabled": "transparent", - "transparentStrokeInteractive": "transparent", } `; exports[`createColorAliasTokens test appearanceOptions - highContrast 1`] = ` Object { - "brandBackground": Object { - "resource_paths": Array [ - "SystemColorButtonFaceColor", - ], - }, - "brandBackground2": Object { - "resource_paths": Array [ - "SystemColorButtonFaceColor", - ], - }, - "brandBackgroundDisabled": undefined, - "brandBackgroundHover": Object { - "resource_paths": Array [ - "SystemColorHighlightColor", - ], - }, - "brandBackgroundPressed": Object { - "resource_paths": Array [ - "SystemColorHighlightColor", - ], - }, - "brandBackgroundSelected": Object { - "resource_paths": Array [ - "SystemColorHighlightColor", - ], - }, - "brandBackgroundStatic": Object { - "resource_paths": Array [ - "SystemColorWindowColor", - ], - }, - "brandForeground1": Object { - "resource_paths": Array [ - "SystemColorWindowTextColor", - ], - }, - "brandForeground1Disabled": undefined, - "brandForeground1Pressed": undefined, - "brandForeground2": Object { - "resource_paths": Array [ - "SystemColorButtonTextColor", - ], - }, - "brandForegroundLink": Object { - "resource_paths": Array [ - "SystemColorHotlightColor", - ], - }, - "brandForegroundLinkHover": Object { - "resource_paths": Array [ - "SystemColorHotlightColor", - ], - }, - "brandForegroundLinkPressed": Object { - "resource_paths": Array [ - "SystemColorHotlightColor", - ], - }, - "brandForegroundLinkSelected": Object { - "resource_paths": Array [ - "SystemColorHotlightColor", - ], - }, - "brandStroke1": Object { - "resource_paths": Array [ - "SystemColorWindowTextColor", - ], - }, - "brandStroke2": Object { - "resource_paths": Array [ - "SystemColorWindowColor", - ], - }, - "compoundBrandBackground1": Object { - "resource_paths": Array [ - "SystemColorHighlightColor", - ], - }, - "compoundBrandBackground1Hover": Object { - "resource_paths": Array [ - "SystemColorHighlightColor", - ], - }, - "compoundBrandBackground1Pressed": Object { - "resource_paths": Array [ - "SystemColorHighlightColor", - ], - }, - "compoundBrandForeground1": Object { - "resource_paths": Array [ - "SystemColorHighlightColor", - ], - }, - "compoundBrandForeground1Hover": Object { - "resource_paths": Array [ - "SystemColorHighlightColor", - ], - }, - "compoundBrandForeground1Pressed": Object { - "resource_paths": Array [ - "SystemColorHighlightColor", - ], - }, - "compoundBrandStroke1": Object { - "resource_paths": Array [ - "SystemColorWindowColor", - ], - }, - "compoundBrandStroke1Hover": Object { - "resource_paths": Array [ - "SystemColorHighlightColor", - ], - }, - "compoundBrandStroke1Pressed": Object { - "resource_paths": Array [ - "SystemColorHighlightColor", - ], - }, - "neutralBackground1": Object { - "resource_paths": Array [ - "SystemColorWindowColor", - ], - }, - "neutralBackground1Hover": Object { - "resource_paths": Array [ - "SystemColorHighlightColor", - ], - }, - "neutralBackground1Pressed": Object { - "resource_paths": Array [ - "SystemColorHighlightColor", - ], - }, - "neutralBackground1Selected": Object { - "resource_paths": Array [ - "SystemColorHighlightColor", - ], - }, - "neutralBackground2": Object { - "resource_paths": Array [ - "SystemColorWindowColor", - ], - }, - "neutralBackground2Hover": Object { - "resource_paths": Array [ - "SystemColorHighlightColor", - ], - }, - "neutralBackground2Pressed": Object { - "resource_paths": Array [ - "SystemColorHighlightColor", - ], - }, - "neutralBackground2Selected": Object { - "resource_paths": Array [ - "SystemColorHighlightColor", - ], - }, - "neutralBackground3": Object { - "resource_paths": Array [ - "SystemColorWindowColor", - ], - }, - "neutralBackground3Hover": Object { - "resource_paths": Array [ - "SystemColorHighlightColor", - ], - }, - "neutralBackground3Pressed": Object { - "resource_paths": Array [ - "SystemColorHighlightColor", - ], - }, - "neutralBackground3Selected": Object { - "resource_paths": Array [ - "SystemColorHighlightColor", - ], - }, - "neutralBackground4": Object { - "resource_paths": Array [ - "SystemColorWindowColor", - ], - }, - "neutralBackground4Hover": Object { - "resource_paths": Array [ - "SystemColorHighlightColor", - ], - }, - "neutralBackground4Pressed": Object { - "resource_paths": Array [ - "SystemColorHighlightColor", - ], - }, - "neutralBackground4Selected": Object { - "resource_paths": Array [ - "SystemColorHighlightColor", - ], - }, - "neutralBackground5": Object { - "resource_paths": Array [ - "SystemColorWindowColor", - ], - }, - "neutralBackground5Hover": Object { - "resource_paths": Array [ - "SystemColorHighlightColor", - ], - }, - "neutralBackground5Pressed": Object { - "resource_paths": Array [ - "SystemColorHighlightColor", - ], - }, - "neutralBackground5Selected": Object { - "resource_paths": Array [ - "SystemColorHighlightColor", - ], - }, - "neutralBackground6": Object { - "resource_paths": Array [ - "SystemColorWindowColor", - ], - }, - "neutralBackgroundDisabled": Object { - "resource_paths": Array [ - "SystemColorWindowColor", - ], - }, - "neutralBackgroundInverted": Object { - "resource_paths": Array [ - "SystemColorWindowTextColor", - ], - }, - "neutralForeground1": Object { - "resource_paths": Array [ - "SystemColorWindowTextColor", - ], - }, - "neutralForeground1Hover": Object { - "resource_paths": Array [ - "SystemColorHighlightTextColor", - ], - }, - "neutralForeground1Pressed": Object { - "resource_paths": Array [ - "SystemColorHighlightTextColor", - ], - }, - "neutralForeground1Selected": Object { - "resource_paths": Array [ - "SystemColorHighlightTextColor", - ], - }, - "neutralForeground2": Object { - "resource_paths": Array [ - "SystemColorWindowTextColor", - ], - }, - "neutralForeground2BrandHover": Object { - "resource_paths": Array [ - "SystemColorHighlightTextColor", - ], - }, - "neutralForeground2BrandPressed": Object { - "resource_paths": Array [ - "SystemColorHighlightTextColor", - ], - }, - "neutralForeground2BrandSelected": Object { - "resource_paths": Array [ - "SystemColorHighlightTextColor", - ], - }, - "neutralForeground2Hover": Object { - "resource_paths": Array [ - "SystemColorHighlightTextColor", - ], - }, - "neutralForeground2Pressed": Object { - "resource_paths": Array [ - "SystemColorHighlightTextColor", - ], - }, - "neutralForeground2Selected": Object { - "resource_paths": Array [ - "SystemColorHighlightTextColor", - ], - }, - "neutralForeground3": Object { - "resource_paths": Array [ - "SystemColorWindowTextColor", - ], - }, - "neutralForeground3BrandHover": Object { - "resource_paths": Array [ - "SystemColorHighlightTextColor", - ], - }, - "neutralForeground3BrandPressed": Object { - "resource_paths": Array [ - "SystemColorHighlightTextColor", - ], - }, - "neutralForeground3BrandSelected": Object { - "resource_paths": Array [ - "SystemColorHighlightTextColor", - ], - }, - "neutralForeground3Hover": Object { - "resource_paths": Array [ - "SystemColorHighlightTextColor", - ], - }, - "neutralForeground3Pressed": Object { - "resource_paths": Array [ - "SystemColorHighlightTextColor", - ], - }, - "neutralForeground3Selected": Object { - "resource_paths": Array [ - "SystemColorHighlightTextColor", - ], - }, - "neutralForeground4": Object { - "resource_paths": Array [ - "SystemColorWindowTextColor", - ], - }, - "neutralForegroundDisabled": Object { - "resource_paths": Array [ - "SystemColorGrayTextColor", - ], - }, - "neutralForegroundInverted": Object { - "resource_paths": Array [ - "SystemColorWindowColor", - ], - }, - "neutralForegroundInvertedLink": Object { - "resource_paths": Array [ - "SystemColorHotlightColor", - ], - }, - "neutralForegroundInvertedLinkHover": Object { - "resource_paths": Array [ - "SystemColorHotlightColor", - ], - }, - "neutralForegroundInvertedLinkPressed": Object { - "resource_paths": Array [ - "SystemColorHotlightColor", - ], - }, - "neutralForegroundInvertedLinkSelected": Object { - "resource_paths": Array [ - "SystemColorHotlightColor", - ], - }, - "neutralForegroundOnBrand": Object { - "resource_paths": Array [ - "SystemColorButtonTextColor", - ], - }, - "neutralForegroundOnBrandHover": Object { - "resource_paths": Array [ - "SystemColorHighlightTextColor", - ], - }, - "neutralForegroundOnBrandPressed": Object { - "resource_paths": Array [ - "SystemColorHighlightTextColor", - ], - }, - "neutralForegroundOnBrandSelected": Object { - "resource_paths": Array [ - "SystemColorHighlightTextColor", - ], - }, - "neutralStencil1": "#141414", - "neutralStencil2": "#858585", - "neutralStroke1": Object { - "resource_paths": Array [ - "SystemColorWindowTextColor", - ], - }, - "neutralStroke1Hover": Object { - "resource_paths": Array [ - "SystemColorHighlightColor", - ], - }, - "neutralStroke1Pressed": Object { - "resource_paths": Array [ - "SystemColorHighlightColor", - ], - }, - "neutralStroke1Selected": Object { - "resource_paths": Array [ - "SystemColorHighlightColor", - ], - }, - "neutralStroke2": Object { - "resource_paths": Array [ - "SystemColorWindowTextColor", - ], - }, - "neutralStroke3": Object { - "resource_paths": Array [ - "SystemColorWindowTextColor", - ], - }, - "neutralStrokeAccessible": Object { - "resource_paths": Array [ - "SystemColorWindowTextColor", - ], - }, - "neutralStrokeAccessibleHover": Object { - "resource_paths": Array [ - "SystemColorHighlightColor", - ], - }, - "neutralStrokeAccessiblePressed": Object { - "resource_paths": Array [ - "SystemColorHighlightColor", - ], - }, - "neutralStrokeAccessibleSelected": Object { - "resource_paths": Array [ - "SystemColorHighlightColor", - ], - }, - "neutralStrokeDisabled": Object { - "resource_paths": Array [ - "SystemColorGrayTextColor", - ], - }, - "redBackground1": Object { - "resource_paths": Array [ - "SystemColorButtonFaceColor", - ], - }, - "redBackground2": Object { - "resource_paths": Array [ - "SystemColorWindowColor", - ], - }, - "redBackground3": Object { - "resource_paths": Array [ - "SystemColorButtonFaceColor", - ], - }, - "redBorder1": Object { - "resource_paths": Array [ - "SystemColorWindowTextColor", - ], - }, - "redBorder2": Object { - "resource_paths": Array [ - "SystemColorWindowTextColor", - ], - }, - "redBorderActive": Object { - "resource_paths": Array [ - "SystemColorHighlightColor", - ], - }, - "redForeground1": Object { - "resource_paths": Array [ - "SystemColorButtonTextColor", - ], - }, - "redForeground2": Object { - "resource_paths": Array [ - "SystemColorWindowColor", - ], - }, - "redForeground3": Object { - "resource_paths": Array [ - "SystemColorButtonFaceColor", - ], - }, - "strokeFocus1": Object { - "resource_paths": Array [ - "SystemColorWindowColor", - ], - }, - "strokeFocus2": Object { - "resource_paths": Array [ - "SystemColorHighlightColor", - ], - }, - "subtleBackground": "transparent", - "subtleBackgroundHover": Object { - "resource_paths": Array [ - "SystemColorHighlightColor", - ], - }, - "subtleBackgroundPressed": Object { - "resource_paths": Array [ - "SystemColorHighlightColor", - ], - }, - "subtleBackgroundSelected": Object { - "resource_paths": Array [ - "SystemColorHighlightColor", - ], - }, - "transparentBackground": "transparent", - "transparentBackgroundHover": "transparent", - "transparentBackgroundPressed": "transparent", - "transparentBackgroundSelected": "transparent", - "transparentStroke": Object { - "resource_paths": Array [ - "SystemColorWindowTextColor", - ], - }, - "transparentStrokeDisabled": Object { - "resource_paths": Array [ - "SystemColorGrayTextColor", - ], - }, - "transparentStrokeInteractive": Object { - "resource_paths": Array [ - "SystemColorHighlightColor", - ], - }, + "neutralBackground1": "#000000", + "neutralBackground1Hover": undefined, + "neutralBackground1Pressed": "#2e2e2e", + "neutralBackground1Selected": "#242424", + "neutralBackground2": "#1f1f1f", + "neutralBackground2Hover": undefined, + "neutralBackground2Pressed": "#4d4d4d", + "neutralBackground2Selected": "#424242", + "neutralBackground3": "#ffffff", + "neutralBackground3Hover": undefined, + "neutralBackground3Pressed": "#e0e0e0", + "neutralBackground3Selected": "#ebebeb", + "neutralBackground4": "#333333", + "neutralBackground4Hover": undefined, + "neutralBackground4Pressed": "#616161", + "neutralBackground4Selected": "#575757", + "neutralBackground5": "#3d3d3d", + "neutralBackground5Hover": undefined, + "neutralBackground5Pressed": "#6b6b6b", + "neutralBackground5Selected": "#616161", + "neutralBackground6": "#5c5c5c", + "neutralBackgroundDisabled": "#e0e0e0", + "neutralBackgroundInverted": "#575757", + "neutralForeground1": "#242424", + "neutralForeground1Hover": undefined, + "neutralForeground1Pressed": undefined, + "neutralForeground1Selected": undefined, + "neutralForeground2": "#616161", + "neutralForeground2BrandHover": undefined, + "neutralForeground2BrandPressed": undefined, + "neutralForeground2BrandSelected": undefined, + "neutralForeground2Hover": undefined, + "neutralForeground2Pressed": undefined, + "neutralForeground2Selected": undefined, + "neutralForeground3": "#808080", + "neutralForeground3BrandHover": undefined, + "neutralForeground3BrandPressed": undefined, + "neutralForeground3BrandSelected": undefined, + "neutralForeground3Hover": undefined, + "neutralForeground3Pressed": undefined, + "neutralForeground3Selected": undefined, + "neutralForegroundInverted": "#ffffff", + "neutralStencil1": "#575757", + "neutralStencil2": "#333333", + "neutralStroke1": "#d1d1d1", + "neutralStroke1Hover": undefined, + "neutralStroke1Pressed": undefined, + "neutralStroke1Selected": undefined, + "neutralStroke2": "#e0e0e0", + "neutralStrokeAccessible": "#616161", + "neutralStrokeAccessibleHover": undefined, + "neutralStrokeAccessiblePressed": undefined, + "neutralStrokeAccessibleSelected": undefined, + "neutralStrokeDisabled": "#e0e0e0", } `; exports[`createColorAliasTokens test appearanceOptions - light 1`] = ` Object { - "brandBackground": "#0078d4", - "brandBackground2": "#eff6fc", - "brandBackgroundDisabled": undefined, - "brandBackgroundHover": "#106ebe", - "brandBackgroundPressed": "#004578", - "brandBackgroundSelected": "#005a9e", - "brandBackgroundStatic": "#0078d4", - "brandForeground1": "#0078d4", - "brandForeground1Disabled": undefined, - "brandForeground1Pressed": undefined, - "brandForeground2": "#106ebe", - "brandForegroundLink": "#106ebe", - "brandForegroundLinkHover": "#005a9e", - "brandForegroundLinkPressed": "#004578", - "brandForegroundLinkSelected": "#106ebe", - "brandStroke1": "#0078d4", - "brandStroke2": "#c7e0f4", - "compoundBrandBackground1": "#0078d4", - "compoundBrandBackground1Hover": "#106ebe", - "compoundBrandBackground1Pressed": "#005a9e", - "compoundBrandForeground1": "#0078d4", - "compoundBrandForeground1Hover": "#106ebe", - "compoundBrandForeground1Pressed": "#005a9e", - "compoundBrandStroke1": "#0078d4", - "compoundBrandStroke1Hover": "#106ebe", - "compoundBrandStroke1Pressed": "#005a9e", - "neutralBackground1": "#ffffff", - "neutralBackground1Hover": "#f5f5f5", - "neutralBackground1Pressed": "#e0e0e0", - "neutralBackground1Selected": "#ebebeb", - "neutralBackground2": "#fafafa", - "neutralBackground2Hover": "#f0f0f0", - "neutralBackground2Pressed": "#dbdbdb", - "neutralBackground2Selected": "#e6e6e6", - "neutralBackground3": "#f5f5f5", - "neutralBackground3Hover": "#ebebeb", - "neutralBackground3Pressed": "#d6d6d6", - "neutralBackground3Selected": "#e0e0e0", - "neutralBackground4": "#f0f0f0", - "neutralBackground4Hover": "#fafafa", - "neutralBackground4Pressed": "#f5f5f5", - "neutralBackground4Selected": "#ffffff", - "neutralBackground5": "#ebebeb", - "neutralBackground5Hover": "#f5f5f5", - "neutralBackground5Pressed": "#f0f0f0", - "neutralBackground5Selected": "#fafafa", - "neutralBackground6": "#e6e6e6", - "neutralBackgroundDisabled": "#f0f0f0", - "neutralBackgroundInverted": "#616161", + "neutralBackground1": "#000000", + "neutralBackground1Hover": undefined, + "neutralBackground1Pressed": "#2e2e2e", + "neutralBackground1Selected": "#242424", + "neutralBackground2": "#1f1f1f", + "neutralBackground2Hover": undefined, + "neutralBackground2Pressed": "#4d4d4d", + "neutralBackground2Selected": "#424242", + "neutralBackground3": "#ffffff", + "neutralBackground3Hover": undefined, + "neutralBackground3Pressed": "#e0e0e0", + "neutralBackground3Selected": "#ebebeb", + "neutralBackground4": "#333333", + "neutralBackground4Hover": undefined, + "neutralBackground4Pressed": "#616161", + "neutralBackground4Selected": "#575757", + "neutralBackground5": "#3d3d3d", + "neutralBackground5Hover": undefined, + "neutralBackground5Pressed": "#6b6b6b", + "neutralBackground5Selected": "#616161", + "neutralBackground6": "#5c5c5c", + "neutralBackgroundDisabled": "#e0e0e0", + "neutralBackgroundInverted": "#575757", "neutralForeground1": "#242424", - "neutralForeground1Hover": "#242424", - "neutralForeground1Pressed": "#242424", - "neutralForeground1Selected": "#242424", - "neutralForeground2": "#424242", - "neutralForeground2BrandHover": "#0078d4", - "neutralForeground2BrandPressed": "#106ebe", - "neutralForeground2BrandSelected": "#0078d4", - "neutralForeground2Hover": "#242424", - "neutralForeground2Pressed": "#242424", - "neutralForeground2Selected": "#242424", - "neutralForeground3": "#616161", - "neutralForeground3BrandHover": "#0078d4", - "neutralForeground3BrandPressed": "#106ebe", - "neutralForeground3BrandSelected": "#0078d4", - "neutralForeground3Hover": "#424242", - "neutralForeground3Pressed": "#424242", - "neutralForeground3Selected": "#424242", - "neutralForeground4": "#707070", - "neutralForegroundDisabled": "#bdbdbd", + "neutralForeground1Hover": undefined, + "neutralForeground1Pressed": undefined, + "neutralForeground1Selected": undefined, + "neutralForeground2": "#616161", + "neutralForeground2BrandHover": undefined, + "neutralForeground2BrandPressed": undefined, + "neutralForeground2BrandSelected": undefined, + "neutralForeground2Hover": undefined, + "neutralForeground2Pressed": undefined, + "neutralForeground2Selected": undefined, + "neutralForeground3": "#808080", + "neutralForeground3BrandHover": undefined, + "neutralForeground3BrandPressed": undefined, + "neutralForeground3BrandSelected": undefined, + "neutralForeground3Hover": undefined, + "neutralForeground3Pressed": undefined, + "neutralForeground3Selected": undefined, "neutralForegroundInverted": "#ffffff", - "neutralForegroundInvertedLink": "#ffffff", - "neutralForegroundInvertedLinkHover": "#ffffff", - "neutralForegroundInvertedLinkPressed": "#ffffff", - "neutralForegroundInvertedLinkSelected": "#ffffff", - "neutralForegroundOnBrand": "#ffffff", - "neutralForegroundOnBrandHover": "#ffffff", - "neutralForegroundOnBrandPressed": "#ffffff", - "neutralForegroundOnBrandSelected": "#ffffff", - "neutralStencil1": "#e6e6e6", - "neutralStencil2": "#fafafa", + "neutralStencil1": "#575757", + "neutralStencil2": "#333333", "neutralStroke1": "#d1d1d1", - "neutralStroke1Hover": "#c7c7c7", - "neutralStroke1Pressed": "#b3b3b3", - "neutralStroke1Selected": "#bdbdbd", + "neutralStroke1Hover": undefined, + "neutralStroke1Pressed": undefined, + "neutralStroke1Selected": undefined, "neutralStroke2": "#e0e0e0", - "neutralStroke3": "#f0f0f0", "neutralStrokeAccessible": "#616161", - "neutralStrokeAccessibleHover": "#575757", - "neutralStrokeAccessiblePressed": "#4d4d4d", - "neutralStrokeAccessibleSelected": "#0078d4", + "neutralStrokeAccessibleHover": undefined, + "neutralStrokeAccessiblePressed": undefined, + "neutralStrokeAccessibleSelected": undefined, "neutralStrokeDisabled": "#e0e0e0", - "redBackground1": "#f9f0f2", - "redBackground2": "#d69ca5", - "redBackground3": "#750b1c", - "redBorder1": "#d69ca5", - "redBorder2": "#750b1c", - "redBorderActive": "#750b1c", - "redForeground1": "#690a19", - "redForeground2": "#d69ca5", - "redForeground3": "#750b1c", - "strokeFocus1": "#ffffff", - "strokeFocus2": "#000000", - "subtleBackground": "transparent", - "subtleBackgroundHover": "#f5f5f5", - "subtleBackgroundPressed": "#e0e0e0", - "subtleBackgroundSelected": "#ebebeb", - "transparentBackground": "transparent", - "transparentBackgroundHover": "transparent", - "transparentBackgroundPressed": "transparent", - "transparentBackgroundSelected": "transparent", - "transparentStroke": "transparent", - "transparentStrokeDisabled": "transparent", - "transparentStrokeInteractive": "transparent", } `; @@ -781,23 +192,6 @@ Object { "bodyStandoutBackground": "#201f1e", "bodyText": "#f3f2f1", "bodyTextChecked": "#ffffff", - "brandBackground": "#106ebe", - "brandBackground2": "#004578", - "brandBackgroundDisabled": undefined, - "brandBackgroundHover": "#0078d4", - "brandBackgroundPressed": "#004578", - "brandBackgroundSelected": "#005a9e", - "brandBackgroundStatic": "#0078d4", - "brandForeground1": "#3aa0f3", - "brandForeground1Disabled": undefined, - "brandForeground1Pressed": undefined, - "brandForeground2": "#6cb8f6", - "brandForegroundLink": "#2899f5", - "brandForegroundLinkHover": "#6cb8f6", - "brandForegroundLinkPressed": "#3aa0f3", - "brandForegroundLinkSelected": "#2899f5", - "brandStroke1": "#2899f5", - "brandStroke2": "#004c87", "brandedBackground": "#2b88d8", "brandedBorder": "#deecf9", "brandedCheckedBackground": "#484644", @@ -845,15 +239,6 @@ Object { "checkboxBackgroundDisabled": "#252423", "checkboxBorderColor": "#979693", "checkmarkColor": "#1b1a19", - "compoundBrandBackground1": "#2899f5", - "compoundBrandBackground1Hover": "#3aa0f3", - "compoundBrandBackground1Pressed": "#0078d4", - "compoundBrandForeground1": "#2899f5", - "compoundBrandForeground1Hover": "#3aa0f3", - "compoundBrandForeground1Pressed": "#0078d4", - "compoundBrandStroke1": "#2899f5", - "compoundBrandStroke1Hover": "#3aa0f3", - "compoundBrandStroke1Pressed": "#0078d4", "defaultBackground": "#252423", "defaultBorder": "#979693", "defaultCheckedBackground": "#484644", @@ -947,70 +332,59 @@ Object { "menuItemBackgroundPressed": "#3b3a39", "menuItemText": "#f3f2f1", "menuItemTextHovered": "#faf9f8", - "neutralBackground1": "#292929", - "neutralBackground1Hover": "#3d3d3d", - "neutralBackground1Pressed": "#1f1f1f", - "neutralBackground1Selected": "#383838", - "neutralBackground2": "#1f1f1f", - "neutralBackground2Hover": "#333333", - "neutralBackground2Pressed": "#141414", - "neutralBackground2Selected": "#2e2e2e", - "neutralBackground3": "#141414", - "neutralBackground3Hover": "#292929", - "neutralBackground3Pressed": "#0a0a0a", - "neutralBackground3Selected": "#242424", - "neutralBackground4": "#0a0a0a", - "neutralBackground4Hover": "#1f1f1f", - "neutralBackground4Pressed": "#000000", - "neutralBackground4Selected": "#1a1a1a", - "neutralBackground5": "#000000", - "neutralBackground5Hover": "#141414", - "neutralBackground5Pressed": "#050505", - "neutralBackground5Selected": "#0f0f0f", - "neutralBackground6": "#333333", - "neutralBackgroundDisabled": "#141414", - "neutralBackgroundInverted": "#ffffff", + "neutralBackground1": "#ffffff", + "neutralBackground1Hover": undefined, + "neutralBackground1Pressed": "#e0e0e0", + "neutralBackground1Selected": "#ebebeb", + "neutralBackground2": "#ffffff", + "neutralBackground2Hover": undefined, + "neutralBackground2Pressed": "#e0e0e0", + "neutralBackground2Selected": "#ebebeb", + "neutralBackground3": "#ffffff", + "neutralBackground3Hover": undefined, + "neutralBackground3Pressed": "#e0e0e0", + "neutralBackground3Selected": "#ebebeb", + "neutralBackground4": "#fafafa", + "neutralBackground4Hover": undefined, + "neutralBackground4Pressed": "#dbdbdb", + "neutralBackground4Selected": "#e6e6e6", + "neutralBackground5": "#ebebeb", + "neutralBackground5Hover": undefined, + "neutralBackground5Pressed": "#d1d1d1", + "neutralBackground5Selected": "#dbdbdb", + "neutralBackground6": "#d1d1d1", + "neutralBackgroundDisabled": "#e0e0e0", + "neutralBackgroundInverted": "#242424", "neutralForeground1": "#ffffff", - "neutralForeground1Hover": "#ffffff", - "neutralForeground1Pressed": "#ffffff", - "neutralForeground1Selected": "#ffffff", + "neutralForeground1Hover": undefined, + "neutralForeground1Pressed": undefined, + "neutralForeground1Selected": undefined, "neutralForeground2": "#d6d6d6", - "neutralForeground2BrandHover": "#3aa0f3", - "neutralForeground2BrandPressed": "#2899f5", - "neutralForeground2BrandSelected": "#3aa0f3", - "neutralForeground2Hover": "#ffffff", - "neutralForeground2Pressed": "#ffffff", - "neutralForeground2Selected": "#ffffff", + "neutralForeground2BrandHover": undefined, + "neutralForeground2BrandPressed": undefined, + "neutralForeground2BrandSelected": undefined, + "neutralForeground2Hover": undefined, + "neutralForeground2Pressed": undefined, + "neutralForeground2Selected": undefined, "neutralForeground3": "#adadad", - "neutralForeground3BrandHover": "#3aa0f3", - "neutralForeground3BrandPressed": "#2899f5", - "neutralForeground3BrandSelected": "#3aa0f3", - "neutralForeground3Hover": "#d6d6d6", - "neutralForeground3Pressed": "#d6d6d6", - "neutralForeground3Selected": "#d6d6d6", - "neutralForeground4": "#999999", - "neutralForegroundDisabled": "#5c5c5c", - "neutralForegroundInverted": "#242424", - "neutralForegroundInvertedLink": "#ffffff", - "neutralForegroundInvertedLinkHover": "#ffffff", - "neutralForegroundInvertedLinkPressed": "#ffffff", - "neutralForegroundInvertedLinkSelected": "#ffffff", - "neutralForegroundOnBrand": "#ffffff", - "neutralForegroundOnBrandHover": "#ffffff", - "neutralForegroundOnBrandPressed": "#ffffff", - "neutralForegroundOnBrandSelected": "#ffffff", - "neutralStencil1": "#333333", - "neutralStencil2": "#575757", - "neutralStroke1": "#666666", - "neutralStroke1Hover": "#757575", - "neutralStroke1Pressed": "#6b6b6b", - "neutralStroke1Selected": "#707070", - "neutralStroke2": "#525252", - "neutralStroke3": "#3d3d3d", - "neutralStrokeAccessible": "#adadad", - "neutralStrokeAccessibleHover": "#bdbdbd", - "neutralStrokeAccessiblePressed": "#b3b3b3", - "neutralStrokeAccessibleSelected": "#3aa0f3", + "neutralForeground3BrandHover": undefined, + "neutralForeground3BrandPressed": undefined, + "neutralForeground3BrandSelected": undefined, + "neutralForeground3Hover": undefined, + "neutralForeground3Pressed": undefined, + "neutralForeground3Selected": undefined, + "neutralForegroundInverted": "#ffffff", + "neutralStencil1": "#e6e6e6", + "neutralStencil2": "#fafafa", + "neutralStroke1": "#525252", + "neutralStroke1Hover": undefined, + "neutralStroke1Pressed": undefined, + "neutralStroke1Selected": undefined, + "neutralStroke2": "#3d3d3d", + "neutralStrokeAccessible": "#9e9e9e", + "neutralStrokeAccessibleHover": undefined, + "neutralStrokeAccessiblePressed": undefined, + "neutralStrokeAccessibleSelected": undefined, "neutralStrokeDisabled": "#424242", "personaActivityGlow": "#2b88d8", "personaActivityRing": "#1b1a19", @@ -1024,31 +398,9 @@ Object { "primaryButtonTextDisabled": "#3b3a39", "primaryButtonTextHovered": "#1b1a19", "primaryButtonTextPressed": "#1b1a19", - "redBackground1": "#230308", - "redBackground2": "#420610", - "redBackground3": "#750b1c", - "redBorder1": "#750b1c", - "redBorder2": "#962f3f", - "redBorderActive": "#ac4f5e", - "redForeground1": "#ac4f5e", - "redForeground2": "#420610", - "redForeground3": "#750b1c", "smallInputBorder": "#a19f9d", - "strokeFocus1": "#000000", - "strokeFocus2": "#ffffff", "subText": "#a19f9d", - "subtleBackground": "transparent", - "subtleBackgroundHover": "#383838", - "subtleBackgroundPressed": "#2e2e2e", - "subtleBackgroundSelected": "#333333", "successBackground": "rgba(186, 216, 10, .4)", - "transparentBackground": "transparent", - "transparentBackgroundHover": "transparent", - "transparentBackgroundPressed": "transparent", - "transparentBackgroundSelected": "transparent", - "transparentStroke": "transparent", - "transparentStrokeDisabled": "transparent", - "transparentStrokeInteractive": "transparent", "variantBorder": "#292827", "variantBorderHovered": "#797775", "warningBackground": "rgba(255, 251, 0, .6)", @@ -1247,11 +599,11 @@ Object { }, "sizes": Object { "body": 14, - "caption": 10, - "header": 20, - "hero": 28, - "heroLarge": 40, - "secondary": 12, + "caption": 12, + "header": 18, + "hero": 24, + "heroLarge": 60, + "secondary": 13, "subheader": 16, }, "variants": Object { @@ -1409,23 +761,6 @@ Object { "bodyStandoutBackground": "#201f1e", "bodyText": "#f3f2f1", "bodyTextChecked": "#ffffff", - "brandBackground": "#106ebe", - "brandBackground2": "#004578", - "brandBackgroundDisabled": undefined, - "brandBackgroundHover": "#0078d4", - "brandBackgroundPressed": "#004578", - "brandBackgroundSelected": "#005a9e", - "brandBackgroundStatic": "#0078d4", - "brandForeground1": "#3aa0f3", - "brandForeground1Disabled": undefined, - "brandForeground1Pressed": undefined, - "brandForeground2": "#6cb8f6", - "brandForegroundLink": "#2899f5", - "brandForegroundLinkHover": "#6cb8f6", - "brandForegroundLinkPressed": "#3aa0f3", - "brandForegroundLinkSelected": "#2899f5", - "brandStroke1": "#2899f5", - "brandStroke2": "#004c87", "brandedBackground": "#2b88d8", "brandedBorder": "#deecf9", "brandedCheckedBackground": "#484644", @@ -1473,15 +808,6 @@ Object { "checkboxBackgroundDisabled": "#252423", "checkboxBorderColor": "#979693", "checkmarkColor": "#1b1a19", - "compoundBrandBackground1": "#2899f5", - "compoundBrandBackground1Hover": "#3aa0f3", - "compoundBrandBackground1Pressed": "#0078d4", - "compoundBrandForeground1": "#2899f5", - "compoundBrandForeground1Hover": "#3aa0f3", - "compoundBrandForeground1Pressed": "#0078d4", - "compoundBrandStroke1": "#2899f5", - "compoundBrandStroke1Hover": "#3aa0f3", - "compoundBrandStroke1Pressed": "#0078d4", "defaultBackground": "#252423", "defaultBorder": "#979693", "defaultCheckedBackground": "#484644", @@ -1575,70 +901,59 @@ Object { "menuItemBackgroundPressed": "#3b3a39", "menuItemText": "#f3f2f1", "menuItemTextHovered": "#faf9f8", - "neutralBackground1": "#292929", - "neutralBackground1Hover": "#3d3d3d", - "neutralBackground1Pressed": "#1f1f1f", - "neutralBackground1Selected": "#383838", - "neutralBackground2": "#1f1f1f", - "neutralBackground2Hover": "#333333", - "neutralBackground2Pressed": "#141414", - "neutralBackground2Selected": "#2e2e2e", - "neutralBackground3": "#141414", - "neutralBackground3Hover": "#292929", - "neutralBackground3Pressed": "#0a0a0a", - "neutralBackground3Selected": "#242424", - "neutralBackground4": "#0a0a0a", - "neutralBackground4Hover": "#1f1f1f", - "neutralBackground4Pressed": "#000000", - "neutralBackground4Selected": "#1a1a1a", - "neutralBackground5": "#000000", - "neutralBackground5Hover": "#141414", - "neutralBackground5Pressed": "#050505", - "neutralBackground5Selected": "#0f0f0f", - "neutralBackground6": "#333333", - "neutralBackgroundDisabled": "#141414", - "neutralBackgroundInverted": "#ffffff", + "neutralBackground1": "#ffffff", + "neutralBackground1Hover": undefined, + "neutralBackground1Pressed": "#e0e0e0", + "neutralBackground1Selected": "#ebebeb", + "neutralBackground2": "#ffffff", + "neutralBackground2Hover": undefined, + "neutralBackground2Pressed": "#e0e0e0", + "neutralBackground2Selected": "#ebebeb", + "neutralBackground3": "#ffffff", + "neutralBackground3Hover": undefined, + "neutralBackground3Pressed": "#e0e0e0", + "neutralBackground3Selected": "#ebebeb", + "neutralBackground4": "#fafafa", + "neutralBackground4Hover": undefined, + "neutralBackground4Pressed": "#dbdbdb", + "neutralBackground4Selected": "#e6e6e6", + "neutralBackground5": "#ebebeb", + "neutralBackground5Hover": undefined, + "neutralBackground5Pressed": "#d1d1d1", + "neutralBackground5Selected": "#dbdbdb", + "neutralBackground6": "#d1d1d1", + "neutralBackgroundDisabled": "#e0e0e0", + "neutralBackgroundInverted": "#242424", "neutralForeground1": "#ffffff", - "neutralForeground1Hover": "#ffffff", - "neutralForeground1Pressed": "#ffffff", - "neutralForeground1Selected": "#ffffff", + "neutralForeground1Hover": undefined, + "neutralForeground1Pressed": undefined, + "neutralForeground1Selected": undefined, "neutralForeground2": "#d6d6d6", - "neutralForeground2BrandHover": "#3aa0f3", - "neutralForeground2BrandPressed": "#2899f5", - "neutralForeground2BrandSelected": "#3aa0f3", - "neutralForeground2Hover": "#ffffff", - "neutralForeground2Pressed": "#ffffff", - "neutralForeground2Selected": "#ffffff", + "neutralForeground2BrandHover": undefined, + "neutralForeground2BrandPressed": undefined, + "neutralForeground2BrandSelected": undefined, + "neutralForeground2Hover": undefined, + "neutralForeground2Pressed": undefined, + "neutralForeground2Selected": undefined, "neutralForeground3": "#adadad", - "neutralForeground3BrandHover": "#3aa0f3", - "neutralForeground3BrandPressed": "#2899f5", - "neutralForeground3BrandSelected": "#3aa0f3", - "neutralForeground3Hover": "#d6d6d6", - "neutralForeground3Pressed": "#d6d6d6", - "neutralForeground3Selected": "#d6d6d6", - "neutralForeground4": "#999999", - "neutralForegroundDisabled": "#5c5c5c", - "neutralForegroundInverted": "#242424", - "neutralForegroundInvertedLink": "#ffffff", - "neutralForegroundInvertedLinkHover": "#ffffff", - "neutralForegroundInvertedLinkPressed": "#ffffff", - "neutralForegroundInvertedLinkSelected": "#ffffff", - "neutralForegroundOnBrand": "#ffffff", - "neutralForegroundOnBrandHover": "#ffffff", - "neutralForegroundOnBrandPressed": "#ffffff", - "neutralForegroundOnBrandSelected": "#ffffff", - "neutralStencil1": "#333333", - "neutralStencil2": "#575757", - "neutralStroke1": "#666666", - "neutralStroke1Hover": "#757575", - "neutralStroke1Pressed": "#6b6b6b", - "neutralStroke1Selected": "#707070", - "neutralStroke2": "#525252", - "neutralStroke3": "#3d3d3d", - "neutralStrokeAccessible": "#adadad", - "neutralStrokeAccessibleHover": "#bdbdbd", - "neutralStrokeAccessiblePressed": "#b3b3b3", - "neutralStrokeAccessibleSelected": "#3aa0f3", + "neutralForeground3BrandHover": undefined, + "neutralForeground3BrandPressed": undefined, + "neutralForeground3BrandSelected": undefined, + "neutralForeground3Hover": undefined, + "neutralForeground3Pressed": undefined, + "neutralForeground3Selected": undefined, + "neutralForegroundInverted": "#ffffff", + "neutralStencil1": "#e6e6e6", + "neutralStencil2": "#fafafa", + "neutralStroke1": "#525252", + "neutralStroke1Hover": undefined, + "neutralStroke1Pressed": undefined, + "neutralStroke1Selected": undefined, + "neutralStroke2": "#3d3d3d", + "neutralStrokeAccessible": "#9e9e9e", + "neutralStrokeAccessibleHover": undefined, + "neutralStrokeAccessiblePressed": undefined, + "neutralStrokeAccessibleSelected": undefined, "neutralStrokeDisabled": "#424242", "personaActivityGlow": "#2b88d8", "personaActivityRing": "#1b1a19", @@ -1652,31 +967,9 @@ Object { "primaryButtonTextDisabled": "#3b3a39", "primaryButtonTextHovered": "#1b1a19", "primaryButtonTextPressed": "#1b1a19", - "redBackground1": "#230308", - "redBackground2": "#420610", - "redBackground3": "#750b1c", - "redBorder1": "#750b1c", - "redBorder2": "#962f3f", - "redBorderActive": "#ac4f5e", - "redForeground1": "#ac4f5e", - "redForeground2": "#420610", - "redForeground3": "#750b1c", "smallInputBorder": "#a19f9d", - "strokeFocus1": "#000000", - "strokeFocus2": "#ffffff", "subText": "#a19f9d", - "subtleBackground": "transparent", - "subtleBackgroundHover": "#383838", - "subtleBackgroundPressed": "#2e2e2e", - "subtleBackgroundSelected": "#333333", "successBackground": "rgba(186, 216, 10, .4)", - "transparentBackground": "transparent", - "transparentBackgroundHover": "transparent", - "transparentBackgroundPressed": "transparent", - "transparentBackgroundSelected": "transparent", - "transparentStroke": "transparent", - "transparentStrokeDisabled": "transparent", - "transparentStrokeInteractive": "transparent", "variantBorder": "#292827", "variantBorderHovered": "#797775", "warningBackground": "rgba(255, 251, 0, .6)", @@ -1875,11 +1168,11 @@ Object { }, "sizes": Object { "body": 14, - "caption": 10, - "header": 20, - "hero": 28, - "heroLarge": 40, - "secondary": 12, + "caption": 12, + "header": 18, + "hero": 24, + "heroLarge": 60, + "secondary": 13, "subheader": 16, }, "variants": Object { @@ -2037,79 +1330,6 @@ Object { "bodyStandoutBackground": "#000000", "bodyText": "#ffffff", "bodyTextChecked": "#000000", - "brandBackground": Object { - "resource_paths": Array [ - "SystemColorButtonFaceColor", - ], - }, - "brandBackground2": Object { - "resource_paths": Array [ - "SystemColorButtonFaceColor", - ], - }, - "brandBackgroundDisabled": undefined, - "brandBackgroundHover": Object { - "resource_paths": Array [ - "SystemColorHighlightColor", - ], - }, - "brandBackgroundPressed": Object { - "resource_paths": Array [ - "SystemColorHighlightColor", - ], - }, - "brandBackgroundSelected": Object { - "resource_paths": Array [ - "SystemColorHighlightColor", - ], - }, - "brandBackgroundStatic": Object { - "resource_paths": Array [ - "SystemColorWindowColor", - ], - }, - "brandForeground1": Object { - "resource_paths": Array [ - "SystemColorWindowTextColor", - ], - }, - "brandForeground1Disabled": undefined, - "brandForeground1Pressed": undefined, - "brandForeground2": Object { - "resource_paths": Array [ - "SystemColorButtonTextColor", - ], - }, - "brandForegroundLink": Object { - "resource_paths": Array [ - "SystemColorHotlightColor", - ], - }, - "brandForegroundLinkHover": Object { - "resource_paths": Array [ - "SystemColorHotlightColor", - ], - }, - "brandForegroundLinkPressed": Object { - "resource_paths": Array [ - "SystemColorHotlightColor", - ], - }, - "brandForegroundLinkSelected": Object { - "resource_paths": Array [ - "SystemColorHotlightColor", - ], - }, - "brandStroke1": Object { - "resource_paths": Array [ - "SystemColorWindowTextColor", - ], - }, - "brandStroke2": Object { - "resource_paths": Array [ - "SystemColorWindowColor", - ], - }, "brandedBackground": "#000000", "brandedBorder": "#ffffff", "brandedCheckedBackground": "#1aebff", @@ -2157,51 +1377,6 @@ Object { "checkboxBackgroundDisabled": "#000000", "checkboxBorderColor": "#ffffff", "checkmarkColor": "#ffffff", - "compoundBrandBackground1": Object { - "resource_paths": Array [ - "SystemColorHighlightColor", - ], - }, - "compoundBrandBackground1Hover": Object { - "resource_paths": Array [ - "SystemColorHighlightColor", - ], - }, - "compoundBrandBackground1Pressed": Object { - "resource_paths": Array [ - "SystemColorHighlightColor", - ], - }, - "compoundBrandForeground1": Object { - "resource_paths": Array [ - "SystemColorHighlightColor", - ], - }, - "compoundBrandForeground1Hover": Object { - "resource_paths": Array [ - "SystemColorHighlightColor", - ], - }, - "compoundBrandForeground1Pressed": Object { - "resource_paths": Array [ - "SystemColorHighlightColor", - ], - }, - "compoundBrandStroke1": Object { - "resource_paths": Array [ - "SystemColorWindowColor", - ], - }, - "compoundBrandStroke1Hover": Object { - "resource_paths": Array [ - "SystemColorHighlightColor", - ], - }, - "compoundBrandStroke1Pressed": Object { - "resource_paths": Array [ - "SystemColorHighlightColor", - ], - }, "defaultBackground": "#000000", "defaultBorder": "#ffffff", "defaultCheckedBackground": "#1aebff", @@ -2295,323 +1470,60 @@ Object { "menuItemBackgroundPressed": "#1aebff", "menuItemText": "#ffffff", "menuItemTextHovered": "#000000", - "neutralBackground1": Object { - "resource_paths": Array [ - "SystemColorWindowColor", - ], - }, - "neutralBackground1Hover": Object { - "resource_paths": Array [ - "SystemColorHighlightColor", - ], - }, - "neutralBackground1Pressed": Object { - "resource_paths": Array [ - "SystemColorHighlightColor", - ], - }, - "neutralBackground1Selected": Object { - "resource_paths": Array [ - "SystemColorHighlightColor", - ], - }, - "neutralBackground2": Object { - "resource_paths": Array [ - "SystemColorWindowColor", - ], - }, - "neutralBackground2Hover": Object { - "resource_paths": Array [ - "SystemColorHighlightColor", - ], - }, - "neutralBackground2Pressed": Object { - "resource_paths": Array [ - "SystemColorHighlightColor", - ], - }, - "neutralBackground2Selected": Object { - "resource_paths": Array [ - "SystemColorHighlightColor", - ], - }, - "neutralBackground3": Object { - "resource_paths": Array [ - "SystemColorWindowColor", - ], - }, - "neutralBackground3Hover": Object { - "resource_paths": Array [ - "SystemColorHighlightColor", - ], - }, - "neutralBackground3Pressed": Object { - "resource_paths": Array [ - "SystemColorHighlightColor", - ], - }, - "neutralBackground3Selected": Object { - "resource_paths": Array [ - "SystemColorHighlightColor", - ], - }, - "neutralBackground4": Object { - "resource_paths": Array [ - "SystemColorWindowColor", - ], - }, - "neutralBackground4Hover": Object { - "resource_paths": Array [ - "SystemColorHighlightColor", - ], - }, - "neutralBackground4Pressed": Object { - "resource_paths": Array [ - "SystemColorHighlightColor", - ], - }, - "neutralBackground4Selected": Object { - "resource_paths": Array [ - "SystemColorHighlightColor", - ], - }, - "neutralBackground5": Object { - "resource_paths": Array [ - "SystemColorWindowColor", - ], - }, - "neutralBackground5Hover": Object { - "resource_paths": Array [ - "SystemColorHighlightColor", - ], - }, - "neutralBackground5Pressed": Object { - "resource_paths": Array [ - "SystemColorHighlightColor", - ], - }, - "neutralBackground5Selected": Object { - "resource_paths": Array [ - "SystemColorHighlightColor", - ], - }, - "neutralBackground6": Object { - "resource_paths": Array [ - "SystemColorWindowColor", - ], - }, - "neutralBackgroundDisabled": Object { - "resource_paths": Array [ - "SystemColorWindowColor", - ], - }, - "neutralBackgroundInverted": Object { - "resource_paths": Array [ - "SystemColorWindowTextColor", - ], - }, - "neutralForeground1": Object { - "resource_paths": Array [ - "SystemColorWindowTextColor", - ], - }, - "neutralForeground1Hover": Object { - "resource_paths": Array [ - "SystemColorHighlightTextColor", - ], - }, - "neutralForeground1Pressed": Object { - "resource_paths": Array [ - "SystemColorHighlightTextColor", - ], - }, - "neutralForeground1Selected": Object { - "resource_paths": Array [ - "SystemColorHighlightTextColor", - ], - }, - "neutralForeground2": Object { - "resource_paths": Array [ - "SystemColorWindowTextColor", - ], - }, - "neutralForeground2BrandHover": Object { - "resource_paths": Array [ - "SystemColorHighlightTextColor", - ], - }, - "neutralForeground2BrandPressed": Object { - "resource_paths": Array [ - "SystemColorHighlightTextColor", - ], - }, - "neutralForeground2BrandSelected": Object { - "resource_paths": Array [ - "SystemColorHighlightTextColor", - ], - }, - "neutralForeground2Hover": Object { - "resource_paths": Array [ - "SystemColorHighlightTextColor", - ], - }, - "neutralForeground2Pressed": Object { - "resource_paths": Array [ - "SystemColorHighlightTextColor", - ], - }, - "neutralForeground2Selected": Object { - "resource_paths": Array [ - "SystemColorHighlightTextColor", - ], - }, - "neutralForeground3": Object { - "resource_paths": Array [ - "SystemColorWindowTextColor", - ], - }, - "neutralForeground3BrandHover": Object { - "resource_paths": Array [ - "SystemColorHighlightTextColor", - ], - }, - "neutralForeground3BrandPressed": Object { - "resource_paths": Array [ - "SystemColorHighlightTextColor", - ], - }, - "neutralForeground3BrandSelected": Object { - "resource_paths": Array [ - "SystemColorHighlightTextColor", - ], - }, - "neutralForeground3Hover": Object { - "resource_paths": Array [ - "SystemColorHighlightTextColor", - ], - }, - "neutralForeground3Pressed": Object { - "resource_paths": Array [ - "SystemColorHighlightTextColor", - ], - }, - "neutralForeground3Selected": Object { - "resource_paths": Array [ - "SystemColorHighlightTextColor", - ], - }, - "neutralForeground4": Object { - "resource_paths": Array [ - "SystemColorWindowTextColor", - ], - }, - "neutralForegroundDisabled": Object { - "resource_paths": Array [ - "SystemColorGrayTextColor", - ], - }, - "neutralForegroundInverted": Object { - "resource_paths": Array [ - "SystemColorWindowColor", - ], - }, - "neutralForegroundInvertedLink": Object { - "resource_paths": Array [ - "SystemColorHotlightColor", - ], - }, - "neutralForegroundInvertedLinkHover": Object { - "resource_paths": Array [ - "SystemColorHotlightColor", - ], - }, - "neutralForegroundInvertedLinkPressed": Object { - "resource_paths": Array [ - "SystemColorHotlightColor", - ], - }, - "neutralForegroundInvertedLinkSelected": Object { - "resource_paths": Array [ - "SystemColorHotlightColor", - ], - }, - "neutralForegroundOnBrand": Object { - "resource_paths": Array [ - "SystemColorButtonTextColor", - ], - }, - "neutralForegroundOnBrandHover": Object { - "resource_paths": Array [ - "SystemColorHighlightTextColor", - ], - }, - "neutralForegroundOnBrandPressed": Object { - "resource_paths": Array [ - "SystemColorHighlightTextColor", - ], - }, - "neutralForegroundOnBrandSelected": Object { - "resource_paths": Array [ - "SystemColorHighlightTextColor", - ], - }, - "neutralStencil1": "#141414", - "neutralStencil2": "#858585", - "neutralStroke1": Object { - "resource_paths": Array [ - "SystemColorWindowTextColor", - ], - }, - "neutralStroke1Hover": Object { - "resource_paths": Array [ - "SystemColorHighlightColor", - ], - }, - "neutralStroke1Pressed": Object { - "resource_paths": Array [ - "SystemColorHighlightColor", - ], - }, - "neutralStroke1Selected": Object { - "resource_paths": Array [ - "SystemColorHighlightColor", - ], - }, - "neutralStroke2": Object { - "resource_paths": Array [ - "SystemColorWindowTextColor", - ], - }, - "neutralStroke3": Object { - "resource_paths": Array [ - "SystemColorWindowTextColor", - ], - }, - "neutralStrokeAccessible": Object { - "resource_paths": Array [ - "SystemColorWindowTextColor", - ], - }, - "neutralStrokeAccessibleHover": Object { - "resource_paths": Array [ - "SystemColorHighlightColor", - ], - }, - "neutralStrokeAccessiblePressed": Object { - "resource_paths": Array [ - "SystemColorHighlightColor", - ], - }, - "neutralStrokeAccessibleSelected": Object { - "resource_paths": Array [ - "SystemColorHighlightColor", - ], - }, - "neutralStrokeDisabled": Object { - "resource_paths": Array [ - "SystemColorGrayTextColor", - ], - }, + "neutralBackground1": "#000000", + "neutralBackground1Hover": undefined, + "neutralBackground1Pressed": "#2e2e2e", + "neutralBackground1Selected": "#242424", + "neutralBackground2": "#1f1f1f", + "neutralBackground2Hover": undefined, + "neutralBackground2Pressed": "#4d4d4d", + "neutralBackground2Selected": "#424242", + "neutralBackground3": "#ffffff", + "neutralBackground3Hover": undefined, + "neutralBackground3Pressed": "#e0e0e0", + "neutralBackground3Selected": "#ebebeb", + "neutralBackground4": "#333333", + "neutralBackground4Hover": undefined, + "neutralBackground4Pressed": "#616161", + "neutralBackground4Selected": "#575757", + "neutralBackground5": "#3d3d3d", + "neutralBackground5Hover": undefined, + "neutralBackground5Pressed": "#6b6b6b", + "neutralBackground5Selected": "#616161", + "neutralBackground6": "#5c5c5c", + "neutralBackgroundDisabled": "#e0e0e0", + "neutralBackgroundInverted": "#575757", + "neutralForeground1": "#242424", + "neutralForeground1Hover": undefined, + "neutralForeground1Pressed": undefined, + "neutralForeground1Selected": undefined, + "neutralForeground2": "#616161", + "neutralForeground2BrandHover": undefined, + "neutralForeground2BrandPressed": undefined, + "neutralForeground2BrandSelected": undefined, + "neutralForeground2Hover": undefined, + "neutralForeground2Pressed": undefined, + "neutralForeground2Selected": undefined, + "neutralForeground3": "#808080", + "neutralForeground3BrandHover": undefined, + "neutralForeground3BrandPressed": undefined, + "neutralForeground3BrandSelected": undefined, + "neutralForeground3Hover": undefined, + "neutralForeground3Pressed": undefined, + "neutralForeground3Selected": undefined, + "neutralForegroundInverted": "#ffffff", + "neutralStencil1": "#575757", + "neutralStencil2": "#333333", + "neutralStroke1": "#d1d1d1", + "neutralStroke1Hover": undefined, + "neutralStroke1Pressed": undefined, + "neutralStroke1Selected": undefined, + "neutralStroke2": "#e0e0e0", + "neutralStrokeAccessible": "#616161", + "neutralStrokeAccessibleHover": undefined, + "neutralStrokeAccessiblePressed": undefined, + "neutralStrokeAccessibleSelected": undefined, + "neutralStrokeDisabled": "#e0e0e0", "personaActivityGlow": "transparent", "personaActivityRing": "#ffffff", "primaryButtonBackground": "#000000", @@ -2624,99 +1536,9 @@ Object { "primaryButtonTextDisabled": "#3ff23f", "primaryButtonTextHovered": "#000000", "primaryButtonTextPressed": "#000000", - "redBackground1": Object { - "resource_paths": Array [ - "SystemColorButtonFaceColor", - ], - }, - "redBackground2": Object { - "resource_paths": Array [ - "SystemColorWindowColor", - ], - }, - "redBackground3": Object { - "resource_paths": Array [ - "SystemColorButtonFaceColor", - ], - }, - "redBorder1": Object { - "resource_paths": Array [ - "SystemColorWindowTextColor", - ], - }, - "redBorder2": Object { - "resource_paths": Array [ - "SystemColorWindowTextColor", - ], - }, - "redBorderActive": Object { - "resource_paths": Array [ - "SystemColorHighlightColor", - ], - }, - "redForeground1": Object { - "resource_paths": Array [ - "SystemColorButtonTextColor", - ], - }, - "redForeground2": Object { - "resource_paths": Array [ - "SystemColorWindowColor", - ], - }, - "redForeground3": Object { - "resource_paths": Array [ - "SystemColorButtonFaceColor", - ], - }, "smallInputBorder": "#ffffff", - "strokeFocus1": Object { - "resource_paths": Array [ - "SystemColorWindowColor", - ], - }, - "strokeFocus2": Object { - "resource_paths": Array [ - "SystemColorHighlightColor", - ], - }, "subText": "#ffffff", - "subtleBackground": "transparent", - "subtleBackgroundHover": Object { - "resource_paths": Array [ - "SystemColorHighlightColor", - ], - }, - "subtleBackgroundPressed": Object { - "resource_paths": Array [ - "SystemColorHighlightColor", - ], - }, - "subtleBackgroundSelected": Object { - "resource_paths": Array [ - "SystemColorHighlightColor", - ], - }, "successBackground": "#000000", - "transparentBackground": "transparent", - "transparentBackgroundHover": "transparent", - "transparentBackgroundPressed": "transparent", - "transparentBackgroundSelected": "transparent", - "transparentStroke": Object { - "resource_paths": Array [ - "SystemColorWindowTextColor", - ], - }, - "transparentStrokeDisabled": Object { - "resource_paths": Array [ - "SystemColorGrayTextColor", - ], - }, - "transparentStrokeInteractive": Object { - "resource_paths": Array [ - "SystemColorHighlightColor", - ], - }, "variantBorder": "#ffffff", "variantBorderHovered": "#ffffff", "warningBackground": "#000000", @@ -2915,11 +1737,11 @@ Object { }, "sizes": Object { "body": 14, - "caption": 10, - "header": 20, - "hero": 28, - "heroLarge": 40, - "secondary": 12, + "caption": 12, + "header": 18, + "hero": 24, + "heroLarge": 60, + "secondary": 13, "subheader": 16, }, "variants": Object { @@ -3077,23 +1899,6 @@ Object { "bodyStandoutBackground": "#faf9f8", "bodyText": "#323130", "bodyTextChecked": "#000000", - "brandBackground": "#0078d4", - "brandBackground2": "#eff6fc", - "brandBackgroundDisabled": undefined, - "brandBackgroundHover": "#106ebe", - "brandBackgroundPressed": "#004578", - "brandBackgroundSelected": "#005a9e", - "brandBackgroundStatic": "#0078d4", - "brandForeground1": "#0078d4", - "brandForeground1Disabled": undefined, - "brandForeground1Pressed": undefined, - "brandForeground2": "#106ebe", - "brandForegroundLink": "#106ebe", - "brandForegroundLinkHover": "#005a9e", - "brandForegroundLinkPressed": "#004578", - "brandForegroundLinkSelected": "#106ebe", - "brandStroke1": "#0078d4", - "brandStroke2": "#c7e0f4", "brandedBackground": "#0078d4", "brandedBorder": "#005a9e", "brandedCheckedBackground": "#c8c6c4", @@ -3141,15 +1946,6 @@ Object { "checkboxBackgroundDisabled": "#f3f2f1", "checkboxBorderColor": "#8a8886", "checkmarkColor": "#ffffff", - "compoundBrandBackground1": "#0078d4", - "compoundBrandBackground1Hover": "#106ebe", - "compoundBrandBackground1Pressed": "#005a9e", - "compoundBrandForeground1": "#0078d4", - "compoundBrandForeground1Hover": "#106ebe", - "compoundBrandForeground1Pressed": "#005a9e", - "compoundBrandStroke1": "#0078d4", - "compoundBrandStroke1Hover": "#106ebe", - "compoundBrandStroke1Pressed": "#005a9e", "defaultBackground": "#f3f2f1", "defaultBorder": "#8a8886", "defaultCheckedBackground": "#c8c6c4", @@ -3243,70 +2039,59 @@ Object { "menuItemBackgroundPressed": "#edebe9", "menuItemText": "#323130", "menuItemTextHovered": "#201f1e", - "neutralBackground1": "#ffffff", - "neutralBackground1Hover": "#f5f5f5", - "neutralBackground1Pressed": "#e0e0e0", - "neutralBackground1Selected": "#ebebeb", - "neutralBackground2": "#fafafa", - "neutralBackground2Hover": "#f0f0f0", - "neutralBackground2Pressed": "#dbdbdb", - "neutralBackground2Selected": "#e6e6e6", - "neutralBackground3": "#f5f5f5", - "neutralBackground3Hover": "#ebebeb", - "neutralBackground3Pressed": "#d6d6d6", - "neutralBackground3Selected": "#e0e0e0", - "neutralBackground4": "#f0f0f0", - "neutralBackground4Hover": "#fafafa", - "neutralBackground4Pressed": "#f5f5f5", - "neutralBackground4Selected": "#ffffff", - "neutralBackground5": "#ebebeb", - "neutralBackground5Hover": "#f5f5f5", - "neutralBackground5Pressed": "#f0f0f0", - "neutralBackground5Selected": "#fafafa", - "neutralBackground6": "#e6e6e6", - "neutralBackgroundDisabled": "#f0f0f0", - "neutralBackgroundInverted": "#616161", + "neutralBackground1": "#000000", + "neutralBackground1Hover": undefined, + "neutralBackground1Pressed": "#2e2e2e", + "neutralBackground1Selected": "#242424", + "neutralBackground2": "#1f1f1f", + "neutralBackground2Hover": undefined, + "neutralBackground2Pressed": "#4d4d4d", + "neutralBackground2Selected": "#424242", + "neutralBackground3": "#ffffff", + "neutralBackground3Hover": undefined, + "neutralBackground3Pressed": "#e0e0e0", + "neutralBackground3Selected": "#ebebeb", + "neutralBackground4": "#333333", + "neutralBackground4Hover": undefined, + "neutralBackground4Pressed": "#616161", + "neutralBackground4Selected": "#575757", + "neutralBackground5": "#3d3d3d", + "neutralBackground5Hover": undefined, + "neutralBackground5Pressed": "#6b6b6b", + "neutralBackground5Selected": "#616161", + "neutralBackground6": "#5c5c5c", + "neutralBackgroundDisabled": "#e0e0e0", + "neutralBackgroundInverted": "#575757", "neutralForeground1": "#242424", - "neutralForeground1Hover": "#242424", - "neutralForeground1Pressed": "#242424", - "neutralForeground1Selected": "#242424", - "neutralForeground2": "#424242", - "neutralForeground2BrandHover": "#0078d4", - "neutralForeground2BrandPressed": "#106ebe", - "neutralForeground2BrandSelected": "#0078d4", - "neutralForeground2Hover": "#242424", - "neutralForeground2Pressed": "#242424", - "neutralForeground2Selected": "#242424", - "neutralForeground3": "#616161", - "neutralForeground3BrandHover": "#0078d4", - "neutralForeground3BrandPressed": "#106ebe", - "neutralForeground3BrandSelected": "#0078d4", - "neutralForeground3Hover": "#424242", - "neutralForeground3Pressed": "#424242", - "neutralForeground3Selected": "#424242", - "neutralForeground4": "#707070", - "neutralForegroundDisabled": "#bdbdbd", + "neutralForeground1Hover": undefined, + "neutralForeground1Pressed": undefined, + "neutralForeground1Selected": undefined, + "neutralForeground2": "#616161", + "neutralForeground2BrandHover": undefined, + "neutralForeground2BrandPressed": undefined, + "neutralForeground2BrandSelected": undefined, + "neutralForeground2Hover": undefined, + "neutralForeground2Pressed": undefined, + "neutralForeground2Selected": undefined, + "neutralForeground3": "#808080", + "neutralForeground3BrandHover": undefined, + "neutralForeground3BrandPressed": undefined, + "neutralForeground3BrandSelected": undefined, + "neutralForeground3Hover": undefined, + "neutralForeground3Pressed": undefined, + "neutralForeground3Selected": undefined, "neutralForegroundInverted": "#ffffff", - "neutralForegroundInvertedLink": "#ffffff", - "neutralForegroundInvertedLinkHover": "#ffffff", - "neutralForegroundInvertedLinkPressed": "#ffffff", - "neutralForegroundInvertedLinkSelected": "#ffffff", - "neutralForegroundOnBrand": "#ffffff", - "neutralForegroundOnBrandHover": "#ffffff", - "neutralForegroundOnBrandPressed": "#ffffff", - "neutralForegroundOnBrandSelected": "#ffffff", - "neutralStencil1": "#e6e6e6", - "neutralStencil2": "#fafafa", + "neutralStencil1": "#575757", + "neutralStencil2": "#333333", "neutralStroke1": "#d1d1d1", - "neutralStroke1Hover": "#c7c7c7", - "neutralStroke1Pressed": "#b3b3b3", - "neutralStroke1Selected": "#bdbdbd", + "neutralStroke1Hover": undefined, + "neutralStroke1Pressed": undefined, + "neutralStroke1Selected": undefined, "neutralStroke2": "#e0e0e0", - "neutralStroke3": "#f0f0f0", "neutralStrokeAccessible": "#616161", - "neutralStrokeAccessibleHover": "#575757", - "neutralStrokeAccessiblePressed": "#4d4d4d", - "neutralStrokeAccessibleSelected": "#0078d4", + "neutralStrokeAccessibleHover": undefined, + "neutralStrokeAccessiblePressed": undefined, + "neutralStrokeAccessibleSelected": undefined, "neutralStrokeDisabled": "#e0e0e0", "personaActivityGlow": "#0078d4", "personaActivityRing": "#ffffff", @@ -3320,31 +2105,9 @@ Object { "primaryButtonTextDisabled": "#d2d0ce", "primaryButtonTextHovered": "#ffffff", "primaryButtonTextPressed": "#ffffff", - "redBackground1": "#f9f0f2", - "redBackground2": "#d69ca5", - "redBackground3": "#750b1c", - "redBorder1": "#d69ca5", - "redBorder2": "#750b1c", - "redBorderActive": "#750b1c", - "redForeground1": "#690a19", - "redForeground2": "#d69ca5", - "redForeground3": "#750b1c", "smallInputBorder": "#605e5c", - "strokeFocus1": "#ffffff", - "strokeFocus2": "#000000", "subText": "#605e5c", - "subtleBackground": "transparent", - "subtleBackgroundHover": "#f5f5f5", - "subtleBackgroundPressed": "#e0e0e0", - "subtleBackgroundSelected": "#ebebeb", "successBackground": "rgba(95, 210, 85, .2)", - "transparentBackground": "transparent", - "transparentBackgroundHover": "transparent", - "transparentBackgroundPressed": "transparent", - "transparentBackgroundSelected": "transparent", - "transparentStroke": "transparent", - "transparentStrokeDisabled": "transparent", - "transparentStrokeInteractive": "transparent", "variantBorder": "#edebe9", "variantBorderHovered": "#a19f9d", "warningBackground": "rgba(255, 200, 10, .2)", @@ -3543,11 +2306,11 @@ Object { }, "sizes": Object { "body": 14, - "caption": 10, - "header": 20, - "hero": 28, - "heroLarge": 40, - "secondary": 12, + "caption": 12, + "header": 18, + "hero": 24, + "heroLarge": 60, + "secondary": 13, "subheader": 16, }, "variants": Object { @@ -3705,23 +2468,6 @@ Object { "bodyStandoutBackground": "#faf9f8", "bodyText": "#323130", "bodyTextChecked": "#000000", - "brandBackground": "#0078d4", - "brandBackground2": "#eff6fc", - "brandBackgroundDisabled": undefined, - "brandBackgroundHover": "#106ebe", - "brandBackgroundPressed": "#004578", - "brandBackgroundSelected": "#005a9e", - "brandBackgroundStatic": "#0078d4", - "brandForeground1": "#0078d4", - "brandForeground1Disabled": undefined, - "brandForeground1Pressed": undefined, - "brandForeground2": "#106ebe", - "brandForegroundLink": "#106ebe", - "brandForegroundLinkHover": "#005a9e", - "brandForegroundLinkPressed": "#004578", - "brandForegroundLinkSelected": "#106ebe", - "brandStroke1": "#0078d4", - "brandStroke2": "#c7e0f4", "brandedBackground": "#0078d4", "brandedBorder": "#005a9e", "brandedCheckedBackground": "#c8c6c4", @@ -3769,15 +2515,6 @@ Object { "checkboxBackgroundDisabled": "#f3f2f1", "checkboxBorderColor": "#8a8886", "checkmarkColor": "#ffffff", - "compoundBrandBackground1": "#0078d4", - "compoundBrandBackground1Hover": "#106ebe", - "compoundBrandBackground1Pressed": "#005a9e", - "compoundBrandForeground1": "#0078d4", - "compoundBrandForeground1Hover": "#106ebe", - "compoundBrandForeground1Pressed": "#005a9e", - "compoundBrandStroke1": "#0078d4", - "compoundBrandStroke1Hover": "#106ebe", - "compoundBrandStroke1Pressed": "#005a9e", "defaultBackground": "#f3f2f1", "defaultBorder": "#8a8886", "defaultCheckedBackground": "#c8c6c4", @@ -3871,70 +2608,59 @@ Object { "menuItemBackgroundPressed": "#edebe9", "menuItemText": "#323130", "menuItemTextHovered": "#201f1e", - "neutralBackground1": "#ffffff", - "neutralBackground1Hover": "#f5f5f5", - "neutralBackground1Pressed": "#e0e0e0", - "neutralBackground1Selected": "#ebebeb", - "neutralBackground2": "#fafafa", - "neutralBackground2Hover": "#f0f0f0", - "neutralBackground2Pressed": "#dbdbdb", - "neutralBackground2Selected": "#e6e6e6", - "neutralBackground3": "#f5f5f5", - "neutralBackground3Hover": "#ebebeb", - "neutralBackground3Pressed": "#d6d6d6", - "neutralBackground3Selected": "#e0e0e0", - "neutralBackground4": "#f0f0f0", - "neutralBackground4Hover": "#fafafa", - "neutralBackground4Pressed": "#f5f5f5", - "neutralBackground4Selected": "#ffffff", - "neutralBackground5": "#ebebeb", - "neutralBackground5Hover": "#f5f5f5", - "neutralBackground5Pressed": "#f0f0f0", - "neutralBackground5Selected": "#fafafa", - "neutralBackground6": "#e6e6e6", - "neutralBackgroundDisabled": "#f0f0f0", - "neutralBackgroundInverted": "#616161", + "neutralBackground1": "#000000", + "neutralBackground1Hover": undefined, + "neutralBackground1Pressed": "#2e2e2e", + "neutralBackground1Selected": "#242424", + "neutralBackground2": "#1f1f1f", + "neutralBackground2Hover": undefined, + "neutralBackground2Pressed": "#4d4d4d", + "neutralBackground2Selected": "#424242", + "neutralBackground3": "#ffffff", + "neutralBackground3Hover": undefined, + "neutralBackground3Pressed": "#e0e0e0", + "neutralBackground3Selected": "#ebebeb", + "neutralBackground4": "#333333", + "neutralBackground4Hover": undefined, + "neutralBackground4Pressed": "#616161", + "neutralBackground4Selected": "#575757", + "neutralBackground5": "#3d3d3d", + "neutralBackground5Hover": undefined, + "neutralBackground5Pressed": "#6b6b6b", + "neutralBackground5Selected": "#616161", + "neutralBackground6": "#5c5c5c", + "neutralBackgroundDisabled": "#e0e0e0", + "neutralBackgroundInverted": "#575757", "neutralForeground1": "#242424", - "neutralForeground1Hover": "#242424", - "neutralForeground1Pressed": "#242424", - "neutralForeground1Selected": "#242424", - "neutralForeground2": "#424242", - "neutralForeground2BrandHover": "#0078d4", - "neutralForeground2BrandPressed": "#106ebe", - "neutralForeground2BrandSelected": "#0078d4", - "neutralForeground2Hover": "#242424", - "neutralForeground2Pressed": "#242424", - "neutralForeground2Selected": "#242424", - "neutralForeground3": "#616161", - "neutralForeground3BrandHover": "#0078d4", - "neutralForeground3BrandPressed": "#106ebe", - "neutralForeground3BrandSelected": "#0078d4", - "neutralForeground3Hover": "#424242", - "neutralForeground3Pressed": "#424242", - "neutralForeground3Selected": "#424242", - "neutralForeground4": "#707070", - "neutralForegroundDisabled": "#bdbdbd", + "neutralForeground1Hover": undefined, + "neutralForeground1Pressed": undefined, + "neutralForeground1Selected": undefined, + "neutralForeground2": "#616161", + "neutralForeground2BrandHover": undefined, + "neutralForeground2BrandPressed": undefined, + "neutralForeground2BrandSelected": undefined, + "neutralForeground2Hover": undefined, + "neutralForeground2Pressed": undefined, + "neutralForeground2Selected": undefined, + "neutralForeground3": "#808080", + "neutralForeground3BrandHover": undefined, + "neutralForeground3BrandPressed": undefined, + "neutralForeground3BrandSelected": undefined, + "neutralForeground3Hover": undefined, + "neutralForeground3Pressed": undefined, + "neutralForeground3Selected": undefined, "neutralForegroundInverted": "#ffffff", - "neutralForegroundInvertedLink": "#ffffff", - "neutralForegroundInvertedLinkHover": "#ffffff", - "neutralForegroundInvertedLinkPressed": "#ffffff", - "neutralForegroundInvertedLinkSelected": "#ffffff", - "neutralForegroundOnBrand": "#ffffff", - "neutralForegroundOnBrandHover": "#ffffff", - "neutralForegroundOnBrandPressed": "#ffffff", - "neutralForegroundOnBrandSelected": "#ffffff", - "neutralStencil1": "#e6e6e6", - "neutralStencil2": "#fafafa", + "neutralStencil1": "#575757", + "neutralStencil2": "#333333", "neutralStroke1": "#d1d1d1", - "neutralStroke1Hover": "#c7c7c7", - "neutralStroke1Pressed": "#b3b3b3", - "neutralStroke1Selected": "#bdbdbd", + "neutralStroke1Hover": undefined, + "neutralStroke1Pressed": undefined, + "neutralStroke1Selected": undefined, "neutralStroke2": "#e0e0e0", - "neutralStroke3": "#f0f0f0", "neutralStrokeAccessible": "#616161", - "neutralStrokeAccessibleHover": "#575757", - "neutralStrokeAccessiblePressed": "#4d4d4d", - "neutralStrokeAccessibleSelected": "#0078d4", + "neutralStrokeAccessibleHover": undefined, + "neutralStrokeAccessiblePressed": undefined, + "neutralStrokeAccessibleSelected": undefined, "neutralStrokeDisabled": "#e0e0e0", "personaActivityGlow": "#0078d4", "personaActivityRing": "#ffffff", @@ -3948,31 +2674,9 @@ Object { "primaryButtonTextDisabled": "#d2d0ce", "primaryButtonTextHovered": "#ffffff", "primaryButtonTextPressed": "#ffffff", - "redBackground1": "#f9f0f2", - "redBackground2": "#d69ca5", - "redBackground3": "#750b1c", - "redBorder1": "#d69ca5", - "redBorder2": "#750b1c", - "redBorderActive": "#750b1c", - "redForeground1": "#690a19", - "redForeground2": "#d69ca5", - "redForeground3": "#750b1c", "smallInputBorder": "#605e5c", - "strokeFocus1": "#ffffff", - "strokeFocus2": "#000000", "subText": "#605e5c", - "subtleBackground": "transparent", - "subtleBackgroundHover": "#f5f5f5", - "subtleBackgroundPressed": "#e0e0e0", - "subtleBackgroundSelected": "#ebebeb", "successBackground": "rgba(95, 210, 85, .2)", - "transparentBackground": "transparent", - "transparentBackgroundHover": "transparent", - "transparentBackgroundPressed": "transparent", - "transparentBackgroundSelected": "transparent", - "transparentStroke": "transparent", - "transparentStrokeDisabled": "transparent", - "transparentStrokeInteractive": "transparent", "variantBorder": "#edebe9", "variantBorderHovered": "#a19f9d", "warningBackground": "rgba(255, 200, 10, .2)", @@ -4171,11 +2875,11 @@ Object { }, "sizes": Object { "body": 14, - "caption": 10, - "header": 20, - "hero": 28, - "heroLarge": 40, - "secondary": 12, + "caption": 12, + "header": 18, + "hero": 24, + "heroLarge": 60, + "secondary": 13, "subheader": 16, }, "variants": Object { @@ -4852,23 +3556,6 @@ Object { "bodyStandoutBackground": "#201f1e", "bodyText": "#f3f2f1", "bodyTextChecked": "#ffffff", - "brandBackground": "#106ebe", - "brandBackground2": "#004578", - "brandBackgroundDisabled": undefined, - "brandBackgroundHover": "#0078d4", - "brandBackgroundPressed": "#004578", - "brandBackgroundSelected": "#005a9e", - "brandBackgroundStatic": "#0078d4", - "brandForeground1": "#3aa0f3", - "brandForeground1Disabled": undefined, - "brandForeground1Pressed": undefined, - "brandForeground2": "#6cb8f6", - "brandForegroundLink": "#2899f5", - "brandForegroundLinkHover": "#6cb8f6", - "brandForegroundLinkPressed": "#3aa0f3", - "brandForegroundLinkSelected": "#2899f5", - "brandStroke1": "#2899f5", - "brandStroke2": "#004c87", "brandedBackground": "#2b88d8", "brandedBorder": "#deecf9", "brandedCheckedBackground": "#484644", @@ -4916,15 +3603,6 @@ Object { "checkboxBackgroundDisabled": "#252423", "checkboxBorderColor": "#979693", "checkmarkColor": "#1b1a19", - "compoundBrandBackground1": "#2899f5", - "compoundBrandBackground1Hover": "#3aa0f3", - "compoundBrandBackground1Pressed": "#0078d4", - "compoundBrandForeground1": "#2899f5", - "compoundBrandForeground1Hover": "#3aa0f3", - "compoundBrandForeground1Pressed": "#0078d4", - "compoundBrandStroke1": "#2899f5", - "compoundBrandStroke1Hover": "#3aa0f3", - "compoundBrandStroke1Pressed": "#0078d4", "defaultBackground": "#252423", "defaultBorder": "#979693", "defaultCheckedBackground": "#484644", @@ -5018,70 +3696,59 @@ Object { "menuItemBackgroundPressed": "#3b3a39", "menuItemText": "#f3f2f1", "menuItemTextHovered": "#faf9f8", - "neutralBackground1": "#292929", - "neutralBackground1Hover": "#3d3d3d", - "neutralBackground1Pressed": "#1f1f1f", - "neutralBackground1Selected": "#383838", - "neutralBackground2": "#1f1f1f", - "neutralBackground2Hover": "#333333", - "neutralBackground2Pressed": "#141414", - "neutralBackground2Selected": "#2e2e2e", - "neutralBackground3": "#141414", - "neutralBackground3Hover": "#292929", - "neutralBackground3Pressed": "#0a0a0a", - "neutralBackground3Selected": "#242424", - "neutralBackground4": "#0a0a0a", - "neutralBackground4Hover": "#1f1f1f", - "neutralBackground4Pressed": "#000000", - "neutralBackground4Selected": "#1a1a1a", - "neutralBackground5": "#000000", - "neutralBackground5Hover": "#141414", - "neutralBackground5Pressed": "#050505", - "neutralBackground5Selected": "#0f0f0f", - "neutralBackground6": "#333333", - "neutralBackgroundDisabled": "#141414", - "neutralBackgroundInverted": "#ffffff", + "neutralBackground1": "#ffffff", + "neutralBackground1Hover": undefined, + "neutralBackground1Pressed": "#e0e0e0", + "neutralBackground1Selected": "#ebebeb", + "neutralBackground2": "#ffffff", + "neutralBackground2Hover": undefined, + "neutralBackground2Pressed": "#e0e0e0", + "neutralBackground2Selected": "#ebebeb", + "neutralBackground3": "#ffffff", + "neutralBackground3Hover": undefined, + "neutralBackground3Pressed": "#e0e0e0", + "neutralBackground3Selected": "#ebebeb", + "neutralBackground4": "#fafafa", + "neutralBackground4Hover": undefined, + "neutralBackground4Pressed": "#dbdbdb", + "neutralBackground4Selected": "#e6e6e6", + "neutralBackground5": "#ebebeb", + "neutralBackground5Hover": undefined, + "neutralBackground5Pressed": "#d1d1d1", + "neutralBackground5Selected": "#dbdbdb", + "neutralBackground6": "#d1d1d1", + "neutralBackgroundDisabled": "#e0e0e0", + "neutralBackgroundInverted": "#242424", "neutralForeground1": "#ffffff", - "neutralForeground1Hover": "#ffffff", - "neutralForeground1Pressed": "#ffffff", - "neutralForeground1Selected": "#ffffff", + "neutralForeground1Hover": undefined, + "neutralForeground1Pressed": undefined, + "neutralForeground1Selected": undefined, "neutralForeground2": "#d6d6d6", - "neutralForeground2BrandHover": "#3aa0f3", - "neutralForeground2BrandPressed": "#2899f5", - "neutralForeground2BrandSelected": "#3aa0f3", - "neutralForeground2Hover": "#ffffff", - "neutralForeground2Pressed": "#ffffff", - "neutralForeground2Selected": "#ffffff", + "neutralForeground2BrandHover": undefined, + "neutralForeground2BrandPressed": undefined, + "neutralForeground2BrandSelected": undefined, + "neutralForeground2Hover": undefined, + "neutralForeground2Pressed": undefined, + "neutralForeground2Selected": undefined, "neutralForeground3": "#adadad", - "neutralForeground3BrandHover": "#3aa0f3", - "neutralForeground3BrandPressed": "#2899f5", - "neutralForeground3BrandSelected": "#3aa0f3", - "neutralForeground3Hover": "#d6d6d6", - "neutralForeground3Pressed": "#d6d6d6", - "neutralForeground3Selected": "#d6d6d6", - "neutralForeground4": "#999999", - "neutralForegroundDisabled": "#5c5c5c", - "neutralForegroundInverted": "#242424", - "neutralForegroundInvertedLink": "#ffffff", - "neutralForegroundInvertedLinkHover": "#ffffff", - "neutralForegroundInvertedLinkPressed": "#ffffff", - "neutralForegroundInvertedLinkSelected": "#ffffff", - "neutralForegroundOnBrand": "#ffffff", - "neutralForegroundOnBrandHover": "#ffffff", - "neutralForegroundOnBrandPressed": "#ffffff", - "neutralForegroundOnBrandSelected": "#ffffff", - "neutralStencil1": "#333333", - "neutralStencil2": "#575757", - "neutralStroke1": "#666666", - "neutralStroke1Hover": "#757575", - "neutralStroke1Pressed": "#6b6b6b", - "neutralStroke1Selected": "#707070", - "neutralStroke2": "#525252", - "neutralStroke3": "#3d3d3d", - "neutralStrokeAccessible": "#adadad", - "neutralStrokeAccessibleHover": "#bdbdbd", - "neutralStrokeAccessiblePressed": "#b3b3b3", - "neutralStrokeAccessibleSelected": "#3aa0f3", + "neutralForeground3BrandHover": undefined, + "neutralForeground3BrandPressed": undefined, + "neutralForeground3BrandSelected": undefined, + "neutralForeground3Hover": undefined, + "neutralForeground3Pressed": undefined, + "neutralForeground3Selected": undefined, + "neutralForegroundInverted": "#ffffff", + "neutralStencil1": "#e6e6e6", + "neutralStencil2": "#fafafa", + "neutralStroke1": "#525252", + "neutralStroke1Hover": undefined, + "neutralStroke1Pressed": undefined, + "neutralStroke1Selected": undefined, + "neutralStroke2": "#3d3d3d", + "neutralStrokeAccessible": "#9e9e9e", + "neutralStrokeAccessibleHover": undefined, + "neutralStrokeAccessiblePressed": undefined, + "neutralStrokeAccessibleSelected": undefined, "neutralStrokeDisabled": "#424242", "personaActivityGlow": "#2b88d8", "personaActivityRing": "#1b1a19", @@ -5095,31 +3762,9 @@ Object { "primaryButtonTextDisabled": "#3b3a39", "primaryButtonTextHovered": "#1b1a19", "primaryButtonTextPressed": "#1b1a19", - "redBackground1": "#230308", - "redBackground2": "#420610", - "redBackground3": "#750b1c", - "redBorder1": "#750b1c", - "redBorder2": "#962f3f", - "redBorderActive": "#ac4f5e", - "redForeground1": "#ac4f5e", - "redForeground2": "#420610", - "redForeground3": "#750b1c", "smallInputBorder": "#a19f9d", - "strokeFocus1": "#000000", - "strokeFocus2": "#ffffff", "subText": "#a19f9d", - "subtleBackground": "transparent", - "subtleBackgroundHover": "#383838", - "subtleBackgroundPressed": "#2e2e2e", - "subtleBackgroundSelected": "#333333", "successBackground": "rgba(186, 216, 10, .4)", - "transparentBackground": "transparent", - "transparentBackgroundHover": "transparent", - "transparentBackgroundPressed": "transparent", - "transparentBackgroundSelected": "transparent", - "transparentStroke": "transparent", - "transparentStrokeDisabled": "transparent", - "transparentStrokeInteractive": "transparent", "variantBorder": "#292827", "variantBorderHovered": "#797775", "warningBackground": "rgba(255, 251, 0, .6)", @@ -5318,11 +3963,11 @@ Object { }, "sizes": Object { "body": 14, - "caption": 10, - "header": 20, - "hero": 28, - "heroLarge": 40, - "secondary": 12, + "caption": 12, + "header": 18, + "hero": 24, + "heroLarge": 60, + "secondary": 13, "subheader": 16, }, "variants": Object { @@ -5480,23 +4125,6 @@ Object { "bodyStandoutBackground": "#faf9f8", "bodyText": "#323130", "bodyTextChecked": "#000000", - "brandBackground": "#0078d4", - "brandBackground2": "#eff6fc", - "brandBackgroundDisabled": undefined, - "brandBackgroundHover": "#106ebe", - "brandBackgroundPressed": "#004578", - "brandBackgroundSelected": "#005a9e", - "brandBackgroundStatic": "#0078d4", - "brandForeground1": "#0078d4", - "brandForeground1Disabled": undefined, - "brandForeground1Pressed": undefined, - "brandForeground2": "#106ebe", - "brandForegroundLink": "#106ebe", - "brandForegroundLinkHover": "#005a9e", - "brandForegroundLinkPressed": "#004578", - "brandForegroundLinkSelected": "#106ebe", - "brandStroke1": "#0078d4", - "brandStroke2": "#c7e0f4", "brandedBackground": "#0078d4", "brandedBorder": "#005a9e", "brandedCheckedBackground": "#c8c6c4", @@ -5544,15 +4172,6 @@ Object { "checkboxBackgroundDisabled": "#f3f2f1", "checkboxBorderColor": "#8a8886", "checkmarkColor": "#ffffff", - "compoundBrandBackground1": "#0078d4", - "compoundBrandBackground1Hover": "#106ebe", - "compoundBrandBackground1Pressed": "#005a9e", - "compoundBrandForeground1": "#0078d4", - "compoundBrandForeground1Hover": "#106ebe", - "compoundBrandForeground1Pressed": "#005a9e", - "compoundBrandStroke1": "#0078d4", - "compoundBrandStroke1Hover": "#106ebe", - "compoundBrandStroke1Pressed": "#005a9e", "defaultBackground": "#f3f2f1", "defaultBorder": "#8a8886", "defaultCheckedBackground": "#c8c6c4", @@ -5646,70 +4265,59 @@ Object { "menuItemBackgroundPressed": "#edebe9", "menuItemText": "#323130", "menuItemTextHovered": "#201f1e", - "neutralBackground1": "#ffffff", - "neutralBackground1Hover": "#f5f5f5", - "neutralBackground1Pressed": "#e0e0e0", - "neutralBackground1Selected": "#ebebeb", - "neutralBackground2": "#fafafa", - "neutralBackground2Hover": "#f0f0f0", - "neutralBackground2Pressed": "#dbdbdb", - "neutralBackground2Selected": "#e6e6e6", - "neutralBackground3": "#f5f5f5", - "neutralBackground3Hover": "#ebebeb", - "neutralBackground3Pressed": "#d6d6d6", - "neutralBackground3Selected": "#e0e0e0", - "neutralBackground4": "#f0f0f0", - "neutralBackground4Hover": "#fafafa", - "neutralBackground4Pressed": "#f5f5f5", - "neutralBackground4Selected": "#ffffff", - "neutralBackground5": "#ebebeb", - "neutralBackground5Hover": "#f5f5f5", - "neutralBackground5Pressed": "#f0f0f0", - "neutralBackground5Selected": "#fafafa", - "neutralBackground6": "#e6e6e6", - "neutralBackgroundDisabled": "#f0f0f0", - "neutralBackgroundInverted": "#616161", + "neutralBackground1": "#000000", + "neutralBackground1Hover": undefined, + "neutralBackground1Pressed": "#2e2e2e", + "neutralBackground1Selected": "#242424", + "neutralBackground2": "#1f1f1f", + "neutralBackground2Hover": undefined, + "neutralBackground2Pressed": "#4d4d4d", + "neutralBackground2Selected": "#424242", + "neutralBackground3": "#ffffff", + "neutralBackground3Hover": undefined, + "neutralBackground3Pressed": "#e0e0e0", + "neutralBackground3Selected": "#ebebeb", + "neutralBackground4": "#333333", + "neutralBackground4Hover": undefined, + "neutralBackground4Pressed": "#616161", + "neutralBackground4Selected": "#575757", + "neutralBackground5": "#3d3d3d", + "neutralBackground5Hover": undefined, + "neutralBackground5Pressed": "#6b6b6b", + "neutralBackground5Selected": "#616161", + "neutralBackground6": "#5c5c5c", + "neutralBackgroundDisabled": "#e0e0e0", + "neutralBackgroundInverted": "#575757", "neutralForeground1": "#242424", - "neutralForeground1Hover": "#242424", - "neutralForeground1Pressed": "#242424", - "neutralForeground1Selected": "#242424", - "neutralForeground2": "#424242", - "neutralForeground2BrandHover": "#0078d4", - "neutralForeground2BrandPressed": "#106ebe", - "neutralForeground2BrandSelected": "#0078d4", - "neutralForeground2Hover": "#242424", - "neutralForeground2Pressed": "#242424", - "neutralForeground2Selected": "#242424", - "neutralForeground3": "#616161", - "neutralForeground3BrandHover": "#0078d4", - "neutralForeground3BrandPressed": "#106ebe", - "neutralForeground3BrandSelected": "#0078d4", - "neutralForeground3Hover": "#424242", - "neutralForeground3Pressed": "#424242", - "neutralForeground3Selected": "#424242", - "neutralForeground4": "#707070", - "neutralForegroundDisabled": "#bdbdbd", + "neutralForeground1Hover": undefined, + "neutralForeground1Pressed": undefined, + "neutralForeground1Selected": undefined, + "neutralForeground2": "#616161", + "neutralForeground2BrandHover": undefined, + "neutralForeground2BrandPressed": undefined, + "neutralForeground2BrandSelected": undefined, + "neutralForeground2Hover": undefined, + "neutralForeground2Pressed": undefined, + "neutralForeground2Selected": undefined, + "neutralForeground3": "#808080", + "neutralForeground3BrandHover": undefined, + "neutralForeground3BrandPressed": undefined, + "neutralForeground3BrandSelected": undefined, + "neutralForeground3Hover": undefined, + "neutralForeground3Pressed": undefined, + "neutralForeground3Selected": undefined, "neutralForegroundInverted": "#ffffff", - "neutralForegroundInvertedLink": "#ffffff", - "neutralForegroundInvertedLinkHover": "#ffffff", - "neutralForegroundInvertedLinkPressed": "#ffffff", - "neutralForegroundInvertedLinkSelected": "#ffffff", - "neutralForegroundOnBrand": "#ffffff", - "neutralForegroundOnBrandHover": "#ffffff", - "neutralForegroundOnBrandPressed": "#ffffff", - "neutralForegroundOnBrandSelected": "#ffffff", - "neutralStencil1": "#e6e6e6", - "neutralStencil2": "#fafafa", + "neutralStencil1": "#575757", + "neutralStencil2": "#333333", "neutralStroke1": "#d1d1d1", - "neutralStroke1Hover": "#c7c7c7", - "neutralStroke1Pressed": "#b3b3b3", - "neutralStroke1Selected": "#bdbdbd", + "neutralStroke1Hover": undefined, + "neutralStroke1Pressed": undefined, + "neutralStroke1Selected": undefined, "neutralStroke2": "#e0e0e0", - "neutralStroke3": "#f0f0f0", "neutralStrokeAccessible": "#616161", - "neutralStrokeAccessibleHover": "#575757", - "neutralStrokeAccessiblePressed": "#4d4d4d", - "neutralStrokeAccessibleSelected": "#0078d4", + "neutralStrokeAccessibleHover": undefined, + "neutralStrokeAccessiblePressed": undefined, + "neutralStrokeAccessibleSelected": undefined, "neutralStrokeDisabled": "#e0e0e0", "personaActivityGlow": "#0078d4", "personaActivityRing": "#ffffff", @@ -5723,31 +4331,9 @@ Object { "primaryButtonTextDisabled": "#d2d0ce", "primaryButtonTextHovered": "#ffffff", "primaryButtonTextPressed": "#ffffff", - "redBackground1": "#f9f0f2", - "redBackground2": "#d69ca5", - "redBackground3": "#750b1c", - "redBorder1": "#d69ca5", - "redBorder2": "#750b1c", - "redBorderActive": "#750b1c", - "redForeground1": "#690a19", - "redForeground2": "#d69ca5", - "redForeground3": "#750b1c", "smallInputBorder": "#605e5c", - "strokeFocus1": "#ffffff", - "strokeFocus2": "#000000", "subText": "#605e5c", - "subtleBackground": "transparent", - "subtleBackgroundHover": "#f5f5f5", - "subtleBackgroundPressed": "#e0e0e0", - "subtleBackgroundSelected": "#ebebeb", "successBackground": "rgba(95, 210, 85, .2)", - "transparentBackground": "transparent", - "transparentBackgroundHover": "transparent", - "transparentBackgroundPressed": "transparent", - "transparentBackgroundSelected": "transparent", - "transparentStroke": "transparent", - "transparentStrokeDisabled": "transparent", - "transparentStrokeInteractive": "transparent", "variantBorder": "#edebe9", "variantBorderHovered": "#a19f9d", "warningBackground": "rgba(255, 200, 10, .2)", @@ -5946,11 +4532,11 @@ Object { }, "sizes": Object { "body": 14, - "caption": 10, - "header": 20, - "hero": 28, - "heroLarge": 40, - "secondary": 12, + "caption": 12, + "header": 18, + "hero": 24, + "heroLarge": 60, + "secondary": 13, "subheader": 16, }, "variants": Object { diff --git a/packages/theming/default-theme/src/createAliasTokens.ts b/packages/theming/default-theme/src/createAliasTokens.ts index 460635ce84..0ffefb93b2 100644 --- a/packages/theming/default-theme/src/createAliasTokens.ts +++ b/packages/theming/default-theme/src/createAliasTokens.ts @@ -1,4 +1,4 @@ -import { getAliasTokens, getShadowTokens } from './getTokens'; +import { getAliasTokens, getShadowTokens } from '@fluentui-react-native/theme-tokens'; import { AliasColorTokens, AppearanceOptions, ThemeShadowDefinition } from '@fluentui-react-native/theme-types'; import { memoize } from '@fluentui-react-native/memo-cache'; import { mapPipelineToShadow, mapPipelineToTheme } from '@fluentui-react-native/theming-utils'; diff --git a/packages/theming/theme-tokens/package.json b/packages/theming/theme-tokens/package.json index 5cd8476b2b..6d3e267c8a 100644 --- a/packages/theming/theme-tokens/package.json +++ b/packages/theming/theme-tokens/package.json @@ -31,9 +31,11 @@ "author": "", "license": "MIT", "dependencies": { - "@fluentui-react-native/design-tokens-android": "^0.13.0", + "@fluentui-react-native/design-tokens-android": "^0.17.0", "@fluentui-react-native/design-tokens-win32": "^0.13.0", - "@fluentui-react-native/design-tokens-windows": "^0.13.0" + "@fluentui-react-native/design-tokens-windows": "^0.13.0", + "@fluentui-react-native/theme-types": ">=0.18.0 <1.0.0", + "assert-never": "^1.2.1" }, "devDependencies": { "@fluentui-react-native/eslint-config-rules": "^0.1.1", diff --git a/packages/theming/theme-tokens/src/getShadowTokens.ts b/packages/theming/theme-tokens/src/getShadowTokens.ts new file mode 100644 index 0000000000..c291ed844c --- /dev/null +++ b/packages/theming/theme-tokens/src/getShadowTokens.ts @@ -0,0 +1,15 @@ +import lightShadowTokens from '@fluentui-react-native/design-tokens-windows/light/tokens-shadow.json'; +import darkShadowTokens from '@fluentui-react-native/design-tokens-windows/dark/tokens-shadow.json'; +import hcShadowTokens from '@fluentui-react-native/design-tokens-win32/hc/tokens-shadow.json'; +import { AppearanceOptions } from '@fluentui-react-native/theme-types'; + +export function getShadowTokens(mode: AppearanceOptions) { + if (mode === 'light') { + return lightShadowTokens.shadow; + } else if (mode === 'dark') { + return darkShadowTokens.shadow; + } + + // HC mode. + return hcShadowTokens.shadow; +} diff --git a/packages/theming/theme-tokens/src/getTokens.android.ts b/packages/theming/theme-tokens/src/getTokens.android.ts new file mode 100644 index 0000000000..20b06b717a --- /dev/null +++ b/packages/theming/theme-tokens/src/getTokens.android.ts @@ -0,0 +1,12 @@ +import lightAliasTokens from '@fluentui-react-native/design-tokens-android/light/tokens-aliases.json'; +import darkAliasTokens from '@fluentui-react-native/design-tokens-android/dark/tokens-aliases.json'; +import { AppearanceOptions } from '@fluentui-react-native/theme-types'; + +export function getAliasTokens(mode: AppearanceOptions) { + if (mode === 'light') { + return lightAliasTokens; + } else if (mode === 'dark') { + return darkAliasTokens; + } + return lightAliasTokens; +} diff --git a/packages/theming/default-theme/src/getTokens.ts b/packages/theming/theme-tokens/src/getTokens.ts similarity index 52% rename from packages/theming/default-theme/src/getTokens.ts rename to packages/theming/theme-tokens/src/getTokens.ts index bb1f5b9898..4ef01a8932 100644 --- a/packages/theming/default-theme/src/getTokens.ts +++ b/packages/theming/theme-tokens/src/getTokens.ts @@ -1,9 +1,6 @@ import lightAliasTokens from '@fluentui-react-native/design-tokens-windows/light/tokens-aliases.json'; import darkAliasTokens from '@fluentui-react-native/design-tokens-windows/dark/tokens-aliases.json'; import { hcAliasTokens } from './highContrast/tokens-alias'; -import lightShadowTokens from '@fluentui-react-native/design-tokens-windows/light/tokens-shadow.json'; -import darkShadowTokens from '@fluentui-react-native/design-tokens-windows/dark/tokens-shadow.json'; -import hcShadowTokens from '@fluentui-react-native/design-tokens-win32/hc/tokens-shadow.json'; import { AppearanceOptions } from '@fluentui-react-native/theme-types'; import { assertNever } from 'assert-never'; @@ -20,17 +17,3 @@ export function getAliasTokens(mode: AppearanceOptions) { return lightAliasTokens; } - -export function getShadowTokens(mode: AppearanceOptions) { - if (mode === 'light') { - return lightShadowTokens.shadow; - } else if (mode === 'dark') { - return darkShadowTokens.shadow; - } else if (mode === 'highContrast') { - return hcShadowTokens.shadow; - } else { - assertNever(mode); - } - - return lightAliasTokens; -} diff --git a/packages/theming/default-theme/src/highContrast/tokens-alias.ts b/packages/theming/theme-tokens/src/highContrast/tokens-alias.ts similarity index 100% rename from packages/theming/default-theme/src/highContrast/tokens-alias.ts rename to packages/theming/theme-tokens/src/highContrast/tokens-alias.ts diff --git a/packages/theming/default-theme/src/highContrast/tokens-alias.win32.ts b/packages/theming/theme-tokens/src/highContrast/tokens-alias.win32.ts similarity index 100% rename from packages/theming/default-theme/src/highContrast/tokens-alias.win32.ts rename to packages/theming/theme-tokens/src/highContrast/tokens-alias.win32.ts diff --git a/packages/theming/theme-tokens/src/index.ts b/packages/theming/theme-tokens/src/index.ts index e867e25aa2..6fe89d85e1 100644 --- a/packages/theming/theme-tokens/src/index.ts +++ b/packages/theming/theme-tokens/src/index.ts @@ -1 +1,3 @@ export { default as globalTokens } from './tokens-global'; +export { getAliasTokens } from './getTokens'; +export { getShadowTokens } from './getShadowTokens'; diff --git a/packages/theming/theme-types/src/Color.types.ts b/packages/theming/theme-types/src/Color.types.ts index 230fdc2df5..876d0f2356 100644 --- a/packages/theming/theme-types/src/Color.types.ts +++ b/packages/theming/theme-types/src/Color.types.ts @@ -469,30 +469,32 @@ export interface AliasColorTokens { neutralForeground3BrandHover: ColorValue; neutralForeground3BrandPressed: ColorValue; neutralForeground3BrandSelected: ColorValue; - neutralForeground4: ColorValue; - neutralForegroundDisabled: ColorValue; - - brandForegroundLink: ColorValue; - brandForegroundLinkHover: ColorValue; - brandForegroundLinkPressed: ColorValue; - brandForegroundLinkSelected: ColorValue; - compoundBrandForeground1: ColorValue; - compoundBrandForeground1Hover: ColorValue; - compoundBrandForeground1Pressed: ColorValue; - brandForeground1: ColorValue; - brandForeground1Disabled: ColorValue; - brandForeground1Pressed: ColorValue; - brandForeground2: ColorValue; + neutralForeground4?: ColorValue; + neutralForegroundDisabled?: ColorValue; + brandForegroundLink?: ColorValue; + brandForegroundLinkHover?: ColorValue; + brandForegroundLinkPressed?: ColorValue; + brandForegroundLinkSelected?: ColorValue; + compoundBrandForeground1?: ColorValue; + compoundBrandForeground1Hover?: ColorValue; + compoundBrandForeground1Pressed?: ColorValue; neutralForegroundInverted: ColorValue; - neutralForegroundOnBrand: ColorValue; - neutralForegroundOnBrandHover: ColorValue; - neutralForegroundOnBrandPressed: ColorValue; - neutralForegroundOnBrandSelected: ColorValue; - neutralForegroundInvertedLink: ColorValue; - neutralForegroundInvertedLinkHover: ColorValue; - neutralForegroundInvertedLinkPressed: ColorValue; - neutralForegroundInvertedLinkSelected: ColorValue; + + brandForeground1?: ColorValue; + brandForeground1Disabled?: ColorValue; + brandForeground1Pressed?: ColorValue; + brandForeground2?: ColorValue; + + neutralForegroundOnBrand?: ColorValue; + neutralForegroundOnBrandHover?: ColorValue; + neutralForegroundOnBrandPressed?: ColorValue; + neutralForegroundOnBrandSelected?: ColorValue; + + neutralForegroundInvertedLink?: ColorValue; + neutralForegroundInvertedLinkHover?: ColorValue; + neutralForegroundInvertedLinkPressed?: ColorValue; + neutralForegroundInvertedLinkSelected?: ColorValue; neutralBackground1: ColorValue; neutralBackground1Hover: ColorValue; @@ -517,33 +519,21 @@ export interface AliasColorTokens { neutralBackground6: ColorValue; neutralBackgroundInverted: ColorValue; - subtleBackground: ColorValue; - subtleBackgroundHover: ColorValue; - subtleBackgroundPressed: ColorValue; - subtleBackgroundSelected: ColorValue; + subtleBackground?: ColorValue; + subtleBackgroundHover?: ColorValue; + subtleBackgroundPressed?: ColorValue; + subtleBackgroundSelected?: ColorValue; - transparentBackground: ColorValue; - transparentBackgroundHover: ColorValue; - transparentBackgroundPressed: ColorValue; - transparentBackgroundSelected: ColorValue; + transparentBackground?: ColorValue; + transparentBackgroundHover?: ColorValue; + transparentBackgroundPressed?: ColorValue; + transparentBackgroundSelected?: ColorValue; neutralBackgroundDisabled: ColorValue; neutralStencil1: ColorValue; neutralStencil2: ColorValue; - brandBackground: ColorValue; - brandBackgroundHover: ColorValue; - brandBackgroundPressed: ColorValue; - brandBackgroundDisabled: ColorValue; - brandBackgroundSelected: ColorValue; - compoundBrandBackground1: ColorValue; - compoundBrandBackground1Hover: ColorValue; - compoundBrandBackground1Pressed: ColorValue; - - brandBackgroundStatic: ColorValue; - brandBackground2: ColorValue; - neutralStrokeAccessible: ColorValue; neutralStrokeAccessibleHover: ColorValue; neutralStrokeAccessiblePressed: ColorValue; @@ -553,30 +543,41 @@ export interface AliasColorTokens { neutralStroke1Pressed: ColorValue; neutralStroke1Selected: ColorValue; neutralStroke2: ColorValue; - neutralStroke3: ColorValue; - brandStroke1: ColorValue; - brandStroke2: ColorValue; - compoundBrandStroke1: ColorValue; - compoundBrandStroke1Hover: ColorValue; - compoundBrandStroke1Pressed: ColorValue; + neutralStroke3?: ColorValue; + neutralStrokeDisabled: ColorValue; - transparentStroke: ColorValue; - transparentStrokeInteractive: ColorValue; - transparentStrokeDisabled: ColorValue; + strokeFocus1?: ColorValue; + strokeFocus2?: ColorValue; - strokeFocus1: ColorValue; - strokeFocus2: ColorValue; + brandBackground?: ColorValue; + brandBackgroundHover?: ColorValue; + brandBackgroundPressed?: ColorValue; + brandBackgroundDisabled?: ColorValue; + brandBackgroundSelected?: ColorValue; + compoundBrandBackground1?: ColorValue; + compoundBrandBackground1Hover?: ColorValue; + compoundBrandBackground1Pressed?: ColorValue; + brandBackgroundStatic?: ColorValue; + brandBackground2?: ColorValue; + brandStroke1?: ColorValue; + brandStroke2?: ColorValue; - redBackground1: ColorValue; - redBackground2: ColorValue; - redBackground3: ColorValue; - redForeground1: ColorValue; - redForeground2: ColorValue; - redForeground3: ColorValue; - redBorderActive: ColorValue; - redBorder1: ColorValue; - redBorder2: ColorValue; + compoundBrandStroke1?: ColorValue; + compoundBrandStroke1Hover?: ColorValue; + compoundBrandStroke1Pressed?: ColorValue; + transparentStroke?: ColorValue; + transparentStrokeInteractive?: ColorValue; + transparentStrokeDisabled?: ColorValue; + redBackground1?: ColorValue; + redBackground2?: ColorValue; + redBackground3?: ColorValue; + redForeground1?: ColorValue; + redForeground2?: ColorValue; + redForeground3?: ColorValue; + redBorderActive?: ColorValue; + redBorder1?: ColorValue; + redBorder2?: ColorValue; } /** diff --git a/packages/theming/theming-utils/src/__tests__/__snapshots__/theming-utils.test.ts.snap b/packages/theming/theming-utils/src/__tests__/__snapshots__/theming-utils.test.ts.snap index cf400f1e78..a8c35d7aaf 100644 --- a/packages/theming/theming-utils/src/__tests__/__snapshots__/theming-utils.test.ts.snap +++ b/packages/theming/theming-utils/src/__tests__/__snapshots__/theming-utils.test.ts.snap @@ -731,32 +731,6 @@ Object { exports[`mapPipelineToTheme test darkAliasTokens 1`] = ` Object { - "brandBackground": "#106ebe", - "brandBackground2": "#004578", - "brandBackgroundDisabled": undefined, - "brandBackgroundHover": "#0078d4", - "brandBackgroundPressed": "#004578", - "brandBackgroundSelected": "#005a9e", - "brandBackgroundStatic": "#0078d4", - "brandForeground1": "#3aa0f3", - "brandForeground1Disabled": undefined, - "brandForeground1Pressed": undefined, - "brandForeground2": "#6cb8f6", - "brandForegroundLink": "#2899f5", - "brandForegroundLinkHover": "#6cb8f6", - "brandForegroundLinkPressed": "#3aa0f3", - "brandForegroundLinkSelected": "#2899f5", - "brandStroke1": "#2899f5", - "brandStroke2": "#004c87", - "compoundBrandBackground1": "#2899f5", - "compoundBrandBackground1Hover": "#3aa0f3", - "compoundBrandBackground1Pressed": "#0078d4", - "compoundBrandForeground1": "#2899f5", - "compoundBrandForeground1Hover": "#3aa0f3", - "compoundBrandForeground1Pressed": "#0078d4", - "compoundBrandStroke1": "#2899f5", - "compoundBrandStroke1Hover": "#3aa0f3", - "compoundBrandStroke1Pressed": "#0078d4", "neutralBackground1": "#292929", "neutralBackground1Hover": "#3d3d3d", "neutralBackground1Pressed": "#1f1f1f", @@ -798,17 +772,7 @@ Object { "neutralForeground3Hover": "#d6d6d6", "neutralForeground3Pressed": "#d6d6d6", "neutralForeground3Selected": "#d6d6d6", - "neutralForeground4": "#999999", - "neutralForegroundDisabled": "#5c5c5c", "neutralForegroundInverted": "#242424", - "neutralForegroundInvertedLink": "#ffffff", - "neutralForegroundInvertedLinkHover": "#ffffff", - "neutralForegroundInvertedLinkPressed": "#ffffff", - "neutralForegroundInvertedLinkSelected": "#ffffff", - "neutralForegroundOnBrand": "#ffffff", - "neutralForegroundOnBrandHover": "#ffffff", - "neutralForegroundOnBrandPressed": "#ffffff", - "neutralForegroundOnBrandSelected": "#ffffff", "neutralStencil1": "#333333", "neutralStencil2": "#575757", "neutralStroke1": "#666666", @@ -816,65 +780,16 @@ Object { "neutralStroke1Pressed": "#6b6b6b", "neutralStroke1Selected": "#707070", "neutralStroke2": "#525252", - "neutralStroke3": "#3d3d3d", "neutralStrokeAccessible": "#adadad", "neutralStrokeAccessibleHover": "#bdbdbd", "neutralStrokeAccessiblePressed": "#b3b3b3", "neutralStrokeAccessibleSelected": "#3aa0f3", "neutralStrokeDisabled": "#424242", - "redBackground1": "#230308", - "redBackground2": "#420610", - "redBackground3": "#750b1c", - "redBorder1": "#750b1c", - "redBorder2": "#962f3f", - "redBorderActive": "#ac4f5e", - "redForeground1": "#ac4f5e", - "redForeground2": "#420610", - "redForeground3": "#750b1c", - "strokeFocus1": "#000000", - "strokeFocus2": "#ffffff", - "subtleBackground": "transparent", - "subtleBackgroundHover": "#383838", - "subtleBackgroundPressed": "#2e2e2e", - "subtleBackgroundSelected": "#333333", - "transparentBackground": "transparent", - "transparentBackgroundHover": "transparent", - "transparentBackgroundPressed": "transparent", - "transparentBackgroundSelected": "transparent", - "transparentStroke": "transparent", - "transparentStrokeDisabled": "transparent", - "transparentStrokeInteractive": "transparent", } `; exports[`mapPipelineToTheme test lightAliasTokens 1`] = ` Object { - "brandBackground": "#0078d4", - "brandBackground2": "#eff6fc", - "brandBackgroundDisabled": undefined, - "brandBackgroundHover": "#106ebe", - "brandBackgroundPressed": "#004578", - "brandBackgroundSelected": "#005a9e", - "brandBackgroundStatic": "#0078d4", - "brandForeground1": "#0078d4", - "brandForeground1Disabled": undefined, - "brandForeground1Pressed": undefined, - "brandForeground2": "#106ebe", - "brandForegroundLink": "#106ebe", - "brandForegroundLinkHover": "#005a9e", - "brandForegroundLinkPressed": "#004578", - "brandForegroundLinkSelected": "#106ebe", - "brandStroke1": "#0078d4", - "brandStroke2": "#c7e0f4", - "compoundBrandBackground1": "#0078d4", - "compoundBrandBackground1Hover": "#106ebe", - "compoundBrandBackground1Pressed": "#005a9e", - "compoundBrandForeground1": "#0078d4", - "compoundBrandForeground1Hover": "#106ebe", - "compoundBrandForeground1Pressed": "#005a9e", - "compoundBrandStroke1": "#0078d4", - "compoundBrandStroke1Hover": "#106ebe", - "compoundBrandStroke1Pressed": "#005a9e", "neutralBackground1": "#ffffff", "neutralBackground1Hover": "#f5f5f5", "neutralBackground1Pressed": "#e0e0e0", @@ -916,17 +831,7 @@ Object { "neutralForeground3Hover": "#424242", "neutralForeground3Pressed": "#424242", "neutralForeground3Selected": "#424242", - "neutralForeground4": "#707070", - "neutralForegroundDisabled": "#bdbdbd", "neutralForegroundInverted": "#ffffff", - "neutralForegroundInvertedLink": "#ffffff", - "neutralForegroundInvertedLinkHover": "#ffffff", - "neutralForegroundInvertedLinkPressed": "#ffffff", - "neutralForegroundInvertedLinkSelected": "#ffffff", - "neutralForegroundOnBrand": "#ffffff", - "neutralForegroundOnBrandHover": "#ffffff", - "neutralForegroundOnBrandPressed": "#ffffff", - "neutralForegroundOnBrandSelected": "#ffffff", "neutralStencil1": "#e6e6e6", "neutralStencil2": "#fafafa", "neutralStroke1": "#d1d1d1", @@ -934,33 +839,10 @@ Object { "neutralStroke1Pressed": "#b3b3b3", "neutralStroke1Selected": "#bdbdbd", "neutralStroke2": "#e0e0e0", - "neutralStroke3": "#f0f0f0", "neutralStrokeAccessible": "#616161", "neutralStrokeAccessibleHover": "#575757", "neutralStrokeAccessiblePressed": "#4d4d4d", "neutralStrokeAccessibleSelected": "#0078d4", "neutralStrokeDisabled": "#e0e0e0", - "redBackground1": "#f9f0f2", - "redBackground2": "#d69ca5", - "redBackground3": "#750b1c", - "redBorder1": "#d69ca5", - "redBorder2": "#750b1c", - "redBorderActive": "#750b1c", - "redForeground1": "#690a19", - "redForeground2": "#d69ca5", - "redForeground3": "#750b1c", - "strokeFocus1": "#ffffff", - "strokeFocus2": "#000000", - "subtleBackground": "transparent", - "subtleBackgroundHover": "#f5f5f5", - "subtleBackgroundPressed": "#e0e0e0", - "subtleBackgroundSelected": "#ebebeb", - "transparentBackground": "transparent", - "transparentBackgroundHover": "transparent", - "transparentBackgroundPressed": "transparent", - "transparentBackgroundSelected": "transparent", - "transparentStroke": "transparent", - "transparentStrokeDisabled": "transparent", - "transparentStrokeInteractive": "transparent", } `; diff --git a/packages/theming/theming-utils/src/mapPipelineToTheme.android.ts b/packages/theming/theming-utils/src/mapPipelineToTheme.android.ts new file mode 100644 index 0000000000..7d96584aa0 --- /dev/null +++ b/packages/theming/theming-utils/src/mapPipelineToTheme.android.ts @@ -0,0 +1,94 @@ +import { AliasColorTokens, Variants } from '@fluentui-react-native/theme-types'; + +// API that translates tokens coming for android to Theme color values. +// This is implemented in a per-plaform fashion, for each endpoint that maps to similar token sets in design - i.e. map to similar +// pipeline output. +export function mapPipelineToTheme(pipelineOutput: any): AliasColorTokens { + return { + neutralForeground1: pipelineOutput.neutralForeground1.fillColorRest, + neutralForeground1Hover: pipelineOutput.neutralForeground1.fillColorHover, + neutralForeground1Pressed: pipelineOutput.neutralForeground1.fillColorPressed, + neutralForeground1Selected: pipelineOutput.neutralForeground1.fillColorSelected, + neutralForeground2: pipelineOutput.neutralForeground2.fillColorRest, + neutralForeground2Hover: pipelineOutput.neutralForeground2.fillColorHover, + neutralForeground2Pressed: pipelineOutput.neutralForeground2.fillColorPressed, + neutralForeground2Selected: pipelineOutput.neutralForeground2.fillColorSelected, + neutralForeground2BrandHover: pipelineOutput.neutralForeground2.fillColorBrandHover, + neutralForeground2BrandPressed: pipelineOutput.neutralForeground2.fillColorBrandPressed, + neutralForeground2BrandSelected: pipelineOutput.neutralForeground2.fillColorBrandSelected, + neutralForeground3: pipelineOutput.neutralForeground3.fillColorRest, + neutralForeground3Hover: pipelineOutput.neutralForeground3.fillColorHover, + neutralForeground3Pressed: pipelineOutput.neutralForeground3.fillColorPressed, + neutralForeground3Selected: pipelineOutput.neutralForeground3.fillColorSelected, + neutralForeground3BrandHover: pipelineOutput.neutralForeground3.fillColorBrandHover, + neutralForeground3BrandPressed: pipelineOutput.neutralForeground3.fillColorBrandPressed, + neutralForeground3BrandSelected: pipelineOutput.neutralForeground3.fillColorBrandSelected, + neutralForegroundInverted: pipelineOutput.neutralForegroundInverted.fillColorRest, + + neutralBackground1: pipelineOutput.neutralBackground1.fillColorRest, + neutralBackground1Hover: pipelineOutput.neutralBackground1.fillColorHover, + neutralBackground1Pressed: pipelineOutput.neutralBackground1.fillColorPressed, + neutralBackground1Selected: pipelineOutput.neutralBackground1.fillColorSelected, + neutralBackground2: pipelineOutput.neutralBackground2.fillColorRest, + neutralBackground2Hover: pipelineOutput.neutralBackground2.fillColorHover, + neutralBackground2Pressed: pipelineOutput.neutralBackground2.fillColorPressed, + neutralBackground2Selected: pipelineOutput.neutralBackground2.fillColorSelected, + + neutralBackground3: pipelineOutput.neutralBackground3.fillColorRest, + neutralBackground3Hover: pipelineOutput.neutralBackground3.fillColorHover, + neutralBackground3Pressed: pipelineOutput.neutralBackground3.fillColorPressed, + neutralBackground3Selected: pipelineOutput.neutralBackground3.fillColorSelected, + + neutralBackground4: pipelineOutput.neutralBackground4.fillColorRest, + neutralBackground4Hover: pipelineOutput.neutralBackground4.fillColorHover, + neutralBackground4Pressed: pipelineOutput.neutralBackground4.fillColorPressed, + neutralBackground4Selected: pipelineOutput.neutralBackground4.fillColorSelected, + + neutralBackground5: pipelineOutput.neutralBackground5.fillColorRest, + neutralBackground5Hover: pipelineOutput.neutralBackground5.fillColorHover, + neutralBackground5Pressed: pipelineOutput.neutralBackground5.fillColorPressed, + neutralBackground5Selected: pipelineOutput.neutralBackground5.fillColorSelected, + + neutralBackground6: pipelineOutput.neutralBackground6.fillColorRest, + neutralBackgroundInverted: pipelineOutput.neutralBackgroundInverted.fillColorRest, + neutralBackgroundDisabled: pipelineOutput.neutralBackgroundDisabled.fillColorRest, + + neutralStencil1: pipelineOutput.neutralStencil1.fillColorRest, + neutralStencil2: pipelineOutput.neutralStencil2.fillColorRest, + + neutralStrokeAccessible: pipelineOutput.neutralStrokeAccessible.strokeColorRest, + neutralStrokeAccessibleHover: pipelineOutput.neutralStrokeAccessible.strokeColorHover, + neutralStrokeAccessiblePressed: pipelineOutput.neutralStrokeAccessible.strokeColorPressed, + neutralStrokeAccessibleSelected: pipelineOutput.neutralStrokeAccessible.strokeColorSelected, + + neutralStroke1: pipelineOutput.neutralStroke1.strokeColorRest, + neutralStroke1Hover: pipelineOutput.neutralStroke1.strokeColorHover, + neutralStroke1Pressed: pipelineOutput.neutralStroke1.strokeColorPressed, + neutralStroke1Selected: pipelineOutput.neutralStroke1.strokeColorSelected, + + neutralStroke2: pipelineOutput.neutralStroke2.strokeColorRest, + neutralStrokeDisabled: pipelineOutput.neutralStrokeDisabled.strokeColorRest, + }; +} + +export function mapFontPipelineToTheme(pipelineOutput: any): Partial { + return { + caption1: createVariantValue(pipelineOutput.caption1), + body1: createVariantValue(pipelineOutput.body1), + body1Strong: createVariantValue(pipelineOutput.body1Strong), + body2: createVariantValue(pipelineOutput.body2), + body2Strong: createVariantValue(pipelineOutput.body2Strong), + subtitle1: createVariantValue(pipelineOutput.subtitle1), + subtitle1Strong: createVariantValue(pipelineOutput.subtitle1Strong), + subtitle2: createVariantValue(pipelineOutput.subtitle2), + subtitle2Strong: createVariantValue(pipelineOutput.subtitle2Strong), + title1: createVariantValue(pipelineOutput.title1), + title1Strong: createVariantValue(pipelineOutput.title1Strong), + largeTitle: createVariantValue(pipelineOutput.largeTitle), + display: createVariantValue(pipelineOutput.display), + }; +} + +function createVariantValue(variant: any) { + return { face: 'primary', size: variant.fontSize, weight: variant.fontWeight }; +} diff --git a/packages/theming/win32-theme/src/__tests__/__snapshots__/win32-theme.test.ts.snap b/packages/theming/win32-theme/src/__tests__/__snapshots__/win32-theme.test.ts.snap index 2b3ec7c8c1..3ab31ffc18 100644 --- a/packages/theming/win32-theme/src/__tests__/__snapshots__/win32-theme.test.ts.snap +++ b/packages/theming/win32-theme/src/__tests__/__snapshots__/win32-theme.test.ts.snap @@ -222,32 +222,6 @@ Object { exports[`createOfficeColorAliasTokens test officeTheme: Black 1`] = ` Object { - "brandBackground": "#185abd", - "brandBackground2": "#d2e0f4", - "brandBackgroundDisabled": undefined, - "brandBackgroundHover": "#1651aa", - "brandBackgroundPressed": "#0e336a", - "brandBackgroundSelected": "#13458f", - "brandBackgroundStatic": "#185abd", - "brandForeground1": "#aec6eb", - "brandForeground1Disabled": undefined, - "brandForeground1Pressed": undefined, - "brandForeground2": "#d2e0f4", - "brandForegroundLink": "#aec6eb", - "brandForegroundLinkHover": "#d2e0f4", - "brandForegroundLinkPressed": "#2e6ac5", - "brandForegroundLinkSelected": "#d2e0f4", - "brandStroke1": "#185abd", - "brandStroke2": "#6794d7", - "compoundBrandBackground1": "#185abd", - "compoundBrandBackground1Hover": "#1651aa", - "compoundBrandBackground1Pressed": "#0e336a", - "compoundBrandForeground1": "#aec6eb", - "compoundBrandForeground1Hover": "#d2e0f4", - "compoundBrandForeground1Pressed": "#2e6ac5", - "compoundBrandStroke1": "#185abd", - "compoundBrandStroke1Hover": "#1651aa", - "compoundBrandStroke1Pressed": "#0e336a", "neutralBackground1": "#292929", "neutralBackground1Hover": "#3d3d3d", "neutralBackground1Pressed": "#1f1f1f", @@ -289,17 +263,7 @@ Object { "neutralForeground3Hover": "#d6d6d6", "neutralForeground3Pressed": "#d6d6d6", "neutralForeground3Selected": "#d6d6d6", - "neutralForeground4": "#999999", - "neutralForegroundDisabled": "#5c5c5c", "neutralForegroundInverted": "#000000", - "neutralForegroundInvertedLink": "#292929", - "neutralForegroundInvertedLinkHover": "#292929", - "neutralForegroundInvertedLinkPressed": "#292929", - "neutralForegroundInvertedLinkSelected": "#292929", - "neutralForegroundOnBrand": "#ffffff", - "neutralForegroundOnBrandHover": "#ffffff", - "neutralForegroundOnBrandPressed": "#ffffff", - "neutralForegroundOnBrandSelected": "#ffffff", "neutralStencil1": "#333333", "neutralStencil2": "#575757", "neutralStroke1": "#666666", @@ -307,65 +271,16 @@ Object { "neutralStroke1Pressed": "#6b6b6b", "neutralStroke1Selected": "#707070", "neutralStroke2": "#525252", - "neutralStroke3": "#3d3d3d", "neutralStrokeAccessible": "#adadad", "neutralStrokeAccessibleHover": "#bdbdbd", "neutralStrokeAccessiblePressed": "#b3b3b3", "neutralStrokeAccessibleSelected": "#185abd", "neutralStrokeDisabled": "#424242", - "redBackground1": "#230308", - "redBackground2": "#420610", - "redBackground3": "#750b1c", - "redBorder1": "#750b1c", - "redBorder2": "#962f3f", - "redBorderActive": "#ac4f5e", - "redForeground1": "#ac4f5e", - "redForeground2": "#420610", - "redForeground3": "#750b1c", - "strokeFocus1": "#000000", - "strokeFocus2": "#ffffff", - "subtleBackground": "transparent", - "subtleBackgroundHover": "#3d3d3d", - "subtleBackgroundPressed": "#1f1f1f", - "subtleBackgroundSelected": "#383838", - "transparentBackground": "transparent", - "transparentBackgroundHover": "transparent", - "transparentBackgroundPressed": "transparent", - "transparentBackgroundSelected": "transparent", - "transparentStroke": "transparent", - "transparentStrokeDisabled": "transparent", - "transparentStrokeInteractive": "transparent", } `; exports[`createOfficeColorAliasTokens test officeTheme: Colorful 1`] = ` Object { - "brandBackground": "#185abd", - "brandBackground2": "#d2e0f4", - "brandBackgroundDisabled": undefined, - "brandBackgroundHover": "#1651aa", - "brandBackgroundPressed": "#0e336a", - "brandBackgroundSelected": "#13458f", - "brandBackgroundStatic": "#185abd", - "brandForeground1": "#185abd", - "brandForeground1Disabled": undefined, - "brandForeground1Pressed": undefined, - "brandForeground2": "#1651aa", - "brandForegroundLink": "#185abd", - "brandForegroundLinkHover": "#1651aa", - "brandForegroundLinkPressed": "#0e336a", - "brandForegroundLinkSelected": "#13458f", - "brandStroke1": "#185abd", - "brandStroke2": "#6794d7", - "compoundBrandBackground1": "#185abd", - "compoundBrandBackground1Hover": "#1651aa", - "compoundBrandBackground1Pressed": "#0e336a", - "compoundBrandForeground1": "#185abd", - "compoundBrandForeground1Hover": "#1651aa", - "compoundBrandForeground1Pressed": "#0e336a", - "compoundBrandStroke1": "#185abd", - "compoundBrandStroke1Hover": "#1651aa", - "compoundBrandStroke1Pressed": "#0e336a", "neutralBackground1": "#ffffff", "neutralBackground1Hover": "#f5f5f5", "neutralBackground1Pressed": "#e0e0e0", @@ -407,17 +322,7 @@ Object { "neutralForeground3Hover": "#424242", "neutralForeground3Pressed": "#424242", "neutralForeground3Selected": "#424242", - "neutralForeground4": "#707070", - "neutralForegroundDisabled": "#bdbdbd", "neutralForegroundInverted": "#ffffff", - "neutralForegroundInvertedLink": "#ffffff", - "neutralForegroundInvertedLinkHover": "#ffffff", - "neutralForegroundInvertedLinkPressed": "#ffffff", - "neutralForegroundInvertedLinkSelected": "#ffffff", - "neutralForegroundOnBrand": "#ffffff", - "neutralForegroundOnBrandHover": "#ffffff", - "neutralForegroundOnBrandPressed": "#ffffff", - "neutralForegroundOnBrandSelected": "#ffffff", "neutralStencil1": "#e6e6e6", "neutralStencil2": "#fafafa", "neutralStroke1": "#d1d1d1", @@ -425,65 +330,16 @@ Object { "neutralStroke1Pressed": "#b3b3b3", "neutralStroke1Selected": "#bdbdbd", "neutralStroke2": "#e0e0e0", - "neutralStroke3": "#f0f0f0", "neutralStrokeAccessible": "#616161", "neutralStrokeAccessibleHover": "#575757", "neutralStrokeAccessiblePressed": "#4d4d4d", "neutralStrokeAccessibleSelected": "#185abd", "neutralStrokeDisabled": "#e0e0e0", - "redBackground1": "#f9f0f2", - "redBackground2": "#d69ca5", - "redBackground3": "#750b1c", - "redBorder1": "#d69ca5", - "redBorder2": "#750b1c", - "redBorderActive": "#750b1c", - "redForeground1": "#690a19", - "redForeground2": "#d69ca5", - "redForeground3": "#750b1c", - "strokeFocus1": "#ffffff", - "strokeFocus2": "#000000", - "subtleBackground": "transparent", - "subtleBackgroundHover": "#f5f5f5", - "subtleBackgroundPressed": "#e0e0e0", - "subtleBackgroundSelected": "#ebebeb", - "transparentBackground": "transparent", - "transparentBackgroundHover": "transparent", - "transparentBackgroundPressed": "transparent", - "transparentBackgroundSelected": "transparent", - "transparentStroke": "transparent", - "transparentStrokeDisabled": "transparent", - "transparentStrokeInteractive": "transparent", } `; exports[`createOfficeColorAliasTokens test officeTheme: DarkGray 1`] = ` Object { - "brandBackground": "#185abd", - "brandBackground2": "#d2e0f4", - "brandBackgroundDisabled": undefined, - "brandBackgroundHover": "#1651aa", - "brandBackgroundPressed": "#0e336a", - "brandBackgroundSelected": "#13458f", - "brandBackgroundStatic": "#185abd", - "brandForeground1": "#aec6eb", - "brandForeground1Disabled": undefined, - "brandForeground1Pressed": undefined, - "brandForeground2": "#d2e0f4", - "brandForegroundLink": "#aec6eb", - "brandForegroundLinkHover": "#d2e0f4", - "brandForegroundLinkPressed": "#2e6ac5", - "brandForegroundLinkSelected": "#d2e0f4", - "brandStroke1": "#185abd", - "brandStroke2": "#6794d7", - "compoundBrandBackground1": "#185abd", - "compoundBrandBackground1Hover": "#1651aa", - "compoundBrandBackground1Pressed": "#0e336a", - "compoundBrandForeground1": "#aec6eb", - "compoundBrandForeground1Hover": "#d2e0f4", - "compoundBrandForeground1Pressed": "#2e6ac5", - "compoundBrandStroke1": "#185abd", - "compoundBrandStroke1Hover": "#1651aa", - "compoundBrandStroke1Pressed": "#0e336a", "neutralBackground1": "#4d4d4d", "neutralBackground1Hover": "#5c5c5c", "neutralBackground1Pressed": "#424242", @@ -525,17 +381,7 @@ Object { "neutralForeground3Hover": "#e6e6e6", "neutralForeground3Pressed": "#e6e6e6", "neutralForeground3Selected": "#e6e6e6", - "neutralForeground4": "#c2c2c2", - "neutralForegroundDisabled": "#666666", "neutralForegroundInverted": "#000000", - "neutralForegroundInvertedLink": "#4d4d4d", - "neutralForegroundInvertedLinkHover": "#4d4d4d", - "neutralForegroundInvertedLinkPressed": "#4d4d4d", - "neutralForegroundInvertedLinkSelected": "#4d4d4d", - "neutralForegroundOnBrand": "#ffffff", - "neutralForegroundOnBrandHover": "#ffffff", - "neutralForegroundOnBrandPressed": "#ffffff", - "neutralForegroundOnBrandSelected": "#ffffff", "neutralStencil1": "#1a1a1a", "neutralStencil2": "#424242", "neutralStroke1": "#8a8a8a", @@ -543,562 +389,276 @@ Object { "neutralStroke1Pressed": "#8f8f8f", "neutralStroke1Selected": "#949494", "neutralStroke2": "#757575", - "neutralStroke3": "#616161", "neutralStrokeAccessible": "#a8a8a8", "neutralStrokeAccessibleHover": "#b8b8b8", "neutralStrokeAccessiblePressed": "#adadad", "neutralStrokeAccessibleSelected": "#185abd", "neutralStrokeDisabled": "#474747", - "redBackground1": "#230308", - "redBackground2": "#420610", - "redBackground3": "#750b1c", - "redBorder1": "#750b1c", - "redBorder2": "#962f3f", - "redBorderActive": "#ac4f5e", - "redForeground1": "#ac4f5e", - "redForeground2": "#420610", - "redForeground3": "#750b1c", - "strokeFocus1": "#000000", - "strokeFocus2": "#ffffff", - "subtleBackground": "transparent", - "subtleBackgroundHover": "#5c5c5c", - "subtleBackgroundPressed": "#424242", - "subtleBackgroundSelected": "#575757", - "transparentBackground": "transparent", - "transparentBackgroundHover": "transparent", - "transparentBackgroundPressed": "transparent", - "transparentBackgroundSelected": "transparent", - "transparentStroke": "transparent", - "transparentStrokeDisabled": "transparent", - "transparentStrokeInteractive": "transparent", } `; exports[`createOfficeColorAliasTokens test officeTheme: HighContrast 1`] = ` Object { - "brandBackground": Object { - "resource_paths": Array [ - "SystemColorButtonFaceColor", - ], - }, - "brandBackground2": Object { - "resource_paths": Array [ - "SystemColorButtonFaceColor", - ], - }, - "brandBackgroundDisabled": undefined, - "brandBackgroundHover": Object { - "resource_paths": Array [ - "SystemColorHighlightColor", - ], - }, - "brandBackgroundPressed": Object { - "resource_paths": Array [ - "SystemColorHighlightColor", - ], - }, - "brandBackgroundSelected": Object { - "resource_paths": Array [ - "SystemColorHighlightColor", - ], - }, - "brandBackgroundStatic": Object { - "resource_paths": Array [ - "SystemColorWindowColor", - ], - }, - "brandForeground1": Object { - "resource_paths": Array [ - "SystemColorWindowTextColor", - ], - }, - "brandForeground1Disabled": undefined, - "brandForeground1Pressed": undefined, - "brandForeground2": Object { - "resource_paths": Array [ - "SystemColorButtonTextColor", - ], - }, - "brandForegroundLink": Object { - "resource_paths": Array [ - "SystemColorHotlightColor", - ], - }, - "brandForegroundLinkHover": Object { - "resource_paths": Array [ - "SystemColorHotlightColor", - ], - }, - "brandForegroundLinkPressed": Object { - "resource_paths": Array [ - "SystemColorHotlightColor", - ], - }, - "brandForegroundLinkSelected": Object { - "resource_paths": Array [ - "SystemColorHotlightColor", - ], - }, - "brandStroke1": Object { - "resource_paths": Array [ - "SystemColorWindowTextColor", - ], - }, - "brandStroke2": Object { - "resource_paths": Array [ - "SystemColorWindowColor", - ], - }, - "compoundBrandBackground1": Object { - "resource_paths": Array [ - "SystemColorHighlightColor", - ], - }, - "compoundBrandBackground1Hover": Object { - "resource_paths": Array [ - "SystemColorHighlightColor", - ], - }, - "compoundBrandBackground1Pressed": Object { - "resource_paths": Array [ - "SystemColorHighlightColor", - ], - }, - "compoundBrandForeground1": Object { - "resource_paths": Array [ - "SystemColorHighlightColor", - ], - }, - "compoundBrandForeground1Hover": Object { - "resource_paths": Array [ - "SystemColorHighlightColor", - ], - }, - "compoundBrandForeground1Pressed": Object { - "resource_paths": Array [ - "SystemColorHighlightColor", - ], - }, - "compoundBrandStroke1": Object { - "resource_paths": Array [ - "SystemColorWindowColor", - ], - }, - "compoundBrandStroke1Hover": Object { - "resource_paths": Array [ - "SystemColorHighlightColor", - ], - }, - "compoundBrandStroke1Pressed": Object { - "resource_paths": Array [ - "SystemColorHighlightColor", - ], - }, "neutralBackground1": Object { "resource_paths": Array [ - "SystemColorWindowColor", + "Window", ], }, "neutralBackground1Hover": Object { "resource_paths": Array [ - "SystemColorHighlightColor", + "Highlight", ], }, "neutralBackground1Pressed": Object { "resource_paths": Array [ - "SystemColorHighlightColor", + "Highlight", ], }, "neutralBackground1Selected": Object { "resource_paths": Array [ - "SystemColorHighlightColor", + "Highlight", ], }, "neutralBackground2": Object { "resource_paths": Array [ - "SystemColorWindowColor", + "Window", ], }, "neutralBackground2Hover": Object { "resource_paths": Array [ - "SystemColorHighlightColor", + "Highlight", ], }, "neutralBackground2Pressed": Object { "resource_paths": Array [ - "SystemColorHighlightColor", + "Highlight", ], }, "neutralBackground2Selected": Object { "resource_paths": Array [ - "SystemColorHighlightColor", + "Highlight", ], }, "neutralBackground3": Object { "resource_paths": Array [ - "SystemColorWindowColor", + "Window", ], }, "neutralBackground3Hover": Object { "resource_paths": Array [ - "SystemColorHighlightColor", + "Highlight", ], }, "neutralBackground3Pressed": Object { "resource_paths": Array [ - "SystemColorHighlightColor", + "Highlight", ], }, "neutralBackground3Selected": Object { "resource_paths": Array [ - "SystemColorHighlightColor", + "Highlight", ], }, "neutralBackground4": Object { "resource_paths": Array [ - "SystemColorWindowColor", + "Window", ], }, "neutralBackground4Hover": Object { "resource_paths": Array [ - "SystemColorHighlightColor", + "Highlight", ], }, "neutralBackground4Pressed": Object { "resource_paths": Array [ - "SystemColorHighlightColor", + "Highlight", ], }, "neutralBackground4Selected": Object { "resource_paths": Array [ - "SystemColorHighlightColor", + "Highlight", ], }, "neutralBackground5": Object { "resource_paths": Array [ - "SystemColorWindowColor", + "Window", ], }, "neutralBackground5Hover": Object { "resource_paths": Array [ - "SystemColorHighlightColor", + "Highlight", ], }, "neutralBackground5Pressed": Object { "resource_paths": Array [ - "SystemColorHighlightColor", + "Highlight", ], }, "neutralBackground5Selected": Object { "resource_paths": Array [ - "SystemColorHighlightColor", + "Highlight", ], }, "neutralBackground6": Object { "resource_paths": Array [ - "SystemColorWindowColor", + "Window", ], }, "neutralBackgroundDisabled": Object { "resource_paths": Array [ - "SystemColorWindowColor", + "Window", ], }, "neutralBackgroundInverted": Object { "resource_paths": Array [ - "SystemColorWindowTextColor", + "WindowText", ], }, "neutralForeground1": Object { "resource_paths": Array [ - "SystemColorWindowTextColor", + "WindowText", ], }, "neutralForeground1Hover": Object { "resource_paths": Array [ - "SystemColorHighlightTextColor", + "HighlightText", ], }, "neutralForeground1Pressed": Object { "resource_paths": Array [ - "SystemColorHighlightTextColor", + "HighlightText", ], }, "neutralForeground1Selected": Object { "resource_paths": Array [ - "SystemColorHighlightTextColor", + "HighlightText", ], }, "neutralForeground2": Object { "resource_paths": Array [ - "SystemColorWindowTextColor", + "WindowText", ], }, "neutralForeground2BrandHover": Object { "resource_paths": Array [ - "SystemColorHighlightTextColor", + "HighlightText", ], }, "neutralForeground2BrandPressed": Object { "resource_paths": Array [ - "SystemColorHighlightTextColor", + "HighlightText", ], }, "neutralForeground2BrandSelected": Object { "resource_paths": Array [ - "SystemColorHighlightTextColor", + "HighlightText", ], }, "neutralForeground2Hover": Object { "resource_paths": Array [ - "SystemColorHighlightTextColor", + "HighlightText", ], }, "neutralForeground2Pressed": Object { "resource_paths": Array [ - "SystemColorHighlightTextColor", + "HighlightText", ], }, "neutralForeground2Selected": Object { "resource_paths": Array [ - "SystemColorHighlightTextColor", + "HighlightText", ], }, "neutralForeground3": Object { "resource_paths": Array [ - "SystemColorWindowTextColor", + "WindowText", ], }, "neutralForeground3BrandHover": Object { "resource_paths": Array [ - "SystemColorHighlightTextColor", + "HighlightText", ], }, "neutralForeground3BrandPressed": Object { "resource_paths": Array [ - "SystemColorHighlightTextColor", + "HighlightText", ], }, "neutralForeground3BrandSelected": Object { "resource_paths": Array [ - "SystemColorHighlightTextColor", + "HighlightText", ], }, "neutralForeground3Hover": Object { "resource_paths": Array [ - "SystemColorHighlightTextColor", + "HighlightText", ], }, "neutralForeground3Pressed": Object { "resource_paths": Array [ - "SystemColorHighlightTextColor", + "HighlightText", ], }, "neutralForeground3Selected": Object { "resource_paths": Array [ - "SystemColorHighlightTextColor", - ], - }, - "neutralForeground4": Object { - "resource_paths": Array [ - "SystemColorWindowTextColor", - ], - }, - "neutralForegroundDisabled": Object { - "resource_paths": Array [ - "SystemColorGrayTextColor", + "HighlightText", ], }, "neutralForegroundInverted": Object { "resource_paths": Array [ - "SystemColorWindowColor", - ], - }, - "neutralForegroundInvertedLink": Object { - "resource_paths": Array [ - "SystemColorHotlightColor", - ], - }, - "neutralForegroundInvertedLinkHover": Object { - "resource_paths": Array [ - "SystemColorHotlightColor", - ], - }, - "neutralForegroundInvertedLinkPressed": Object { - "resource_paths": Array [ - "SystemColorHotlightColor", - ], - }, - "neutralForegroundInvertedLinkSelected": Object { - "resource_paths": Array [ - "SystemColorHotlightColor", - ], - }, - "neutralForegroundOnBrand": Object { - "resource_paths": Array [ - "SystemColorButtonTextColor", - ], - }, - "neutralForegroundOnBrandHover": Object { - "resource_paths": Array [ - "SystemColorHighlightTextColor", - ], - }, - "neutralForegroundOnBrandPressed": Object { - "resource_paths": Array [ - "SystemColorHighlightTextColor", - ], - }, - "neutralForegroundOnBrandSelected": Object { - "resource_paths": Array [ - "SystemColorHighlightTextColor", + "Window", ], }, "neutralStencil1": "#141414", "neutralStencil2": "#858585", "neutralStroke1": Object { "resource_paths": Array [ - "SystemColorWindowTextColor", + "WindowText", ], }, "neutralStroke1Hover": Object { "resource_paths": Array [ - "SystemColorHighlightColor", + "Highlight", ], }, "neutralStroke1Pressed": Object { "resource_paths": Array [ - "SystemColorHighlightColor", + "Highlight", ], }, "neutralStroke1Selected": Object { "resource_paths": Array [ - "SystemColorHighlightColor", + "Highlight", ], }, "neutralStroke2": Object { "resource_paths": Array [ - "SystemColorWindowTextColor", - ], - }, - "neutralStroke3": Object { - "resource_paths": Array [ - "SystemColorWindowTextColor", + "WindowText", ], }, "neutralStrokeAccessible": Object { "resource_paths": Array [ - "SystemColorWindowTextColor", + "WindowText", ], }, "neutralStrokeAccessibleHover": Object { "resource_paths": Array [ - "SystemColorHighlightColor", + "Highlight", ], }, "neutralStrokeAccessiblePressed": Object { "resource_paths": Array [ - "SystemColorHighlightColor", + "Highlight", ], }, "neutralStrokeAccessibleSelected": Object { "resource_paths": Array [ - "SystemColorHighlightColor", + "Highlight", ], }, "neutralStrokeDisabled": Object { "resource_paths": Array [ - "SystemColorGrayTextColor", - ], - }, - "redBackground1": Object { - "resource_paths": Array [ - "SystemColorButtonFaceColor", - ], - }, - "redBackground2": Object { - "resource_paths": Array [ - "SystemColorWindowColor", - ], - }, - "redBackground3": Object { - "resource_paths": Array [ - "SystemColorButtonFaceColor", - ], - }, - "redBorder1": Object { - "resource_paths": Array [ - "SystemColorWindowTextColor", - ], - }, - "redBorder2": Object { - "resource_paths": Array [ - "SystemColorWindowTextColor", - ], - }, - "redBorderActive": Object { - "resource_paths": Array [ - "SystemColorHighlightColor", - ], - }, - "redForeground1": Object { - "resource_paths": Array [ - "SystemColorButtonTextColor", - ], - }, - "redForeground2": Object { - "resource_paths": Array [ - "SystemColorWindowColor", - ], - }, - "redForeground3": Object { - "resource_paths": Array [ - "SystemColorButtonFaceColor", - ], - }, - "strokeFocus1": Object { - "resource_paths": Array [ - "SystemColorWindowColor", - ], - }, - "strokeFocus2": Object { - "resource_paths": Array [ - "SystemColorHighlightColor", - ], - }, - "subtleBackground": "transparent", - "subtleBackgroundHover": Object { - "resource_paths": Array [ - "SystemColorHighlightColor", - ], - }, - "subtleBackgroundPressed": Object { - "resource_paths": Array [ - "SystemColorHighlightColor", - ], - }, - "subtleBackgroundSelected": Object { - "resource_paths": Array [ - "SystemColorHighlightColor", - ], - }, - "transparentBackground": "transparent", - "transparentBackgroundHover": "transparent", - "transparentBackgroundPressed": "transparent", - "transparentBackgroundSelected": "transparent", - "transparentStroke": Object { - "resource_paths": Array [ - "SystemColorWindowTextColor", - ], - }, - "transparentStrokeDisabled": Object { - "resource_paths": Array [ - "SystemColorGrayTextColor", - ], - }, - "transparentStrokeInteractive": Object { - "resource_paths": Array [ - "SystemColorHighlightColor", + "GrayText", ], }, } @@ -1106,32 +666,6 @@ Object { exports[`createOfficeColorAliasTokens test officeTheme: White 1`] = ` Object { - "brandBackground": "#185abd", - "brandBackground2": "#d2e0f4", - "brandBackgroundDisabled": undefined, - "brandBackgroundHover": "#1651aa", - "brandBackgroundPressed": "#0e336a", - "brandBackgroundSelected": "#13458f", - "brandBackgroundStatic": "#185abd", - "brandForeground1": "#185abd", - "brandForeground1Disabled": undefined, - "brandForeground1Pressed": undefined, - "brandForeground2": "#1651aa", - "brandForegroundLink": "#185abd", - "brandForegroundLinkHover": "#1651aa", - "brandForegroundLinkPressed": "#0e336a", - "brandForegroundLinkSelected": "#13458f", - "brandStroke1": "#185abd", - "brandStroke2": "#6794d7", - "compoundBrandBackground1": "#185abd", - "compoundBrandBackground1Hover": "#1651aa", - "compoundBrandBackground1Pressed": "#0e336a", - "compoundBrandForeground1": "#185abd", - "compoundBrandForeground1Hover": "#1651aa", - "compoundBrandForeground1Pressed": "#0e336a", - "compoundBrandStroke1": "#185abd", - "compoundBrandStroke1Hover": "#1651aa", - "compoundBrandStroke1Pressed": "#0e336a", "neutralBackground1": "#ffffff", "neutralBackground1Hover": "#f5f5f5", "neutralBackground1Pressed": "#e0e0e0", @@ -1173,17 +707,7 @@ Object { "neutralForeground3Hover": "#424242", "neutralForeground3Pressed": "#424242", "neutralForeground3Selected": "#424242", - "neutralForeground4": "#707070", - "neutralForegroundDisabled": "#bdbdbd", "neutralForegroundInverted": "#ffffff", - "neutralForegroundInvertedLink": "#ffffff", - "neutralForegroundInvertedLinkHover": "#ffffff", - "neutralForegroundInvertedLinkPressed": "#ffffff", - "neutralForegroundInvertedLinkSelected": "#ffffff", - "neutralForegroundOnBrand": "#ffffff", - "neutralForegroundOnBrandHover": "#ffffff", - "neutralForegroundOnBrandPressed": "#ffffff", - "neutralForegroundOnBrandSelected": "#ffffff", "neutralStencil1": "#e6e6e6", "neutralStencil2": "#fafafa", "neutralStroke1": "#d1d1d1", @@ -1191,34 +715,11 @@ Object { "neutralStroke1Pressed": "#b3b3b3", "neutralStroke1Selected": "#bdbdbd", "neutralStroke2": "#e0e0e0", - "neutralStroke3": "#f0f0f0", "neutralStrokeAccessible": "#616161", "neutralStrokeAccessibleHover": "#575757", "neutralStrokeAccessiblePressed": "#4d4d4d", "neutralStrokeAccessibleSelected": "#185abd", "neutralStrokeDisabled": "#e0e0e0", - "redBackground1": "#f9f0f2", - "redBackground2": "#d69ca5", - "redBackground3": "#750b1c", - "redBorder1": "#d69ca5", - "redBorder2": "#750b1c", - "redBorderActive": "#750b1c", - "redForeground1": "#690a19", - "redForeground2": "#d69ca5", - "redForeground3": "#750b1c", - "strokeFocus1": "#ffffff", - "strokeFocus2": "#000000", - "subtleBackground": "transparent", - "subtleBackgroundHover": "#f5f5f5", - "subtleBackgroundPressed": "#e0e0e0", - "subtleBackgroundSelected": "#ebebeb", - "transparentBackground": "transparent", - "transparentBackgroundHover": "transparent", - "transparentBackgroundPressed": "transparent", - "transparentBackgroundSelected": "transparent", - "transparentStroke": "transparent", - "transparentStrokeDisabled": "transparent", - "transparentStrokeInteractive": "transparent", } `; @@ -2271,21 +1772,18 @@ Object { "neutralBackground1Selected": "#C6C6C6", "neutralBackground2": "#E6E6E6", "neutralBackground2Hover": "#F3F3F3", - "neutralBackground2Pressed": "#dbdbdb", - "neutralBackground2Selected": "#e6e6e6", + "neutralBackground2Pressed": "#4d4d4d", + "neutralBackground2Selected": "#424242", "neutralBackground3": "#F3F3F3", - "neutralBackground3Hover": "#ebebeb", - "neutralBackground3Pressed": "#d6d6d6", - "neutralBackground3Selected": "#e0e0e0", - "neutralBackground4": "#f0f0f0", - "neutralBackground4Hover": "#fafafa", - "neutralBackground4Pressed": "#f5f5f5", - "neutralBackground4Selected": "#ffffff", - "neutralBackground5": "#ebebeb", - "neutralBackground5Hover": "#f5f5f5", - "neutralBackground5Pressed": "#f0f0f0", - "neutralBackground5Selected": "#fafafa", - "neutralBackground6": "#e6e6e6", + "neutralBackground3Pressed": "#e0e0e0", + "neutralBackground3Selected": "#ebebeb", + "neutralBackground4": "#333333", + "neutralBackground4Pressed": "#616161", + "neutralBackground4Selected": "#575757", + "neutralBackground5": "#3d3d3d", + "neutralBackground5Pressed": "#6b6b6b", + "neutralBackground5Selected": "#616161", + "neutralBackground6": "#5c5c5c", "neutralBackgroundDisabled": "#E6E6E6", "neutralBackgroundInverted": "#737373", "neutralForeground1": "#262626", @@ -2299,32 +1797,25 @@ Object { "neutralForeground2Hover": "#505050", "neutralForeground2Pressed": "#666666", "neutralForeground2Selected": "#666666", - "neutralForeground3": "#616161", + "neutralForeground3": "#808080", "neutralForeground3BrandHover": "#eff6fc", "neutralForeground3BrandPressed": "#2b88d8", "neutralForeground3BrandSelected": "#eff6fc", - "neutralForeground3Hover": "#424242", - "neutralForeground3Pressed": "#424242", - "neutralForeground3Selected": "#424242", "neutralForeground4": "#666666", "neutralForegroundDisabled": "#B1B1B1", "neutralForegroundInverted": "#262626", "neutralForegroundInvertedLink": "#FFFFFF", "neutralForegroundInvertedLinkHover": "#D2D2D2", "neutralForegroundInvertedLinkPressed": "#B1B1B1", - "neutralForegroundInvertedLinkSelected": "#ffffff", "neutralForegroundOnBrand": "#FFFFFF", "neutralForegroundOnBrandHover": "#FFFFFF", "neutralForegroundOnBrandPressed": "#FFFFFF", - "neutralForegroundOnBrandSelected": "#ffffff", "neutralStencil1": "#262626", - "neutralStencil2": "#fafafa", + "neutralStencil2": "#333333", "neutralStroke1": "#969696", "neutralStroke1Hover": "#969696", "neutralStroke1Pressed": "#00000000", - "neutralStroke1Selected": "#bdbdbd", "neutralStroke2": "#262626", - "neutralStroke3": "#f0f0f0", "neutralStrokeAccessible": "#969696", "neutralStrokeAccessibleHover": "#B1B1B1", "neutralStrokeAccessiblePressed": "#737373", @@ -2342,31 +1833,10 @@ Object { "primaryButtonTextDisabled": "#B1B1B1", "primaryButtonTextHovered": "#FFFFFF", "primaryButtonTextPressed": "#FFFFFF", - "redBackground1": "#f9f0f2", - "redBackground2": "#d69ca5", - "redBackground3": "#750b1c", - "redBorder1": "#d69ca5", - "redBorder2": "#750b1c", - "redBorderActive": "#750b1c", - "redForeground1": "#690a19", - "redForeground2": "#d69ca5", - "redForeground3": "#750b1c", "smallInputBorder": "#C6C6C6", - "strokeFocus1": "#ffffff", "strokeFocus2": "#969696", "subText": "#666666", - "subtleBackground": "transparent", - "subtleBackgroundHover": "#f5f5f5", - "subtleBackgroundPressed": "#e0e0e0", - "subtleBackgroundSelected": "#ebebeb", "successBackground": "#D83B01", - "transparentBackground": "transparent", - "transparentBackgroundHover": "transparent", - "transparentBackgroundPressed": "transparent", - "transparentBackgroundSelected": "transparent", - "transparentStroke": "transparent", - "transparentStrokeDisabled": "transparent", - "transparentStrokeInteractive": "transparent", "variantBorder": "#000000", "variantBorderHovered": "#000000", "warningBackground": "antiquewhite", @@ -2721,11 +2191,11 @@ Object { }, "sizes": Object { "body": 14, - "caption": 10, - "header": 20, - "hero": 28, - "heroLarge": 40, - "secondary": 12, + "caption": 12, + "header": 18, + "hero": 24, + "heroLarge": 60, + "secondary": 13, "subheader": 16, }, "variants": Object { diff --git a/yarn.lock b/yarn.lock index 2af4918bf4..527981eafa 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1437,10 +1437,10 @@ minimatch "^3.1.2" strip-json-comments "^3.1.1" -"@fluentui-react-native/design-tokens-android@^0.13.0": - version "0.13.0" - resolved "https://registry.yarnpkg.com/@fluentui-react-native/design-tokens-android/-/design-tokens-android-0.13.0.tgz#f473d1f3eefdf720715c627b7816a2b41ba35627" - integrity sha512-bkWBgViYMpJ712+wd82+RIvHcU1ox5TGxV4O46FnJLI9LW7sd+HVP70yW7fd1Kuhkx/MTmI9K3YEG/Aw4JnyOA== +"@fluentui-react-native/design-tokens-android@^0.17.0": + version "0.17.0" + resolved "https://registry.yarnpkg.com/@fluentui-react-native/design-tokens-android/-/design-tokens-android-0.17.0.tgz#55ed03b2639907f26103c5e9eb5eec46086a310e" + integrity sha512-PPwXUuuKJ7eM5AEp16ceLM/CHfUi0Ltq9gDU5TZ9X6P0vW/B1IkLk6eFgtoiFdSmbQT+EoO5s3v2EUwhJ0z1ew== "@fluentui-react-native/design-tokens-ios@^0.19.0": version "0.19.0"