Skip to content

Commit 9070b2f

Browse files
committed
fix themed card text and control corners
1 parent 9c518bb commit 9070b2f

17 files changed

Lines changed: 107 additions & 29 deletions

‎app/joinrequeststatus/page.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ export default async function JoinRequestStatusPage() {
293293
<form action={submitJoinRequest}>
294294
<button
295295
type="submit"
296-
className="theme-control mt-1 h-10 bg-brand-text px-5 text-paragraph-1 font-semibold text-brand-foreground lg:h-11 lg:px-6"
296+
className="theme-control mt-1 h-10 rounded bg-brand-text px-5 text-paragraph-1 font-semibold text-brand-foreground lg:h-11 lg:px-6"
297297
>
298298
Submit a request
299299
</button>

‎app/layout.tsx‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ import NotificationToastProvider from "@/components/notifications/NotificationTo
88
import { getSlugFromHost } from "@/lib/clientAuthUtils";
99
import { OrganizationsService } from "@/lib/services/OrganizationService";
1010
import { OrganizationConfigService } from "@/lib/services/OrganizationConfigService";
11-
import { getOrganizationThemeCssVariables } from "@/lib/theme";
11+
import { OrganizationConfigKey } from "@/lib/schema";
12+
import { getOrganizationThemeCssVariables, isCornerStyle } from "@/lib/theme";
1213
import { themeFontVariableClassNames } from "@/app/fonts";
1314

1415
export default async function RootLayout({
@@ -24,13 +25,19 @@ export default async function RootLayout({
2425
: {};
2526
const themeVariables = getOrganizationThemeCssVariables(themeConfig);
2627
const hasConfiguredTheme = Object.keys(themeConfig).length > 0;
28+
const configuredCornerStyle = themeConfig[OrganizationConfigKey.CornerStyle];
29+
const cornerStyle =
30+
configuredCornerStyle && isCornerStyle(configuredCornerStyle)
31+
? configuredCornerStyle
32+
: undefined;
2733

2834
return (
2935
<html
3036
lang="en"
3137
className={themeFontVariableClassNames}
3238
style={themeVariables as CSSProperties}
3339
data-organization-theme={hasConfiguredTheme ? "custom" : undefined}
40+
data-corner-style={cornerStyle}
3441
>
3542
<body>
3643
<ActiveOrganizationSync />

‎app/media/page.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ function FilterSelect({
2424
<select
2525
aria-label={label}
2626
defaultValue=""
27-
className={`theme-control h-11 min-w-52 appearance-none border px-4 pr-10 text-paragraph-2 ${
27+
className={`theme-control h-11 min-w-52 appearance-none rounded-xl border px-4 pr-10 text-paragraph-2 ${
2828
isDark
2929
? "border-grey-text-strong bg-grey-text-strong text-media-inverse"
3030
: "border-grey-stroke-strong bg-media-surface-soft text-grey-text-strong"

‎components/HoursTab.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ export default function HoursTab({ events }: HoursTabProps) {
107107
</p>
108108

109109
<div className="flex items-center gap-6">
110-
<div className="theme-control flex items-center gap-2 border border-page-text/20 px-4 py-2">
110+
<div className="theme-control flex items-center gap-2 rounded-md border border-page-text/20 px-4 py-2">
111111
<input
112112
type="text"
113113
placeholder="Enter text to search"

‎components/MembersTable.tsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -574,7 +574,7 @@ export default function MembersTable({
574574

575575
{/* Search bar + Settings button */}
576576
<div className="flex items-center gap-3">
577-
<div className="theme-control flex h-10.5 flex-1 items-center overflow-hidden border border-grey-stroke-weak">
577+
<div className="theme-control flex h-10.5 flex-1 items-center overflow-hidden rounded-md border border-grey-stroke-weak">
578578
<input
579579
type="text"
580580
placeholder="Enter text to search"
@@ -597,7 +597,7 @@ export default function MembersTable({
597597
setSettingsOpen(opening);
598598
if (opening) setPendingVisibility(new Set(visibleColumns));
599599
}}
600-
className="theme-control flex h-10.5 shrink-0 cursor-pointer items-center gap-1 border border-brand-stroke-strong px-2 shadow-inner"
600+
className="theme-control flex h-10.5 shrink-0 cursor-pointer items-center gap-1 rounded border border-brand-stroke-strong px-2 shadow-inner"
601601
>
602602
<span className="font-semibold text-desktop-paragraph-2 text-brand-text whitespace-nowrap px-1">
603603
Settings
@@ -828,7 +828,7 @@ export default function MembersTable({
828828
aria-label="Previous page"
829829
disabled={page <= 1}
830830
onClick={() => goToPage(page - 1)}
831-
className="theme-control flex cursor-pointer items-center gap-1 border border-grey-stroke-weak px-3 py-1.5 text-mobile-paragraph-2 text-grey-text-weak focus:outline-none disabled:cursor-not-allowed disabled:opacity-40"
831+
className="theme-control flex cursor-pointer items-center gap-1 rounded border border-grey-stroke-weak px-3 py-1.5 text-mobile-paragraph-2 text-grey-text-weak focus:outline-none disabled:cursor-not-allowed disabled:opacity-40"
832832
>
833833
<BogIcon name="caret-left" size={12} weight="bold" />
834834
Previous
@@ -840,7 +840,7 @@ export default function MembersTable({
840840
aria-label="Next page"
841841
disabled={page >= totalPages}
842842
onClick={() => goToPage(page + 1)}
843-
className="theme-control flex cursor-pointer items-center gap-1 border border-grey-stroke-weak px-3 py-1.5 text-mobile-paragraph-2 text-grey-text-weak focus:outline-none disabled:cursor-not-allowed disabled:opacity-40"
843+
className="theme-control flex cursor-pointer items-center gap-1 rounded border border-grey-stroke-weak px-3 py-1.5 text-mobile-paragraph-2 text-grey-text-weak focus:outline-none disabled:cursor-not-allowed disabled:opacity-40"
844844
>
845845
Next
846846
<BogIcon name="caret-right" size={12} weight="bold" />

‎components/RequestsPanel.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,7 @@ export default function RequestsPanel({
363363
type="button"
364364
onClick={() => void refresh()}
365365
disabled={isRefreshing}
366-
className="theme-control border border-grey-stroke-strong px-4 py-2 text-paragraph-2 text-grey-text-strong hover:bg-grey-fill-weaker disabled:opacity-50"
366+
className="theme-control rounded border border-grey-stroke-strong px-4 py-2 text-paragraph-2 text-grey-text-strong hover:bg-grey-fill-weaker disabled:opacity-50"
367367
>
368368
Try again
369369
</button>

‎components/dashboard/DashboardLayoutBuilder.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ export default function DashboardLayoutBuilder({
258258
onClick={handleDiscard}
259259
disabled={!hasChanges}
260260
type="button"
261-
className={`theme-control flex items-center gap-1 px-2 py-2 text-paragraph-2 font-semibold transition-colors ${
261+
className={`theme-control flex items-center gap-1 rounded px-2 py-2 text-paragraph-2 font-semibold transition-colors ${
262262
hasChanges
263263
? "text-brand-text hover:opacity-80"
264264
: "text-grey-off-state"
@@ -278,7 +278,7 @@ export default function DashboardLayoutBuilder({
278278
onClick={handleSave}
279279
disabled={!hasChanges || isSaving}
280280
type="button"
281-
className={`theme-control px-3 py-2 text-paragraph-2 font-semibold transition-colors ${
281+
className={`theme-control rounded px-3 py-2 text-paragraph-2 font-semibold transition-colors ${
282282
hasChanges
283283
? "bg-brand-text text-brand-foreground hover:opacity-90"
284284
: "bg-grey-fill-weak text-white"

‎components/dashboard/widgets/NotificationsWidget.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ export default function NotificationsDashboardWidget() {
6868
</p>
6969
<button
7070
type="button"
71-
className="theme-control bg-brand-text px-4 py-2 text-paragraph-2 font-semibold text-brand-foreground hover:opacity-90"
71+
className="theme-control rounded bg-brand-text px-4 py-2 text-paragraph-2 font-semibold text-brand-foreground hover:opacity-90"
7272
onClick={() => void refreshNotifications()}
7373
>
7474
Retry

‎components/events/EventAdminActions.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ export default function EventAdminActions({
4141
<div className="flex items-center gap-3">
4242
<Link
4343
href={`/events/${eventId}/edit`}
44-
className="theme-control inline-flex items-center border border-brand-stroke-strong bg-page-bg px-4 py-2 text-paragraph-2 font-semibold text-brand-text"
44+
className="theme-control inline-flex items-center rounded border border-brand-stroke-strong bg-page-bg px-4 py-2 text-paragraph-2 font-semibold text-brand-text"
4545
>
4646
Edit
4747
</Link>

‎components/events/EventsPageClient.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ export default function EventsPageClient({
145145
{canCreateEvents ? (
146146
<Link
147147
href="/events/create"
148-
className="theme-control inline-flex shrink-0 items-center justify-center bg-brand-text px-4 py-2 text-center text-paragraph-1 font-semibold text-brand-foreground hover:opacity-90"
148+
className="theme-control inline-flex shrink-0 items-center justify-center rounded bg-brand-text px-4 py-2 text-center text-paragraph-1 font-semibold text-brand-foreground hover:opacity-90"
149149
>
150150
Create event
151151
</Link>
@@ -170,7 +170,7 @@ export default function EventsPageClient({
170170
<div className="mt-16 flex flex-col gap-4 sm:flex-row sm:items-center sm:justify-between">
171171
<form
172172
onSubmit={handleSearchSubmit}
173-
className="theme-control flex min-h-9 min-w-0 flex-1 items-stretch overflow-hidden border border-grey-stroke-weak bg-page-bg sm:max-w-xl"
173+
className="theme-control flex min-h-9 min-w-0 flex-1 items-stretch overflow-hidden rounded-md border border-grey-stroke-weak bg-page-bg sm:max-w-xl"
174174
>
175175
<label className="flex min-w-0 flex-1 items-center px-3">
176176
<span className="sr-only">Search events</span>

0 commit comments

Comments
 (0)