Skip to content

Turn off contextual alternates in the terminal #1841

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

Merged
merged 2 commits into from
Dec 8, 2023
Merged

Turn off contextual alternates in the terminal #1841

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2fb5734
Turn off contextual alternates in the terminal
benjaminleonard Dec 7, 2023
9a83222
Use updated design system to fix instead
benjaminleonard Dec 8, 2023
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
3 changes: 1 addition & 2 deletions app/components/EquivalentCliCommand.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,7 @@ export default function EquivalentCliCommand({ command }: { command: string }) {
</Button>
<Modal isOpen={isOpen} onDismiss={handleDismiss} title="CLI command">
<Modal.Section>
{/* todo: fix the token to disable contextual alternates in the mono font */}
<pre className="flex w-full rounded border px-4 py-3 !normal-case !tracking-normal text-mono-md bg-default border-secondary [font-feature-settings:_'calt'_off]">
<pre className="flex w-full rounded border px-4 py-3 !normal-case !tracking-normal text-mono-md bg-default border-secondary">
<div className="mr-2 select-none text-quaternary">$</div>
{command}
</pre>
Expand Down
2 changes: 1 addition & 1 deletion app/components/Terminal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ export const Terminal = ({ ws }: TerminalProps) => {

return (
<>
<div className="h-full w-[calc(100%-3rem)]" ref={terminalRef} />
<div className="h-full w-[calc(100%-3rem)] text-mono-code" ref={terminalRef} />
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Technically the terminal is styled inline with some values passed to xterm.js. By including text-mono-code here it's also adding a bunch of styles that are ignored/overriden by those inline styles, but the font-feature-settings come with it, so it's probably the easiest and best fix here.

<div className="absolute right-0 top-0 space-y-2 text-secondary">
<ScrollButton onClick={() => term?.scrollToTop()}>
<DirectionUpIcon />
Expand Down
14 changes: 7 additions & 7 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"dependencies": {
"@floating-ui/react": "^0.26.0",
"@headlessui/react": "^0.0.0-insiders.a9e8563",
"@oxide/design-system": "^1.2.2",
"@oxide/design-system": "^1.2.9",
"@oxide/identicon": "0.0.4",
"@radix-ui/react-dialog": "^1.0.3",
"@radix-ui/react-dropdown-menu": "^2.0.4",
Expand Down