Skip to content

Surf it, scroll it, pause it, click it #2772

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 7 commits into from
Apr 16, 2025
Merged

Surf it, scroll it, pause it, click it #2772

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
26a689f
Surf it, scroll it, pause it, click it
benjaminleonard Apr 1, 2025
4101df7
Ignore disabled buttons
benjaminleonard Apr 1, 2025
3d2c3e3
Apply to more buttons
benjaminleonard Apr 1, 2025
570ef83
Update CopyToClipboard.tsx
benjaminleonard Apr 1, 2025
19cd205
Don't translate dropdown
benjaminleonard Apr 2, 2025
d403163
Make motion safe
benjaminleonard Apr 2, 2025
265adca
merge main and resolve conflict
david-crespo Apr 16, 2025
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: 1 addition & 1 deletion app/components/MoreActionsMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ export const MoreActionsMenu = ({
<DropdownMenu.Trigger
aria-label={label}
className={cn(
'flex items-center justify-center rounded border border-default hover:bg-tertiary',
'active-clicked flex items-center justify-center rounded border border-default hover:bg-tertiary',
isSmall ? 'h-6 w-6' : 'h-8 w-8'
)}
>
Expand Down
2 changes: 1 addition & 1 deletion app/components/TopBar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ function SiloSystemPicker({ level }: { level: 'silo' | 'system' }) {
return (
<DropdownMenu.Root>
<DropdownMenu.Trigger
className="flex items-center rounded border px-2 py-1.5 text-sans-md text-default border-secondary hover:bg-hover"
className="active-clicked flex items-center rounded border px-2 py-1.5 text-sans-md text-default border-secondary hover:bg-hover"
aria-label="Switch between system and silo"
>
<div className="flex items-center text-tertiary">
Expand Down
2 changes: 1 addition & 1 deletion app/ui/lib/Button.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ export const buttonStyle = ({
variant = 'primary',
}: ButtonStyleProps = {}) => {
return cn(
'ox-button elevation-1 rounded inline-flex items-center justify-center align-top disabled:cursor-default shrink-0',
'ox-button active-clicked elevation-1 rounded inline-flex items-center justify-center align-top disabled:cursor-default shrink-0',
`btn-${variant}`,
sizeStyle[size],
variant === 'danger'
Expand Down
2 changes: 1 addition & 1 deletion app/ui/lib/CopyToClipboard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ export const CopyToClipboard = ({
return (
<button
className={cn(
'relative h-5 w-5 rounded',
'active-clicked relative h-5 w-5 rounded',
hasCopied
? 'text-accent bg-accent-secondary'
: 'text-tertiary hover:text-default hover:bg-hover',
Expand Down
3 changes: 3 additions & 0 deletions app/ui/styles/components/button.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@
.ox-button {
@apply relative;
}
.active-clicked:active:not(.visually-disabled) {
@apply translate-y-px;
}
.ox-button:after {
content: '';
@apply absolute bottom-0 left-0 right-0 top-0 rounded border border-current opacity-[0.05];
Expand Down
Loading