-
Notifications
You must be signed in to change notification settings - Fork 163
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.
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
Button tokens was missing iOS File and had a typo in Default file #3238
Open
gremlin529
wants to merge
5
commits into
microsoft:main
Choose a base branch
from
gremlin529:u/gremlin/FixButtonTokens
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
3590116
finishing up button changes
gremlin529 1efa947
Revert "finishing up button changes"
gremlin529 e41e048
Merge remote-tracking branch 'upstream/main'
gremlin529 90f276d
fixing some colortokens issues
gremlin529 7d029b4
Change files
gremlin529 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
7 changes: 7 additions & 0 deletions
7
change/@fluentui-react-native-button-cd098f53-ab62-4a99-b044-0f34df7378fb.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| { | ||
| "type": "patch", | ||
| "comment": "fixing some colortokens issues", | ||
| "packageName": "@fluentui-react-native/button", | ||
| "email": "[email protected]", | ||
| "dependentChangeType": "patch" | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,96 @@ | ||
| import type { Theme } from '@fluentui-react-native/framework'; | ||
| import type { TokenSettings } from '@fluentui-react-native/use-styling'; | ||
|
|
||
| import type { ButtonTokens } from './Button.types'; | ||
|
|
||
| export const defaultButtonColorTokens: TokenSettings<ButtonTokens, Theme> = (t: Theme) => | ||
| ({ | ||
| backgroundColor: t.colors.buttonBackground, | ||
| color: t.colors.buttonText, | ||
| borderColor: t.colors.buttonBorder, | ||
| iconColor: t.colors.buttonIcon, | ||
| disabled: { | ||
| backgroundColor: t.colors.defaultDisabledBackground, | ||
| color: t.colors.defaultDisabledContent, | ||
| borderColor: t.colors.defaultDisabledBorder, | ||
| iconColor: t.colors.defaultDisabledIcon, | ||
| }, | ||
| hovered: { | ||
| backgroundColor: t.colors.defaultHoveredBackground, | ||
| color: t.colors.defaultHoveredContent, | ||
| borderColor: t.colors.defaultHoveredBorder, | ||
| iconColor: t.colors.defaultHoveredIcon, | ||
| }, | ||
| pressed: { | ||
| backgroundColor: t.colors.defaultPressedBackground, | ||
| color: t.colors.defaultPressedContent, | ||
| borderColor: t.colors.defaultPressedBorder, | ||
| iconColor: t.colors.defaultPressedIcon, | ||
| }, | ||
| focused: { | ||
| backgroundColor: t.colors.defaultFocusedBackground, | ||
| color: t.colors.defaultFocusedContent, | ||
| borderColor: t.colors.defaultFocusedBorder, | ||
| iconColor: t.colors.defaultFocusedIcon, | ||
| }, | ||
| primary: { | ||
| backgroundColor: t.colors.brandedBackground, | ||
| color: t.colors.brandedContent, | ||
| borderColor: t.colors.brandedBorder, | ||
| iconColor: t.colors.brandedIcon, | ||
| disabled: { | ||
| backgroundColor: t.colors.brandedDisabledBackground, | ||
| color: t.colors.brandedDisabledContent, | ||
| borderColor: t.colors.brandedDisabledBorder, | ||
| iconColor: t.colors.brandedDisabledIcon, | ||
| }, | ||
| hovered: { | ||
| backgroundColor: t.colors.brandedHoveredBackground, | ||
| color: t.colors.brandedHoveredContent, | ||
| borderColor: t.colors.brandedHoveredBorder, | ||
| iconColor: t.colors.brandedHoveredIcon, | ||
| }, | ||
| pressed: { | ||
| backgroundColor: t.colors.brandedPressedBackground, | ||
| color: t.colors.brandedPressedContent, | ||
| borderColor: t.colors.brandedPressedBorder, | ||
| iconColor: t.colors.brandedPressedIcon, | ||
| }, | ||
| focused: { | ||
| backgroundColor: t.colors.brandedFocusedBackground, | ||
| color: t.colors.brandedFocusedContent, | ||
| borderColor: t.colors.brandedFocusedBorder, | ||
| iconColor: t.colors.brandedFocusedIcon, | ||
| }, | ||
| }, | ||
| subtle: { | ||
| backgroundColor: t.colors.ghostBackground, | ||
| color: t.colors.ghostContent, | ||
| borderColor: t.colors.ghostBorder, | ||
| iconColor: t.colors.ghostIcon, | ||
| disabled: { | ||
| color: t.colors.ghostDisabledContent, | ||
| borderColor: t.colors.ghostDisabledBorder, | ||
| backgroundColor: t.colors.ghostDisabledBackground, | ||
| iconColor: t.colors.ghostDisabledIcon, | ||
| }, | ||
| hovered: { | ||
| backgroundColor: t.colors.ghostHoveredBackground, | ||
| color: t.colors.ghostHoveredContent, | ||
| borderColor: t.colors.ghostHoveredBorder, | ||
| iconColor: t.colors.ghostHoveredIcon, | ||
| }, | ||
| pressed: { | ||
| backgroundColor: t.colors.ghostPressedBackground, | ||
| borderColor: t.colors.ghostPressedBorder, | ||
| color: t.colors.ghostPressedContent, | ||
| iconColor: t.colors.ghostPressedIcon, | ||
| }, | ||
| focused: { | ||
| borderColor: t.colors.ghostFocusedBorder, | ||
| backgroundColor: t.colors.ghostFocusedBackground, | ||
| color: t.colors.ghostFocusedContent, | ||
| iconColor: t.colors.ghostFocusedIcon, | ||
| }, | ||
| }, | ||
| } as ButtonTokens); | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is this a copy of the base ButtinColorTokens file? If so this file isn't necessary, it should pick up the base version if no override has been specified.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
let me check that, I actually noticed this was missing and the bugs in the other one several weeks ago then forgot to go through with the check in so I'm resurecting it.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If you do need iOS tokens, we should use Fluent tokens to specify the styling. The current colors listed here are older colors that aren't used in the Fluent2 system.