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

Jump to bottom

fix: Make disabled ui.button icon and text colours consistent #1664 #1710

Merged
merged 4 commits into from
Nov 23, 2022
Merged

fix: Make disabled ui.button icon and text colours consistent #1664 #1710

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e439418
fix: make disabled button icon and text color consistent #1664
marek-mihok Nov 21, 2022
29d3d1d
make icon and text color consistent for disabled buttons globally #1664
marek-mihok Nov 22, 2022
be7eee3
chore: clean git diff #1664
marek-mihok Nov 22, 2022
e560340
chore: theme provider performance omptimization #1664
marek-mihok Nov 23, 2022
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
18 changes: 16 additions & 2 deletions ui/src/app.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,21 @@ const
flexDirection: 'column',
alignItems: 'center',
},
})
}),
buttonStyles = { styles: { iconDisabled: { color: 'unset' } } },
// The global overrides for component styles.
customStyles = {
components: {
DefaultButton: buttonStyles,
PrimaryButton: buttonStyles,
IconButton: buttonStyles,
ActionButton: buttonStyles,
CommandButton: buttonStyles,
CommandBarButton: buttonStyles,
CompoundButton: buttonStyles,
SpinButton: buttonStyles
}
}

const
BusyOverlay = bond(() => {
Expand Down Expand Up @@ -116,7 +130,7 @@ const
const page = e.page
const lightbox = lightboxB()
return (
<Fluent.ThemeProvider>
<Fluent.ThemeProvider theme={customStyles}>
<div className={css.app}>
<PageLayout key={page.key} page={page} />
<BusyOverlay />
Expand Down