Skip to content

Commit 0a5b3f6

Browse files
committed
Merge branch 'feat/calendar_sync_cache' of https://github.com/calcom/cal.com into feat/calendar_sync_cache
2 parents 9d564e4 + 3928bbc commit 0a5b3f6

5 files changed

Lines changed: 14 additions & 13 deletions

File tree

.changeset/ninety-colts-search.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

packages/features/ee/api-keys/components/ApiKeyDialogForm.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ export default function ApiKeyDialogForm({
157157
{defaultValues ? t("edit_api_key") : t("create_api_key")}
158158
</h2>
159159
{IS_CALCOM ? (
160-
<div className="mt-4 block gap-2 sm:flex">
160+
<div className="mt-4 flex flex-col gap-2 sm:flex-row">
161161
<div className="border-emphasis relative flex w-full items-start rounded-[10px] border p-4 text-sm">
162162
{t("api_key_modal_subtitle")}
163163
</div>
@@ -178,7 +178,7 @@ export default function ApiKeyDialogForm({
178178
<Controller
179179
name="note"
180180
control={form.control}
181-
render={({ field: { onChange, value } }) => (
181+
render={({ field: { value } }) => (
182182
<TextField
183183
name="note"
184184
label={t("personal_note")}
@@ -211,7 +211,7 @@ export default function ApiKeyDialogForm({
211211
</div>
212212
<Controller
213213
name="expiresAt"
214-
render={({ field: { onChange, value } }) => {
214+
render={({ field: { onChange } }) => {
215215
const defaultValue = expiresAtOptions[1];
216216

217217
return (

packages/features/settings/appDir/SettingsHeader.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ export default function Header({
2626
<div>
2727
<header
2828
className={classNames(
29-
"border-subtle mx-auto block justify-between sm:flex",
29+
"border-subtle mx-auto flex justify-between",
3030
borderInShellHeader && "rounded-t-lg border px-4 py-6 sm:px-6",
3131
borderInShellHeader === undefined && "mb-8 border-b pb-8"
3232
)}>
33-
<div className="flex w-full flex-col gap-2 sm:flex-row sm:items-center">
34-
<div className="flex w-full items-center">
33+
<div className="flex w-full items-center justify-between gap-2">
34+
<div className="flex items-center">
3535
{backButton && (
3636
<a href="javascript:history.back()">
3737
<Icon name="arrow-left" className="mr-7" />
@@ -52,7 +52,7 @@ export default function Header({
5252
)}
5353
</div>
5454
</div>
55-
<div className={classNames("flex-shrink-0 sm:ms-auto", ctaClassName)}>{CTA}</div>
55+
<div className={classNames("flex-shrink-0", ctaClassName)}>{CTA}</div>
5656
</div>
5757
</header>
5858
<Suspense fallback={<Icon name="loader" className="mx-auto my-5 animate-spin" />}>{children}</Suspense>

packages/platform/atoms/CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
## 1.1.2
22

3+
## 1.10.0
4+
5+
### Minor Changes
6+
7+
- [#24001](https://github.com/calcom/cal.com/pull/24001) [`752cfa6`](https://github.com/calcom/cal.com/commit/752cfa6bf98a826e8f49a590c8b0e70c9007ebfc) Thanks [@ThyMinimalDev](https://github.com/ThyMinimalDev)! - Reduced bundle size by removing unnecessary types
8+
39
## 1.9.0
410

511
### Minor Changes

packages/platform/atoms/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"type": "module",
55
"description": "Customizable UI components to integrate scheduling into your product.",
66
"authors": "Cal.com, Inc.",
7-
"version": "1.9.0",
7+
"version": "1.10.0",
88
"scripts": {
99
"dev": "yarn vite build --watch & npx tailwindcss -i ./globals.css -o ./globals.min.css --postcss --minify --watch",
1010
"build": "NODE_OPTIONS='--max_old_space_size=12288' rm -rf dist && yarn vite build && npx tailwindcss -i ./globals.css -o ./globals.min.css --postcss --minify",

0 commit comments

Comments
 (0)