Skip to content

Commit

Permalink
update ui and icons
Browse files Browse the repository at this point in the history
  • Loading branch information
a-type committed Jun 6, 2024
1 parent 64c7a32 commit 506066b
Show file tree
Hide file tree
Showing 13 changed files with 931 additions and 604 deletions.
2 changes: 1 addition & 1 deletion apps/gnocchi/hub/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"typecheck": "tsc --build tsconfig.json"
},
"dependencies": {
"@a-type/ui": "^0.8.17",
"@a-type/ui": "^0.8.18",
"@a-type/utils": "^1.0.8",
"@tiptap/core": "^2.2.4",
"@tiptap/extension-document": "^2.2.4",
Expand Down
2 changes: 1 addition & 1 deletion apps/gnocchi/web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"typecheck": "tsc --build tsconfig.json"
},
"dependencies": {
"@a-type/ui": "^0.8.17",
"@a-type/ui": "^0.8.18",
"@a-type/utils": "^1.0.8",
"@biscuits/client": "workspace:*",
"@biscuits/error": "workspace:*",
Expand Down
2 changes: 1 addition & 1 deletion apps/marginalia/web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"preview": "vite preview"
},
"dependencies": {
"@a-type/ui": "0.8.17",
"@a-type/ui": "0.8.18",
"@a-type/utils": "1.1.0",
"@biscuits/client": "workspace:*",
"@marginalia.biscuits/verdant": "workspace:*",
Expand Down
2 changes: 1 addition & 1 deletion apps/shopping/web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"preview": "vite preview"
},
"dependencies": {
"@a-type/ui": "^0.8.17",
"@a-type/ui": "^0.8.18",
"@a-type/utils": "^1.0.8",
"@biscuits/client": "workspace:*",
"@react-spring/web": "^9.7.3",
Expand Down
2 changes: 1 addition & 1 deletion apps/star-chart/web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"preview": "vite preview"
},
"dependencies": {
"@a-type/ui": "0.8.17",
"@a-type/ui": "0.8.18",
"@a-type/utils": "1.1.2",
"@biscuits/client": "workspace:*",
"@react-spring/web": "^9.7.3",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ export function ConnectionMenu({ connection }: ConnectionMenuProps) {
className="absolute z-10 bg-white shadow-md rounded-md p-2"
>
<Button size="small" onClick={deleteConnection} color="ghostDestructive">
<Icon name="trash" />
<Icon name="connectionBreak" />
Delete
</Button>
</animated.div>
Expand Down
13 changes: 1 addition & 12 deletions apps/star-chart/web/src/components/project/SelectionMenu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -67,25 +67,14 @@ export function SelectionMenu({ className }: SelectionMenuProps) {
{mixed ? 'items' : tasks.length > 0 ? 'tasks' : 'connections'} selected
</div>
<div className="row flex-wrap justify-stretch">
{mixed && (
<Button
onClick={() => deleteSelected('task')}
color="ghostDestructive"
size="small"
className="flex-1 justify-center"
>
<Icon name="trash" />
Delete Tasks
</Button>
)}
{mixed && (
<Button
onClick={() => deleteSelected('connection')}
color="ghostDestructive"
size="small"
className="flex-1 justify-center"
>
<Icon name="trash" />
<Icon name="connectionBreak" />
Delete Connections
</Button>
)}
Expand Down
9 changes: 7 additions & 2 deletions apps/star-chart/web/src/components/project/TouchTools.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { useCanvas } from '../canvas/CanvasProvider.jsx';
import { Button } from '@a-type/ui/components/button';
import { CanvasOverlayContent } from '../canvas/CanvasOverlay.jsx';
import { useIsTouch } from '@biscuits/client';
import { Icon } from '@a-type/ui/components/icon';

export interface TouchToolsProps {
className?: string;
Expand Down Expand Up @@ -34,7 +35,9 @@ export function TouchTools({ className }: TouchToolsProps) {
dragLocked && 'bg-primary-light text-primary-dark',
)}
>
<span>{dragLocked ? '🔒' : '🔓'}</span>
<span>
<Icon name={dragLocked ? 'lock' : 'lockOpen'} />
</span>
<span className="text-[8px] leading-tight">Drag Lock</span>
</Button>
{isTouchscreen && (
Expand All @@ -48,7 +51,9 @@ export function TouchTools({ className }: TouchToolsProps) {
boxSelect && 'bg-primary-light text-primary-dark',
)}
>
<span>🔲</span>
<span>
<Icon name="maximize" />
</span>
<span className="text-[8px] leading-tight">Box Select</span>
</Button>
)}
Expand Down
2 changes: 1 addition & 1 deletion apps/trip-tick/web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"preview": "vite preview"
},
"dependencies": {
"@a-type/ui": "^0.8.17",
"@a-type/ui": "^0.8.18",
"@a-type/utils": "^1.0.6",
"@biscuits/client": "workspace:*",
"@radix-ui/react-progress": "^1.0.3",
Expand Down
2 changes: 1 addition & 1 deletion blog/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"astro": "astro"
},
"dependencies": {
"@a-type/ui": "^0.8.17",
"@a-type/ui": "^0.8.18",
"@astrojs/check": "^0.5.10",
"@astrojs/mdx": "^2.3.1",
"@astrojs/rss": "^4.0.5",
Expand Down
2 changes: 1 addition & 1 deletion packages/client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
"vite-plugin-pwa": "0.19.2"
},
"devDependencies": {
"@a-type/ui": "^0.8.17",
"@a-type/ui": "^0.8.18",
"@types/react": "18.2.79",
"@verdant-web/store": "^3.6.3",
"react": "^18.2.0",
Expand Down
Loading

0 comments on commit 506066b

Please sign in to comment.