Skip to content

Commit ce64a12

Browse files
committed
make ui consistent
1 parent 484c53e commit ce64a12

File tree

3 files changed

+15
-9
lines changed

3 files changed

+15
-9
lines changed

src/main/index.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,11 @@ function createWindows() {
103103
const stickersDir = path.join(app.getPath('userData'), 'stickers')
104104
if (!fs.existsSync(stickersDir)) fs.mkdirSync(stickersDir)
105105

106-
const appLauncher = new AutoLaunch({ name: 'VibeLayer' })
106+
const appLauncher = new AutoLaunch({
107+
name: 'VibeLayer',
108+
path: app.getPath('exe'),
109+
args: ['--no-sandbox']
110+
})
107111

108112
const store = new (Store.default || Store)()
109113

src/renderer/src/App.jsx

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,7 @@ function App() {
390390
{loading && localFile ? (
391391
<div className="text-sm text-muted-foreground">Loading...</div>
392392
) : (
393-
<Button size={"sm"} className={"ml-auto cursor-pointer"} onClick={handleImportLocalButton}>Import</Button>
393+
<Button size={"sm"} className={"ml-auto bg-pink-600 text-white hover:bg-pink-700 cursor-pointer"} onClick={handleImportLocalButton}>Import</Button>
394394
)}
395395
</div>
396396
<div className="w-full min-h-48 border border-dashed border-gray-300 dark:border-gray-600 rounded-md flex flex-col items-center justify-center p-6">
@@ -420,7 +420,7 @@ function App() {
420420
<Card className="p-4 flex flex-col items-center justify-between gap-4">
421421
<div className="flex w-full items-center justify-between gap-2">
422422
<div className="w-full text-left font-semibold text-2xl">Direct Link</div>
423-
<Button className={"ml-auto cursor-pointer"} size={"sm"} onClick={handleImportUrl}>Import</Button>
423+
<Button className={"ml-auto cursor-pointer bg-pink-600 text-white hover:bg-pink-700"} size={"sm"} onClick={handleImportUrl}>Import</Button>
424424

425425
</div>
426426
<div className="w-full min-h-48 flex flex-col items-center">
@@ -454,7 +454,7 @@ function App() {
454454
placeholder="Start typing keywords..."
455455
className="backdrop-blur-xs"
456456
/>
457-
<Button className={"cursor-pointer"} onClick={() => handleSearch(searchRef.current.value)} disabled={loading}>
457+
<Button className={"cursor-pointer bg-pink-600 text-white hover:bg-pink-700"} onClick={() => handleSearch(searchRef.current.value)} disabled={loading}>
458458
<SearchIcon className="w-4 h-4" />
459459
</Button>
460460
</div>
@@ -470,7 +470,7 @@ function App() {
470470
alt="result"
471471
className="w-24 h-24 object-cover rounded-md"
472472
/>
473-
<Button onClick={() => handleImport(item)} size="sm" className="mt-[2px] w-full">
473+
<Button onClick={() => handleImport(item)} size="sm" className="mt-[2px] w-full bg-pink-600 text-white hover:bg-pink-700">
474474
Import
475475
</Button>
476476
</Card>
@@ -506,7 +506,7 @@ function App() {
506506
<div className="flex gap-2 absolute bottom-[6px] opacity-0 duration-400 group-hover:opacity-100">
507507
<Button
508508
size="sm"
509-
className="h-6 px-2 text-xs bg-pink-600 hover:bg-pink-700"
509+
className="h-6 px-2 text-xs bg-pink-600 text-white hover:bg-pink-700"
510510
onClick={() => handleSetSticker(sticker)}
511511
>
512512
Set
@@ -546,6 +546,7 @@ function App() {
546546
/>
547547
<video ref={handleVideoRef} />
548548
<Rnd
549+
className=''
549550
size={{
550551
width: layout.widthPct ? layout.widthPct * previewWidth : layout.width,
551552
height: layout.heightPct ? layout.heightPct * previewHeight : layout.height
@@ -572,7 +573,8 @@ function App() {
572573
}
573574
bounds="parent"
574575
style={{ zIndex: 1 }}
575-
>
576+
>
577+
<div className='absolute top-0 left-0 w-full h-full z-2 border-[2px] transition-all duration-300 border-transparent hover:border-pink-600/33 rounded-sm'></div>
576578
<img
577579
src={toFileUrl(activeSticker.path)}
578580
alt="active"

src/renderer/src/components/ui/switch.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ function Switch({
1111
<SwitchPrimitive.Root
1212
data-slot="switch"
1313
className={cn(
14-
"peer data-[state=checked]:bg-primary data-[state=unchecked]:bg-input focus-visible:border-ring focus-visible:ring-ring/50 dark:data-[state=unchecked]:bg-input/80 inline-flex h-[1.15rem] w-8 shrink-0 items-center rounded-full border border-transparent shadow-xs transition-all outline-none focus-visible:ring-[3px] disabled:cursor-not-allowed disabled:opacity-50",
14+
"peer data-[state=checked]:bg-pink-600 data-[state=unchecked]:bg-input focus-visible:border-ring focus-visible:ring-ring/50 dark:data-[state=unchecked]:bg-input/80 inline-flex h-[1.15rem] w-8 shrink-0 items-center rounded-full border border-transparent shadow-xs transition-all outline-none focus-visible:ring-[3px] disabled:cursor-not-allowed disabled:opacity-50",
1515
className
1616
)}
1717
{...props}>
1818
<SwitchPrimitive.Thumb
1919
data-slot="switch-thumb"
2020
className={cn(
21-
"bg-background dark:data-[state=unchecked]:bg-foreground dark:data-[state=checked]:bg-primary-foreground pointer-events-none block size-4 rounded-full ring-0 transition-transform data-[state=checked]:translate-x-[calc(100%-2px)] data-[state=unchecked]:translate-x-0"
21+
"bg-background dark:data-[state=unchecked]:bg-foreground dark:data-[state=checked]:bg-foreground pointer-events-none block size-4 rounded-full ring-0 transition-transform data-[state=checked]:translate-x-[calc(100%-2px)] data-[state=unchecked]:translate-x-0"
2222
)} />
2323
</SwitchPrimitive.Root>
2424
);

0 commit comments

Comments
 (0)