Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Delete colors pass 5 #3339

Merged
merged 6 commits into from
Jan 4, 2024
Merged

Delete colors pass 5 #3339

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9443e34
Remove brandedPressed* (except secondary text)
rurikoaraki Jan 3, 2024
eb119d8
Remove brandedDiabled* except Border
rurikoaraki Jan 4, 2024
2b52da7
Remove brandedChecked*
rurikoaraki Jan 4, 2024
b185795
Remove defaultDisabledSecondaryContent
rurikoaraki Jan 4, 2024
29ee311
Update tests
rurikoaraki Jan 4, 2024
71553fc
Change files
rurikoaraki Jan 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions apps/fluent-tester/src/theme/applyBrand.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,8 +154,6 @@ export const applyBrand = (parent: Theme, currentBrand: string): PartialTheme =>
defaultPressedBackground: ramp.App2,
defaultPressedBorder: ramp.App5,
brandedBackground: ramp.App6,
brandedPressedBackground: ramp.App8,
brandedPressedBorder: ramp.App7,
defaultCheckedHoveredBackground: ramp.App1,
...getCurrentBrandAliasTokens(parent.name, ramp.AppPrimary),
},
Expand Down
7 changes: 7 additions & 0 deletions change/@fluentui-react-native-android-theme-ae45e2d8-9a4a-44f9-a66e-48fb52c63585.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "minor",
"comment": " Remove unused colors",
"packageName": "@fluentui-react-native/android-theme",
"email": "ruaraki@microsoft.com",
"dependentChangeType": "patch"
}
7 changes: 7 additions & 0 deletions change/@fluentui-react-native-apple-theme-2b16aafb-ac09-4ef3-bc32-0e3b8ed677d3.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "minor",
"comment": " Remove unused colors",
"packageName": "@fluentui-react-native/apple-theme",
"email": "ruaraki@microsoft.com",
"dependentChangeType": "patch"
}
7 changes: 7 additions & 0 deletions change/@fluentui-react-native-default-theme-d9d4ce2d-fd2f-47eb-988d-721c444755c4.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "minor",
"comment": " Remove unused colors",
"packageName": "@fluentui-react-native/default-theme",
"email": "ruaraki@microsoft.com",
"dependentChangeType": "patch"
}
7 changes: 7 additions & 0 deletions change/@fluentui-react-native-tester-ae01632e-3076-41c9-8ea6-6e6035f127e0.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "minor",
"comment": "Remove unused colors",
"packageName": "@fluentui-react-native/tester",
"email": "ruaraki@microsoft.com",
"dependentChangeType": "patch"
}
7 changes: 7 additions & 0 deletions change/@fluentui-react-native-theme-types-f444d10a-766e-4323-be7d-ede70bbb98df.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "minor",
"comment": " Remove unused colors",
"packageName": "@fluentui-react-native/theme-types",
"email": "ruaraki@microsoft.com",
"dependentChangeType": "patch"
}
7 changes: 7 additions & 0 deletions change/@fluentui-react-native-win32-theme-a212d105-1c4f-461d-a086-d431ce85679e.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "minor",
"comment": " Remove unused colors",
"packageName": "@fluentui-react-native/win32-theme",
"email": "ruaraki@microsoft.com",
"dependentChangeType": "patch"
}
84 changes: 0 additions & 84 deletions packages/theming/android-theme/src/__tests__/__snapshots__/android-theme.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,20 +33,9 @@ exports[`createAndroidTheme test option { appearance: 'dark', defaultAppearance:
"brandStroke1Pressed": "#96c6fa",
"brandStroke1Selected": "#77b7f7",
"brandedBackground": "#0086F0",
"brandedCheckedBackground": "#0078D4",
"brandedCheckedContent": "#FFFFFF",
"brandedCheckedHoveredBackground": "#0078D4",
"brandedCheckedHoveredContent": "#FFFFFF",
"brandedDisabledBackground": "#E1E1E1",
"brandedDisabledBorder": "transparent",
"brandedDisabledContent": "#404040",
"brandedDisabledIcon": "#404040",
"brandedFocusedSecondaryContent": "#6E6E6E",
"brandedHoveredSecondaryContent": "#6E6E6E",
"brandedPressedBackground": "#0078D4",
"brandedPressedBorder": "transparent",
"brandedPressedContent": "#FFFFFF",
"brandedPressedIcon": "#FFFFFF",
"brandedPressedSecondaryContent": "#6E6E6E",
"brandedSecondaryContent": "#6E6E6E",
"buttonBackground": "#0086F0",
Expand Down Expand Up @@ -81,7 +70,6 @@ exports[`createAndroidTheme test option { appearance: 'dark', defaultAppearance:
"defaultDisabledBorder": "transparent",
"defaultDisabledContent": "#004C87",
"defaultDisabledIcon": "#004C87",
"defaultDisabledSecondaryContent": "#919191",
"defaultHoveredSecondaryContent": "#6E6E6E",
"defaultIcon": "#6E6E6E",
"defaultPressedBackground": "#004C87",
Expand Down Expand Up @@ -644,20 +632,9 @@ exports[`createAndroidTheme test option { appearance: 'darkElevated', defaultApp
"brandStroke1Pressed": "#96c6fa",
"brandStroke1Selected": "#77b7f7",
"brandedBackground": "#0086F0",
"brandedCheckedBackground": "#0078D4",
"brandedCheckedContent": "#FFFFFF",
"brandedCheckedHoveredBackground": "#0078D4",
"brandedCheckedHoveredContent": "#FFFFFF",
"brandedDisabledBackground": "#E1E1E1",
"brandedDisabledBorder": "transparent",
"brandedDisabledContent": "#404040",
"brandedDisabledIcon": "#404040",
"brandedFocusedSecondaryContent": "#6E6E6E",
"brandedHoveredSecondaryContent": "#6E6E6E",
"brandedPressedBackground": "#0078D4",
"brandedPressedBorder": "transparent",
"brandedPressedContent": "#FFFFFF",
"brandedPressedIcon": "#FFFFFF",
"brandedPressedSecondaryContent": "#6E6E6E",
"brandedSecondaryContent": "#6E6E6E",
"buttonBackground": "#0086F0",
Expand Down Expand Up @@ -692,7 +669,6 @@ exports[`createAndroidTheme test option { appearance: 'darkElevated', defaultApp
"defaultDisabledBorder": "transparent",
"defaultDisabledContent": "#004C87",
"defaultDisabledIcon": "#004C87",
"defaultDisabledSecondaryContent": "#919191",
"defaultHoveredSecondaryContent": "#6E6E6E",
"defaultIcon": "#6E6E6E",
"defaultPressedBackground": "#004C87",
Expand Down Expand Up @@ -1255,20 +1231,9 @@ exports[`createAndroidTheme test option { appearance: 'dynamic', defaultAppearan
"brandStroke1Pressed": "#96c6fa",
"brandStroke1Selected": "#77b7f7",
"brandedBackground": "#0086F0",
"brandedCheckedBackground": "#0078D4",
"brandedCheckedContent": "#FFFFFF",
"brandedCheckedHoveredBackground": "#0078D4",
"brandedCheckedHoveredContent": "#FFFFFF",
"brandedDisabledBackground": "#E1E1E1",
"brandedDisabledBorder": "transparent",
"brandedDisabledContent": "#404040",
"brandedDisabledIcon": "#404040",
"brandedFocusedSecondaryContent": "#6E6E6E",
"brandedHoveredSecondaryContent": "#6E6E6E",
"brandedPressedBackground": "#0078D4",
"brandedPressedBorder": "transparent",
"brandedPressedContent": "#FFFFFF",
"brandedPressedIcon": "#FFFFFF",
"brandedPressedSecondaryContent": "#6E6E6E",
"brandedSecondaryContent": "#6E6E6E",
"buttonBackground": "#0086F0",
Expand Down Expand Up @@ -1303,7 +1268,6 @@ exports[`createAndroidTheme test option { appearance: 'dynamic', defaultAppearan
"defaultDisabledBorder": "transparent",
"defaultDisabledContent": "#004C87",
"defaultDisabledIcon": "#004C87",
"defaultDisabledSecondaryContent": "#919191",
"defaultHoveredSecondaryContent": "#6E6E6E",
"defaultIcon": "#6E6E6E",
"defaultPressedBackground": "#004C87",
Expand Down Expand Up @@ -1866,20 +1830,9 @@ exports[`createAndroidTheme test option { appearance: 'highContrast', defaultApp
"brandStroke1Pressed": "#96c6fa",
"brandStroke1Selected": "#77b7f7",
"brandedBackground": "#0086F0",
"brandedCheckedBackground": "#0078D4",
"brandedCheckedContent": "#FFFFFF",
"brandedCheckedHoveredBackground": "#0078D4",
"brandedCheckedHoveredContent": "#FFFFFF",
"brandedDisabledBackground": "#E1E1E1",
"brandedDisabledBorder": "transparent",
"brandedDisabledContent": "#404040",
"brandedDisabledIcon": "#404040",
"brandedFocusedSecondaryContent": "#6E6E6E",
"brandedHoveredSecondaryContent": "#6E6E6E",
"brandedPressedBackground": "#0078D4",
"brandedPressedBorder": "transparent",
"brandedPressedContent": "#FFFFFF",
"brandedPressedIcon": "#FFFFFF",
"brandedPressedSecondaryContent": "#6E6E6E",
"brandedSecondaryContent": "#6E6E6E",
"buttonBackground": "#0086F0",
Expand Down Expand Up @@ -1914,7 +1867,6 @@ exports[`createAndroidTheme test option { appearance: 'highContrast', defaultApp
"defaultDisabledBorder": "transparent",
"defaultDisabledContent": "#004C87",
"defaultDisabledIcon": "#004C87",
"defaultDisabledSecondaryContent": "#919191",
"defaultHoveredSecondaryContent": "#6E6E6E",
"defaultIcon": "#6E6E6E",
"defaultPressedBackground": "#004C87",
Expand Down Expand Up @@ -2477,20 +2429,9 @@ exports[`createAndroidTheme test option { appearance: 'light', defaultAppearance
"brandStroke1Pressed": "#0e4775",
"brandStroke1Selected": "#0f548c",
"brandedBackground": "#0078D4",
"brandedCheckedBackground": "#2B88D8",
"brandedCheckedContent": "#212121",
"brandedCheckedHoveredBackground": "#2B88D8",
"brandedCheckedHoveredContent": "#212121",
"brandedDisabledBackground": "#E1E1E1",
"brandedDisabledBorder": "transparent",
"brandedDisabledContent": "#ACACAC",
"brandedDisabledIcon": "#ACACAC",
"brandedFocusedSecondaryContent": "#919191",
"brandedHoveredSecondaryContent": "#919191",
"brandedPressedBackground": "#2B88D8",
"brandedPressedBorder": "transparent",
"brandedPressedContent": "#212121",
"brandedPressedIcon": "#212121",
"brandedPressedSecondaryContent": "#919191",
"brandedSecondaryContent": "#919191",
"buttonBackground": "#0078D4",
Expand Down Expand Up @@ -2525,7 +2466,6 @@ exports[`createAndroidTheme test option { appearance: 'light', defaultAppearance
"defaultDisabledBorder": "transparent",
"defaultDisabledContent": "#ACACAC",
"defaultDisabledIcon": "#ACACAC",
"defaultDisabledSecondaryContent": "#6E6E6E",
"defaultHoveredSecondaryContent": "#919191",
"defaultIcon": "#919191",
"defaultPressedBackground": "#005A9E",
Expand Down Expand Up @@ -3088,20 +3028,9 @@ exports[`getAndroidTheme dark appearance test 1`] = `
"brandStroke1Pressed": "#96c6fa",
"brandStroke1Selected": "#77b7f7",
"brandedBackground": "#0086F0",
"brandedCheckedBackground": "#0078D4",
"brandedCheckedContent": "#FFFFFF",
"brandedCheckedHoveredBackground": "#0078D4",
"brandedCheckedHoveredContent": "#FFFFFF",
"brandedDisabledBackground": "#E1E1E1",
"brandedDisabledBorder": "transparent",
"brandedDisabledContent": "#404040",
"brandedDisabledIcon": "#404040",
"brandedFocusedSecondaryContent": "#6E6E6E",
"brandedHoveredSecondaryContent": "#6E6E6E",
"brandedPressedBackground": "#0078D4",
"brandedPressedBorder": "transparent",
"brandedPressedContent": "#FFFFFF",
"brandedPressedIcon": "#FFFFFF",
"brandedPressedSecondaryContent": "#6E6E6E",
"brandedSecondaryContent": "#6E6E6E",
"buttonBackground": "#0086F0",
Expand Down Expand Up @@ -3136,7 +3065,6 @@ exports[`getAndroidTheme dark appearance test 1`] = `
"defaultDisabledBorder": "transparent",
"defaultDisabledContent": "#004C87",
"defaultDisabledIcon": "#004C87",
"defaultDisabledSecondaryContent": "#919191",
"defaultHoveredSecondaryContent": "#6E6E6E",
"defaultIcon": "#6E6E6E",
"defaultPressedBackground": "#004C87",
Expand Down Expand Up @@ -3699,20 +3627,9 @@ exports[`getAndroidTheme light appearance test 1`] = `
"brandStroke1Pressed": "#0e4775",
"brandStroke1Selected": "#0f548c",
"brandedBackground": "#0078D4",
"brandedCheckedBackground": "#2B88D8",
"brandedCheckedContent": "#212121",
"brandedCheckedHoveredBackground": "#2B88D8",
"brandedCheckedHoveredContent": "#212121",
"brandedDisabledBackground": "#E1E1E1",
"brandedDisabledBorder": "transparent",
"brandedDisabledContent": "#ACACAC",
"brandedDisabledIcon": "#ACACAC",
"brandedFocusedSecondaryContent": "#919191",
"brandedHoveredSecondaryContent": "#919191",
"brandedPressedBackground": "#2B88D8",
"brandedPressedBorder": "transparent",
"brandedPressedContent": "#212121",
"brandedPressedIcon": "#212121",
"brandedPressedSecondaryContent": "#919191",
"brandedSecondaryContent": "#919191",
"buttonBackground": "#0078D4",
Expand Down Expand Up @@ -3747,7 +3664,6 @@ exports[`getAndroidTheme light appearance test 1`] = `
"defaultDisabledBorder": "transparent",
"defaultDisabledContent": "#ACACAC",
"defaultDisabledIcon": "#ACACAC",
"defaultDisabledSecondaryContent": "#6E6E6E",
"defaultHoveredSecondaryContent": "#919191",
"defaultIcon": "#919191",
"defaultPressedBackground": "#005A9E",
Expand Down
14 changes: 0 additions & 14 deletions packages/theming/android-theme/src/colorsTokens.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,26 +130,13 @@ export function paletteFromAndroidColors(p: FluentUIAndroidPalette): ThemeColorD

brandedBackground: p.communicationBlue,

brandedPressedBackground: p.communicationBlueTint10,
brandedPressedBorder: 'transparent',
brandedPressedContent: p.textDominant,
brandedPressedIcon: p.textDominant,

brandedDisabledBackground: p.gray100,
brandedDisabledBorder: 'transparent',
brandedDisabledContent: p.textDisabled,
brandedDisabledIcon: p.textDisabled,

defaultCheckedBackground: p.communicationBlueTint10,
defaultCheckedContent: p.textDominant,
defaultCheckedHoveredBackground: p.communicationBlueTint10,
defaultCheckedHoveredContent: p.textDominant,

brandedCheckedBackground: p.communicationBlueTint10,
brandedCheckedContent: p.textDominant,
brandedCheckedHoveredBackground: p.communicationBlueTint10,
brandedCheckedHoveredContent: p.textDominant,

ghostCheckedBackground: 'transparent',
ghostCheckedContent: p.communicationBlueTint20,
ghostCheckedHoveredBackground: 'transparent',
Expand All @@ -166,7 +153,6 @@ export function paletteFromAndroidColors(p: FluentUIAndroidPalette): ThemeColorD
brandedHoveredSecondaryContent: p.iconsSecondary,
brandedPressedSecondaryContent: p.iconsSecondary,

defaultDisabledSecondaryContent: p.textSecondary,
defaultHoveredSecondaryContent: p.iconsSecondary,
defaultPressedSecondaryContent: p.iconsSecondary,

Expand Down
26 changes: 0 additions & 26 deletions packages/theming/apple-theme/src/__tests__/__snapshots__/apple-theme.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,34 +69,9 @@ exports[`createAppleTheme test 1`] = `
"brandStroke1": "#0078d4",
"brandStroke2": "#c7e0f4",
"brandedBackground": "#0078d4",
"brandedCheckedBackground": {
"dynamic": {
"dark": "#1890F1",
"highContrastDark": undefined,
"highContrastLight": undefined,
"light": "#0078D4",
},
},
"brandedCheckedContent": "#ffffff",
"brandedCheckedHoveredBackground": {
"dynamic": {
"dark": "#1890F1",
"highContrastDark": undefined,
"highContrastLight": undefined,
"light": "#0078D4",
},
},
"brandedCheckedHoveredContent": "#ffffff",
"brandedDisabledBackground": "#f0f0f0",
"brandedDisabledBorder": "transparent",
"brandedDisabledContent": "#757575",
"brandedDisabledIcon": "#616161",
"brandedFocusedSecondaryContent": "#ffffff",
"brandedHoveredSecondaryContent": "#ffffff",
"brandedPressedBackground": "#106ebe",
"brandedPressedBorder": "transparent",
"brandedPressedContent": "#ffffff",
"brandedPressedIcon": "#ffffff",
"brandedPressedSecondaryContent": {
"colorWithSystemEffect": {
"baseColor": "#ffffff",
Expand Down Expand Up @@ -192,7 +167,6 @@ exports[`createAppleTheme test 1`] = `
"defaultDisabledBorder": "#d6d6d6",
"defaultDisabledContent": "#757575",
"defaultDisabledIcon": "#616161",
"defaultDisabledSecondaryContent": "#757575",
"defaultFocusedBackground": "#ffffff",
"defaultFocusedBorder": "#d6d6d6",
"defaultFocusedContent": "#000000",
Expand Down
14 changes: 0 additions & 14 deletions packages/theming/apple-theme/src/appleColors.ios.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,26 +204,13 @@ export function paletteFromAppleColors(isLightMode: boolean, isElevated: boolean

brandedBackground: fluentApple.communicationBlue,

brandedPressedBackground: fluentApple.buttonBackgroundFilledPressed,
brandedPressedBorder: 'transparent',
brandedPressedContent: fluent2AliasColorTokens.neutralForegroundOnColor,
brandedPressedIcon: fluent2AliasColorTokens.neutralForegroundOnColor,

brandedDisabledBackground: fluent2AliasColorTokens.neutralBackgroundDisabled,
brandedDisabledBorder: 'transparent',
brandedDisabledContent: fluent2AliasColorTokens.neutralForegroundOnColor,
brandedDisabledIcon: fluent2AliasColorTokens.neutralForegroundOnColor,

defaultCheckedBackground: 'transparent',
defaultCheckedContent: fluentApple.communicationBlue,
defaultCheckedHoveredBackground: 'transparent',
defaultCheckedHoveredContent: fluentApple.communicationBlue,

brandedCheckedBackground: fluentApple.communicationBlue,
brandedCheckedContent: fluent2AliasColorTokens.neutralForegroundOnColor,
brandedCheckedHoveredBackground: fluent2AliasColorTokens.neutralForegroundOnColor,
brandedCheckedHoveredContent: fluent2AliasColorTokens.neutralForegroundOnColor,

ghostCheckedBackground: 'transparent',
ghostCheckedContent: fluentApple.communicationBlue,
ghostCheckedHoveredBackground: 'transparent',
Expand All @@ -241,7 +228,6 @@ export function paletteFromAppleColors(isLightMode: boolean, isElevated: boolean
brandedHoveredSecondaryContent: fluent2AliasColorTokens.neutralForegroundOnColor,
brandedPressedSecondaryContent: fluent2AliasColorTokens.neutralForegroundOnColor,

defaultDisabledSecondaryContent: fluentApple.buttonTitleDisabled,
defaultHoveredSecondaryContent: fluentApple.communicationBlue,
defaultPressedSecondaryContent: fluentApple.communicationBlueTint20,

Expand Down
Loading
Loading