diff --git a/desktop/public/fonts/CashSans-Bold.woff2 b/desktop/public/fonts/CashSans-Bold.woff2 new file mode 100644 index 0000000000..88b3e47117 Binary files /dev/null and b/desktop/public/fonts/CashSans-Bold.woff2 differ diff --git a/desktop/public/fonts/CashSans-Light.woff2 b/desktop/public/fonts/CashSans-Light.woff2 new file mode 100644 index 0000000000..132239a195 Binary files /dev/null and b/desktop/public/fonts/CashSans-Light.woff2 differ diff --git a/desktop/public/fonts/CashSans-Medium.woff2 b/desktop/public/fonts/CashSans-Medium.woff2 new file mode 100644 index 0000000000..317ba94b2b Binary files /dev/null and b/desktop/public/fonts/CashSans-Medium.woff2 differ diff --git a/desktop/public/fonts/CashSans-Regular.woff2 b/desktop/public/fonts/CashSans-Regular.woff2 new file mode 100644 index 0000000000..68ca177444 Binary files /dev/null and b/desktop/public/fonts/CashSans-Regular.woff2 differ diff --git a/desktop/public/fonts/CashSans-RegularItalic.woff2 b/desktop/public/fonts/CashSans-RegularItalic.woff2 new file mode 100644 index 0000000000..ea0cbda9be Binary files /dev/null and b/desktop/public/fonts/CashSans-RegularItalic.woff2 differ diff --git a/desktop/public/fonts/CashSans-Semibold.woff2 b/desktop/public/fonts/CashSans-Semibold.woff2 new file mode 100644 index 0000000000..81a0514ecc Binary files /dev/null and b/desktop/public/fonts/CashSans-Semibold.woff2 differ diff --git a/desktop/src/features/sidebar/ui/MoreUnreadButton.tsx b/desktop/src/features/sidebar/ui/MoreUnreadButton.tsx index 5ebca7e47e..b59092b95d 100644 --- a/desktop/src/features/sidebar/ui/MoreUnreadButton.tsx +++ b/desktop/src/features/sidebar/ui/MoreUnreadButton.tsx @@ -3,7 +3,7 @@ import type * as React from "react"; import { Button } from "@/shared/ui/button"; const MORE_UNREAD_BUTTON_CLASS = - "h-7 min-h-7 gap-1.5 rounded-full border-0 bg-primary px-2.5 text-[11px] font-medium text-primary-foreground shadow-md hover:bg-primary/90 [&_svg]:size-3.5"; + "h-7 min-h-7 gap-1.5 rounded-full border-0 bg-primary px-2.5 text-[11px] font-normal text-primary-foreground shadow-md hover:bg-primary/90 [&_svg]:size-3.5"; export function MoreUnreadButton({ bottomClassName = "bottom-0", diff --git a/desktop/src/features/sidebar/ui/SidebarSection.tsx b/desktop/src/features/sidebar/ui/SidebarSection.tsx index dc994f8227..802ac6d682 100644 --- a/desktop/src/features/sidebar/ui/SidebarSection.tsx +++ b/desktop/src/features/sidebar/ui/SidebarSection.tsx @@ -170,7 +170,7 @@ export function ChannelMenuButton({ className={cn( !isActive && hasUnread && - "font-semibold text-sidebar-foreground hover:text-sidebar-foreground", + "text-sidebar-foreground hover:text-sidebar-foreground", !isActive && isMuted && !hasUnread && "opacity-50", )} data-channel-id={channel.id} diff --git a/desktop/src/shared/styles/globals.css b/desktop/src/shared/styles/globals.css index 0d637144cc..d876c74436 100644 --- a/desktop/src/shared/styles/globals.css +++ b/desktop/src/shared/styles/globals.css @@ -2,6 +2,54 @@ @import "tw-animate-css"; @config "../../../tailwind.config.js"; +@font-face { + font-family: "Cash Sans"; + src: url("/fonts/CashSans-Regular.woff2") format("woff2"); + font-weight: 400; + font-style: normal; + font-display: swap; +} + +@font-face { + font-family: "Cash Sans"; + src: url("/fonts/CashSans-RegularItalic.woff2") format("woff2"); + font-weight: 400; + font-style: italic; + font-display: swap; +} + +@font-face { + font-family: "Cash Sans"; + src: url("/fonts/CashSans-Light.woff2") format("woff2"); + font-weight: 300; + font-style: normal; + font-display: swap; +} + +@font-face { + font-family: "Cash Sans"; + src: url("/fonts/CashSans-Medium.woff2") format("woff2"); + font-weight: 500; + font-style: normal; + font-display: swap; +} + +@font-face { + font-family: "Cash Sans"; + src: url("/fonts/CashSans-Semibold.woff2") format("woff2"); + font-weight: 600; + font-style: normal; + font-display: swap; +} + +@font-face { + font-family: "Cash Sans"; + src: url("/fonts/CashSans-Bold.woff2") format("woff2"); + font-weight: 700; + font-style: normal; + font-display: swap; +} + /* ── Tiptap rich-text composer ──────────────────────────────────────── */ .rich-text-composer .tiptap { outline: none; @@ -302,7 +350,19 @@ body { @apply bg-background text-foreground antialiased; - font-family: "Geist", "Avenir Next", "Segoe UI", sans-serif; + font-family: + "Cash Sans", system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", + Roboto, sans-serif; + font-feature-settings: + "rlig" 1, + "calt" 1; + } + + input, + textarea, + select, + button { + font-family: inherit; } /* diff --git a/desktop/src/shared/ui/sidebar.tsx b/desktop/src/shared/ui/sidebar.tsx index 7e567ad048..9d6e6e0553 100644 --- a/desktop/src/shared/ui/sidebar.tsx +++ b/desktop/src/shared/ui/sidebar.tsx @@ -448,7 +448,7 @@ const SidebarGroupLabel = React.forwardRef< ref={ref} data-sidebar="group-label" className={cn( - "flex h-8 shrink-0 items-center rounded-md px-2 text-xs font-medium text-sidebar-foreground/70 outline-hidden ring-sidebar-ring transition-[margin,opacity] duration-200 ease-linear focus-visible:ring-2 [&>svg]:size-4 [&>svg]:shrink-0", + "flex h-8 shrink-0 items-center rounded-md px-2 text-xs font-normal text-sidebar-foreground/70 outline-hidden ring-sidebar-ring transition-[margin,opacity] duration-200 ease-linear focus-visible:ring-2 [&>svg]:size-4 [&>svg]:shrink-0", "group-data-[collapsible=icon]:-mt-8 group-data-[collapsible=icon]:opacity-0", className, )} @@ -521,7 +521,7 @@ const SidebarMenuItem = React.forwardRef< SidebarMenuItem.displayName = "SidebarMenuItem"; const sidebarMenuButtonVariants = cva( - "peer/menu-button flex w-full items-center gap-2 overflow-hidden rounded-md p-2 text-left text-sm outline-hidden ring-sidebar-ring transition-[width,height,padding] hover:bg-sidebar-accent hover:text-sidebar-accent-foreground focus-visible:ring-2 active:bg-sidebar-accent active:text-sidebar-accent-foreground disabled:pointer-events-none disabled:opacity-50 group-has-[[data-sidebar=menu-action]]/menu-item:pr-8 aria-disabled:pointer-events-none aria-disabled:opacity-50 data-[active=true]:bg-sidebar-primary data-[active=true]:font-semibold data-[active=true]:text-sidebar-primary-foreground data-[active=true]:shadow-xs data-[active=true]:hover:bg-sidebar-primary data-[active=true]:hover:text-sidebar-primary-foreground data-[state=open]:hover:bg-sidebar-accent data-[state=open]:hover:text-sidebar-accent-foreground group-data-[collapsible=icon]:!size-8 group-data-[collapsible=icon]:!p-2 [&>span:last-child]:truncate [&>svg]:size-4 [&>svg]:shrink-0", + "peer/menu-button flex w-full items-center gap-2 overflow-hidden rounded-md p-2 text-left text-sm font-normal leading-normal outline-hidden ring-sidebar-ring transition-[width,height,padding] hover:bg-sidebar-accent hover:text-sidebar-accent-foreground focus-visible:ring-2 active:bg-sidebar-accent active:text-sidebar-accent-foreground disabled:pointer-events-none disabled:opacity-50 group-has-[[data-sidebar=menu-action]]/menu-item:pr-8 aria-disabled:pointer-events-none aria-disabled:opacity-50 data-[active=true]:bg-sidebar-primary data-[active=true]:font-normal data-[active=true]:text-sidebar-primary-foreground data-[active=true]:shadow-xs data-[active=true]:hover:bg-sidebar-primary data-[active=true]:hover:text-sidebar-primary-foreground data-[state=open]:hover:bg-sidebar-accent data-[state=open]:hover:text-sidebar-accent-foreground group-data-[collapsible=icon]:!size-8 group-data-[collapsible=icon]:!p-2 [&>span:last-child]:truncate [&>svg]:size-4 [&>svg]:shrink-0", { variants: { variant: { @@ -640,7 +640,7 @@ const SidebarMenuBadge = React.forwardRef< ref={ref} data-sidebar="menu-badge" className={cn( - "pointer-events-none absolute right-1 flex h-5 min-w-5 select-none items-center justify-center rounded-md px-1 text-xs font-medium tabular-nums text-sidebar-foreground", + "pointer-events-none absolute right-1 flex h-5 min-w-5 select-none items-center justify-center rounded-md px-1 text-xs font-normal tabular-nums text-sidebar-foreground", "peer-hover/menu-button:text-sidebar-accent-foreground peer-data-[active=true]/menu-button:text-sidebar-primary-foreground", "peer-data-[size=sm]/menu-button:top-1", "peer-data-[size=default]/menu-button:top-1.5", @@ -732,7 +732,7 @@ const SidebarMenuSubButton = React.forwardRef< data-active={isActive} className={cn( "flex h-7 min-w-0 items-center gap-2 overflow-hidden rounded-md px-2 text-sidebar-foreground outline-hidden ring-sidebar-ring hover:bg-sidebar-accent hover:text-sidebar-accent-foreground focus-visible:ring-2 active:bg-sidebar-accent active:text-sidebar-accent-foreground disabled:pointer-events-none disabled:opacity-50 aria-disabled:pointer-events-none aria-disabled:opacity-50 [&>span:last-child]:truncate [&>svg]:size-4 [&>svg]:shrink-0 [&>svg]:text-sidebar-accent-foreground data-[active=true]:[&>svg]:text-sidebar-primary-foreground", - "data-[active=true]:bg-sidebar-primary data-[active=true]:font-semibold data-[active=true]:text-sidebar-primary-foreground data-[active=true]:hover:bg-sidebar-primary data-[active=true]:hover:text-sidebar-primary-foreground", + "data-[active=true]:bg-sidebar-primary data-[active=true]:font-normal data-[active=true]:text-sidebar-primary-foreground data-[active=true]:hover:bg-sidebar-primary data-[active=true]:hover:text-sidebar-primary-foreground", size === "sm" && "text-xs", size === "md" && "text-sm", "group-data-[collapsible=icon]:hidden",