Skip to content

Commit

Permalink
prepare for release
Browse files Browse the repository at this point in the history
  • Loading branch information
@Brendonovich
Brendonovich committed Nov 14, 2024
1 parent 618e238 commit ae8cd7c
Show file tree
Hide file tree
Showing 3 changed files with 66 additions and 62 deletions.
2 changes: 1 addition & 1 deletion apps/desktop/src/entry-server.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export default createHandler(() => (
></script>
{assets}
</head>
<body class="w-full h-full select-none cursor-default">
<body class="w-screen h-screen select-none cursor-default">
<div id="app" class="h-full">
{children}
</div>
Expand Down
120 changes: 62 additions & 58 deletions apps/desktop/src/routes/editor/ConfigSidebar.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,9 @@ export function ConfigSidebar() {
return (
<KTabs
value={selectedTab()}
class="flex flex-col shrink-0 overflow-x-hidden overflow-y-hidden w-[25.5rem] z-10 bg-gray-50 relative"
class="flex flex-col shrink-0 overflow-x-hidden overflow-y-hidden flex-1 max-w-[25.5rem] z-10 bg-gray-50 relative"
>
<KTabs.List class="h-[3.5rem] flex flex-row divide-x divide-gray-200 text-black/50 text-lg relative z-40 overflow-x-auto border-b border-gray-200">
<KTabs.List class="h-[3.5rem] flex flex-row divide-x divide-gray-200 text-black/50 text-lg relative z-40 overflow-x-auto border-b border-gray-200 shrink-0">
<For
each={[
{ id: "background" as const, icon: IconCapImage },
Expand Down Expand Up @@ -265,7 +265,7 @@ export function ConfigSidebar() {
</KTabs.Content>
<KTabs.Content
value="gradient"
class="flex flex-row items-center gap-[1.5rem]"
class="flex flex-row items-center justify-between"
>
<Show
when={
Expand Down Expand Up @@ -303,7 +303,7 @@ export function ConfigSidebar() {
}}
/>
<div
class="rounded-full size-12 bg-gray-50 border border-gray-200 relative p-1 flex flex-col items-center cursor-ns-resize"
class="rounded-full size-12 bg-gray-50 border border-gray-200 relative p-1 flex flex-col items-center cursor-ns-resize shrink-0"
style={{ transform: `rotate(${angle()}deg)` }}
onMouseDown={(downEvent) => {
const start = angle();
Expand Down Expand Up @@ -454,15 +454,17 @@ export function ConfigSidebar() {
step={0.1}
/>
</Field>
<Field name="Size During Zoom" icon={<IconCapEnlarge />}>
<Slider
value={[project.camera.zoom_size ?? 20]}
onChange={(v) => setProject("camera", "zoom_size", v[0])}
minValue={10}
maxValue={60}
step={0.1}
/>
</Field>
{window.FLAGS.zoom && (
<Field name="Size During Zoom" icon={<IconCapEnlarge />}>
<Slider
value={[project.camera.zoom_size ?? 20]}
onChange={(v) => setProject("camera", "zoom_size", v[0])}
minValue={10}
maxValue={60}
step={0.1}
/>
</Field>
)}
<Field name="Rounded Corners" icon={<IconCapCorners />}>
<Slider
value={[project.camera.rounding ?? 100.0]}
Expand Down Expand Up @@ -532,51 +534,53 @@ export function ConfigSidebar() {
step={1}
/>
</Field>
<Field name="Animation Style" icon={<IconLucideRabbit />}>
<RadioGroup
defaultValue="regular"
value={project.cursor.animationStyle}
onChange={(value) => {
console.log("Changing animation style to:", value);
setProject(
"cursor",
"animationStyle",
value as CursorAnimationStyle
);
}}
class="flex flex-col gap-2"
>
{(
Object.entries(CURSOR_ANIMATION_STYLES) as [
CursorAnimationStyle,
string
][]
).map(([value, label]) => (
<RadioGroup.Item value={value} class="flex items-center">
<RadioGroup.ItemInput class="peer sr-only" />
<RadioGroup.ItemControl
class={cx(
"w-4 h-4 rounded-full border border-gray-300 mr-2",
"relative after:absolute after:inset-0 after:m-auto after:block after:w-2 after:h-2 after:rounded-full",
"after:transition-colors after:duration-200",
"peer-checked:border-blue-500 peer-checked:after:bg-blue-400",
"peer-focus-visible:ring-2 peer-focus-visible:ring-blue-400/50",
"peer-disabled:opacity-50"
)}
/>
<span
class={cx(
"text-gray-500",
"peer-checked:text-gray-900",
"peer-disabled:opacity-50"
)}
>
{label}
</span>
</RadioGroup.Item>
))}
</RadioGroup>
</Field>
{window.FLAGS.zoom && (
<Field name="Animation Style" icon={<IconLucideRabbit />}>
<RadioGroup
defaultValue="regular"
value={project.cursor.animationStyle}
onChange={(value) => {
console.log("Changing animation style to:", value);
setProject(
"cursor",
"animationStyle",
value as CursorAnimationStyle
);
}}
class="flex flex-col gap-2"
>
{(
Object.entries(CURSOR_ANIMATION_STYLES) as [
CursorAnimationStyle,
string
][]
).map(([value, label]) => (
<RadioGroup.Item value={value} class="flex items-center">
<RadioGroup.ItemInput class="peer sr-only" />
<RadioGroup.ItemControl
class={cx(
"w-4 h-4 rounded-full border border-gray-300 mr-2",
"relative after:absolute after:inset-0 after:m-auto after:block after:w-2 after:h-2 after:rounded-full",
"after:transition-colors after:duration-200",
"peer-checked:border-blue-500 peer-checked:after:bg-blue-400",
"peer-focus-visible:ring-2 peer-focus-visible:ring-blue-400/50",
"peer-disabled:opacity-50"
)}
/>
<span
class={cx(
"text-gray-500",
"peer-checked:text-gray-900",
"peer-disabled:opacity-50"
)}
>
{label}
</span>
</RadioGroup.Item>
))}
</RadioGroup>
</Field>
)}
</KTabs.Content>
<KTabs.Content value="hotkeys">
<Field name="Hotkeys" icon={<IconCapHotkeys />}>
Expand Down
6 changes: 3 additions & 3 deletions apps/desktop/src/routes/editor/Editor.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,10 +142,10 @@ function Inner() {
});

return (
<>
<div class="w-screen h-screen flex flex-col">
<Header />
<div
class="p-5 pt-0 flex flex-col gap-4 w-screen h-screen bg-gray-50 rounded-lg leading-5 animate-in fade-in"
class="p-5 pt-0 flex-1 w-full overflow-y-hidden flex flex-col gap-4 bg-gray-50 rounded-lg leading-5 animate-in fade-in"
data-tauri-drag-region
>
<div class="rounded-2xl overflow-hidden shadow border flex-1 flex flex-col divide-y bg-white">
Expand All @@ -157,7 +157,7 @@ function Inner() {
</div>
<Dialogs />
</div>
</>
</div>
);
}

Expand Down

1 comment on commit ae8cd7c

@vercel
Copy link

@vercel vercel bot commented on ae8cd7c Nov 14, 2024

Choose a reason for hiding this comment

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

Successfully deployed to the following URLs:

cap-web – ./

cap-web-mc-ilroy.vercel.app
cap-web-git-main-mc-ilroy.vercel.app
cap-web-nu.vercel.app
www.cap.so
cap.so

Please sign in to comment.