Skip to content

Commit a9f83ac

Browse files
fix: minor styling issues (calcom#25421)
* style: remove unwanted bg * fix: adjust FAB positioning * style: skeleton improvements * fix: reset password button * fix: remove left border from remove icon * style: improve fields * style: wrap base form styles into layer base * style: remove email-specific focus styles from TextField component
1 parent ff1533d commit a9f83ac

9 files changed

Lines changed: 33 additions & 36 deletions

File tree

apps/web/app/(use-page-wrapper)/(main-nav)/ShellMainAppDir.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ export function ShellMainAppDir(props: LayoutProps) {
4545
className={classNames(
4646
props.backPath
4747
? "relative"
48-
: "pwa:bottom-[max(7rem,_calc(5rem_+_env(safe-area-inset-bottom)))] fixed bottom-32 z-40 ltr:right-4 rtl:left-4 md:z-auto md:ltr:right-0 md:rtl:left-0",
48+
: "pwa:bottom-[max(7rem,_calc(5rem_+_env(safe-area-inset-bottom)))] fixed bottom-20 z-40 ltr:right-4 rtl:left-4 md:z-auto md:ltr:right-0 md:rtl:left-0",
4949
"shrink-0 [-webkit-app-region:no-drag] md:relative md:bottom-auto md:right-auto"
5050
)}>
5151
{props.CTA}

apps/web/components/AddToHomescreen.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ export default function AddToHomescreen() {
1818
<div className="rounded-lg p-2 shadow-lg sm:p-3" style={{ background: "#2F333D" }}>
1919
<div className="flex flex-wrap items-center justify-between">
2020
<div className="flex w-0 flex-1 items-center">
21-
<span className="bg-brand/30 text-brandcontrast dark:bg-darkmodebrand/30 dark:text-darkmodebrandcontrast flex rounded-lg p-2">
21+
<span className="text-brandcontrast dark:bg-darkmodebrand/30 dark:text-darkmodebrandcontrast flex rounded-lg p-2">
2222
<svg
2323
className="h-7 w-7 fill-current text-[#5B93F9]"
2424
xmlns="http://www.w3.org/2000/svg"

apps/web/components/booking/SkeletonLoader.tsx

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@ function SkeletonItem() {
4747
{/* Event title */}
4848
<SkeletonText className="h-5 w-36" />
4949
{/* Event description */}
50-
<SkeletonText className="h-4 w-48" />
50+
<SkeletonText className="h-4 w-full max-w-48" />
5151
{/* Attendees */}
52-
<SkeletonText className="h-4 w-56" />
52+
<SkeletonText className="h-4 w-full max-w-56" />
5353
</div>
5454

5555
{/* Action buttons - only visible on larger screens */}
@@ -58,11 +58,6 @@ function SkeletonItem() {
5858
<SkeletonText className="h-9 w-20 rounded-md" />
5959
<SkeletonText className="h-9 w-9 rounded-md" />
6060
</div>
61-
62-
{/* Mobile menu button */}
63-
<div className="ml-4 flex shrink-0 sm:hidden">
64-
<SkeletonText className="h-9 w-9 rounded-md" />
65-
</div>
6661
</li>
6762
);
6863
}

apps/web/modules/auth/forgot-password/forgot-password-view.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,9 +127,9 @@ export default function ForgotPassword(props: PageProps) {
127127
/>
128128
<div className="stack-y-2">
129129
<Button
130-
className="w-full justify-center bg-white hover:bg-black hover:text-white"
130+
className="w-full justify-center"
131131
type="submit"
132-
color="primary"
132+
color="secondary"
133133
disabled={loading}
134134
aria-label={t("request_password_reset")}
135135
loading={loading}>

apps/web/styles/globals.css

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -127,25 +127,27 @@ html.todesktop.dark {
127127
* Override the default tailwindcss-forms styling (default is: 'colors.blue.600')
128128
* @see: https://github.com/tailwindlabs/tailwindcss-forms/issues/14#issuecomment-1005376006
129129
*/
130-
[type="text"]:focus,
131-
[type="email"]:focus,
132-
[type="url"]:focus,
133-
[type="password"]:focus,
134-
[type="number"]:focus,
135-
[type="date"]:focus,
136-
[type="datetime-local"]:focus,
137-
[type="month"]:focus,
138-
[type="search"]:focus,
139-
[type="tel"]:focus,
140-
[type="checkbox"]:focus,
141-
[type="radio"]:focus,
142-
[type="time"]:focus,
143-
[type="week"]:focus,
144-
[multiple]:focus,
145-
textarea:focus,
146-
select:focus {
147-
--tw-ring-color: var(--brand-color);
148-
border-color: var(--brand-color);
130+
@layer base {
131+
[type="text"]:focus,
132+
[type="email"]:focus,
133+
[type="url"]:focus,
134+
[type="password"]:focus,
135+
[type="number"]:focus,
136+
[type="date"]:focus,
137+
[type="datetime-local"]:focus,
138+
[type="month"]:focus,
139+
[type="search"]:focus,
140+
[type="tel"]:focus,
141+
[type="checkbox"]:focus,
142+
[type="radio"]:focus,
143+
[type="time"]:focus,
144+
[type="week"]:focus,
145+
[multiple]:focus,
146+
textarea:focus,
147+
select:focus {
148+
--tw-ring-color: var(--brand-color);
149+
border-color: var(--brand-color);
150+
}
149151
}
150152

151153
@layer components {

packages/features/eventtypes/components/SkeletonLoader.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ function TabsSkeletonLoader() {
4242
<SkeletonAvatar className="mb-1 mr-1 h-4 w-4 rounded-full" />
4343
<SkeletonText className="h-4 w-16" />
4444
</div>
45-
<div className="inline-flex h-fit items-center justify-center whitespace-nowrap rounded-md p-2">
45+
<div className="inline-flex h-fit items-center justify-center whitespace-nowrap rounded-md p-1">
4646
<SkeletonAvatar className="mb-1 mr-1 h-4 w-4 rounded-full" />
4747
<SkeletonText className="h-4 w-16" />
4848
</div>

packages/features/eventtypes/components/locations/Locations.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ const Locations: React.FC<LocationsProps> = ({
245245
<Icon
246246
name="x"
247247
className={classNames(
248-
"border-l hover:text-emphasis text-subtle h-4 w-4",
248+
"hover:text-emphasis text-subtle h-4 w-4",
249249
customClassNames?.removeLocationIcon
250250
)}
251251
/>

packages/ui/components/editor/Editor.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ export const Editor = (props: TextEditorProps) => {
7272
</label>
7373
)}
7474
<LexicalComposer initialConfig={{ ...editorConfig }}>
75-
<div className="editor-container hover:border-emphasis focus-within:ring-brand-default rounded-lg! p-0 transition focus-within:ring-2 focus-within:ring-offset-0">
75+
<div className="editor-container rounded-lg! p-0 transition focus-within:shadow-outline-gray-focused focus-within:border-emphasis!">
7676
<ToolbarPlugin
7777
getText={props.getText}
7878
setText={props.setText}

packages/ui/components/form/inputs/TextField.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ export const inputStyles = cva(
2525

2626
// States
2727
"hover:border-emphasis",
28+
"focus:border-emphasis",
2829
"focus:ring-0",
2930
"focus:shadow-outline-gray-focused",
3031

@@ -37,7 +38,7 @@ export const inputStyles = cva(
3738
"shadow-outline-gray-rested",
3839

3940
// Transitions
40-
"transition",
41+
"transition-all",
4142
],
4243
{
4344
variants: {
@@ -158,7 +159,7 @@ export const InputField = forwardRef<HTMLInputElement, InputFieldProps>(function
158159
className={classNames(
159160
inputStyles({ size }),
160161
"group relative mb-1 flex min-w-0 items-center gap-1",
161-
"[&:focus-within]:border-subtle [&:focus-within]:ring-brand-default focus-within:ring-2",
162+
"focus-within:shadow-outline-gray-focused focus-within:border-emphasis",
162163
"[&:has(:disabled)]:bg-subtle [&:has(:disabled)]:hover:border-default [&:has(:disabled)]:cursor-not-allowed",
163164
inputIsFullWidth && "w-full"
164165
)}>
@@ -226,7 +227,6 @@ export const InputField = forwardRef<HTMLInputElement, InputFieldProps>(function
226227
size={size}
227228
className={classNames(
228229
className,
229-
type === "email" && "focus:border-subtle focus:ring-brand-default focus:ring-2",
230230
"disabled:bg-subtle disabled:hover:border-subtle disabled:cursor-not-allowed"
231231
)}
232232
{...passThrough}

0 commit comments

Comments
 (0)