Skip to content

Commit

Permalink
backport fixes until we solve the duplication
Browse files Browse the repository at this point in the history
  • Loading branch information
oliviertassinari committed Jan 11, 2021
1 parent 59348c7 commit 6a3ee8c
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
5 changes: 4 additions & 1 deletion docs/src/modules/branding/AppSearch.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,9 @@ const useStyles = makeStyles(
transition: theme.transitions.create('opacity', {
duration: theme.transitions.duration.shortest,
}),
// So that clicks target the input.
// Makes the text non selectable but neither is the placeholder or adornment.
pointerEvents: 'none',
'&.Mui-focused': {
opacity: 0,
},
Expand Down Expand Up @@ -163,7 +166,7 @@ export default function AppSearch() {
}}
/>
<div className={clsx(classes.shortcut, { 'Mui-focused': focused })}>
{macOS ? '⌘' : 'Ctrl'}+K
{macOS ? '⌘' : 'Ctrl+'}K
</div>
</div>
);
Expand Down
2 changes: 1 addition & 1 deletion docs/src/modules/components/AppSearch.js
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ export default function AppSearch() {
/>
<div className={clsx(classes.shortcut, { 'Mui-focused': focused })}>
{/* eslint-disable-next-line material-ui/no-hardcoded-labels */}
{macOS ? '⌘' : 'Ctrl'}+K
{macOS ? '⌘' : 'Ctrl+'}K
</div>
</div>
);
Expand Down

0 comments on commit 6a3ee8c

Please sign in to comment.