Upgrade Tailwind to v4 (#491)

apps/yaak-client/commands/openFolderSettings.tsx

@@ -10,7 +10,7 @@ export function openFolderSettings(folderId: string, tab?: FolderSettingsTab) {
     id: "folder-settings",
     title: null,
     size: "lg",
-    className: "h-[50rem]",
+    className: "h-200",
     noPadding: true,
     render: () => <FolderSettingsDialog folderId={folderId} tab={tab} />,
   });

apps/yaak-client/components/BinaryFileEditor.tsx

@@ -38,7 +38,7 @@ export function BinaryFileEditor({
     <VStack space={2}>
       <SelectFile onChange={handleChange} filePath={filePath} />
       {filePath != null && mimeType !== contentType && !ignoreContentType.value && (
-        <Banner className="mt-3 !py-5">
+        <Banner className="mt-3 py-5!">
           <div className="mb-4 text-center">
             <div>Set Content-Type header</div>
             <InlineCode>{mimeType}</InlineCode> for current request?

apps/yaak-client/components/CloneGitRepositoryDialog.tsx

@@ -108,7 +108,7 @@ export function CloneGitRepositoryDialog({ hide }: Props) {
         rightSlot={
           <IconButton
             size="xs"
-            className="mr-0.5 !h-auto my-0.5"
+            className="mr-0.5 h-auto! my-0.5"
             icon="folder"
             title="Browse"
             onClick={handleSelectDirectory}

apps/yaak-client/components/ColorIndicator.tsx

@@ -11,7 +11,7 @@ export function ColorIndicator({ color, onClick, className }: Props) {
   const style: CSSProperties = { backgroundColor: color ?? undefined };
   const finalClassName = classNames(
     className,
-    "inline-block w-[0.75em] h-[0.75em] rounded-full mr-1.5 border border-transparent flex-shrink-0",
+    "inline-block w-[0.75em] h-[0.75em] rounded-full mr-1.5 border border-transparent shrink-0",
   );
 
   if (onClick) {

apps/yaak-client/components/CommandPaletteDialog.tsx

@@ -439,7 +439,7 @@ export function CommandPaletteDialog({ onClose }: { onClose: () => void }) {
           name="command"
           label="Command"
           placeholder="Search or type a command"
-          className="font-sans !text-base"
+          className="font-sans text-base!"
           defaultValue={command}
           onChange={handleSetCommand}
           onKeyDownCapture={handleKeyDown}
@@ -448,7 +448,7 @@ export function CommandPaletteDialog({ onClose }: { onClose: () => void }) {
       <div className="h-full px-1.5 overflow-y-auto pt-2 pb-1">
         {filteredGroups.map((g) => (
           <div key={g.key} className="mb-1.5 w-full">
-            <Heading level={2} className="!text-xs uppercase px-1.5 h-sm flex items-center">
+            <Heading level={2} className="text-xs! uppercase px-1.5 h-sm flex items-center">
               {g.label}
             </Heading>
             {g.items.map((v) => (
@@ -491,7 +491,7 @@ function CommandPaletteItem({
       color="custom"
       justify="start"
       className={classNames(
-        "w-full h-sm flex items-center rounded px-1.5",
+        "w-full h-sm flex items-center rounded-sm px-1.5",
         "hover:text-text",
         active && "bg-surface-highlight",
         !active && "text-text-subtle",

apps/yaak-client/components/CookieDialog.tsx

@@ -155,7 +155,7 @@ export const CookieDialog = ({ cookieJarId }: Props) => {
           rightSlot={
             filter.length > 0 && (
               <IconButton
-                className="!bg-transparent !h-auto min-h-full opacity-50 hover:opacity-100 -mr-1"
+                className="bg-transparent! h-auto! min-h-full opacity-50 hover:opacity-100 -mr-1"
                 icon="x"
                 title="Clear filter"
                 onClick={() => {
@@ -239,7 +239,7 @@ export const CookieDialog = ({ cookieJarId }: Props) => {
                         <TableCell className={classNames("pl-2", isSelected && "rounded-l")}>
                           {c.name}
                         </TableCell>
-                        <TruncatedWideTableCell className="min-w-[10rem]">
+                        <TruncatedWideTableCell className="min-w-40">
                           {c.value}
                         </TruncatedWideTableCell>
                         <TableCell>{cookieDomain(c)}</TableCell>
@@ -547,7 +547,7 @@ function CookieEditor({
 }
 
 function CookieKeyValueRow({ labelClassName, ...props }: ComponentProps<typeof KeyValueRow>) {
-  return <KeyValueRow labelClassName={classNames("w-[7rem]", labelClassName)} {...props} />;
+  return <KeyValueRow labelClassName={classNames("w-28", labelClassName)} {...props} />;
 }
 
 function CookieTextInput({
@@ -589,7 +589,7 @@ function CookieTextarea({ onChange, value }: { onChange: (value: string) => void
     <textarea
       autoCapitalize="off"
       autoCorrect="off"
-      className={classNames(cookieInputClassName, "min-h-[5rem] resize-y")}
+      className={classNames(cookieInputClassName, "min-h-20 resize-y")}
       onChange={(event) => onChange(event.target.value)}
       value={value}
     />
@@ -600,7 +600,7 @@ const NEW_COOKIE_KEY = "__new-cookie__";
 const NON_EMPTY_INPUT_PATTERN = ".*\\S.*";
 const cookieInputClassName = classNames(
   "x-theme-input w-full min-w-0 min-h-sm rounded-md bg-transparent",
-  "border border-border-subtle outline-none",
+  "border border-border-subtle outline-hidden",
   "px-2 text-xs font-mono cursor-text placeholder:text-placeholder",
   "focus:border-border-focus invalid:border-danger",
   "disabled:opacity-disabled disabled:border-dotted",

apps/yaak-client/components/DnsOverridesEditor.tsx

@@ -75,7 +75,7 @@ export function DnsOverridesEditor({ workspace }: Props) {
     <VStack space={3} className="pb-3">
       <div className="text-text-subtle text-sm">
         Override DNS resolution for specific hostnames. This works like{" "}
-        <code className="text-text-subtlest bg-surface-highlight px-1 rounded">/etc/hosts</code> but
+        <code className="text-text-subtlest bg-surface-highlight px-1 rounded-sm">/etc/hosts</code> but
         only for requests made from this workspace.
       </div>
 

apps/yaak-client/components/DropMarker.tsx

@@ -23,8 +23,8 @@ export const DropMarker = memo(
         <div
           className={classNames(
             "absolute bg-primary rounded-full",
-            orientation === "horizontal" && "left-2 right-2 -bottom-[0.1rem] h-[0.2rem]",
-            orientation === "vertical" && "-left-[0.1rem] top-0 bottom-0 w-[0.2rem]",
+            orientation === "horizontal" && "left-2 right-2 bottom-[-0.1rem] h-[0.2rem]",
+            orientation === "vertical" && "left-[-0.1rem] top-0 bottom-0 w-[0.2rem]",
           )}
         />
       </div>

apps/yaak-client/components/DynamicForm.tsx

@@ -204,7 +204,7 @@ function FormInputs<T extends Record<string, JsonPrimitive>>({
               <div key={i + stateKey}>
                 <DetailsBanner
                   summary={input.label}
-                  className={classNames("!mb-auto", disabled && "opacity-disabled")}
+                  className={classNames("mb-auto!", disabled && "opacity-disabled")}
                 >
                   <div className="mt-3">
                     <FormInputsStack
@@ -300,7 +300,7 @@ function TextArg({
     onChange,
     name: arg.name,
     multiLine: arg.multiLine,
-    className: arg.multiLine ? "min-h-[4rem]" : undefined,
+    className: arg.multiLine ? "min-h-16" : undefined,
     defaultValue: value === DYNAMIC_FORM_NULL_ARG ? arg.defaultValue : value,
     required: !arg.optional,
     disabled: arg.disabled,
@@ -359,7 +359,7 @@ function EditorArg({
         className={classNames(
           "border border-border rounded-md overflow-hidden px-2 py-1",
           "focus-within:border-border-focus",
-          !arg.rows && "max-h-[10rem]", // So it doesn't take up too much space
+          !arg.rows && "max-h-40", // So it doesn't take up too much space
         )}
         style={arg.rows ? { height: `${arg.rows * 1.4 + 0.75}rem` } : undefined}
       >
@@ -372,7 +372,7 @@ function EditorArg({
           onChange={onChange}
           hideGutter
           heightMode="auto"
-          className="min-h-[3rem]"
+          className="min-h-12"
           defaultValue={value === DYNAMIC_FORM_NULL_ARG ? arg.defaultValue : value}
           placeholder={arg.placeholder ?? undefined}
           autocompleteFunctions={autocompleteFunctions}
@@ -392,7 +392,7 @@ function EditorArg({
                     id: "id",
                     size: "full",
                     title: arg.readOnly ? "View Value" : "Edit Value",
-                    className: "!max-w-[50rem] !max-h-[60rem]",
+                    className: "max-w-200! max-h-240!",
                     description: arg.label && (
                       <Label
                         htmlFor={id}

apps/yaak-client/components/EnvironmentActionsDropdown.tsx

@@ -62,7 +62,7 @@ export const EnvironmentActionsDropdown = memo(function EnvironmentActionsDropdo
         size="sm"
         className={classNames(
           className,
-          "text !px-2 truncate",
+          "text px-2! truncate",
           !activeEnvironment && !hasBaseVars && "text-text-subtlest italic",
         )}
         // If no environments, the button simply opens the dialog.

apps/yaak-client/components/EnvironmentEditDialog.tsx

@@ -57,7 +57,7 @@ export function EnvironmentEditDialog({ initialEnvironmentId, setRef }: Props) {
       defaultRatio={0.75}
       layout="horizontal"
       className="gap-0"
-      resizeHandleClassName="-translate-x-[1px]"
+      resizeHandleClassName="-translate-x-px"
       firstSlot={() => (
         <EnvironmentEditDialogSidebar
           selectedEnvironmentId={selectedEnvironment?.id ?? null}

apps/yaak-client/components/FolderLayout.tsx

@@ -163,7 +163,7 @@ function HttpRequestCard({ request }: { request: HttpRequest }) {
 
   return (
     <div className="grid grid-rows-2 grid-cols-[minmax(0,1fr)] gap-2 overflow-hidden">
-      <code className="font-mono text-editor text-info border border-info rounded px-2.5 py-0.5 truncate w-full min-w-0">
+      <code className="font-mono text-editor text-info border border-info rounded-sm px-2.5 py-0.5 truncate w-full min-w-0">
         {request.method} {request.url}
       </code>
       {latestResponse ? (
@@ -190,7 +190,7 @@ function HttpRequestCard({ request }: { request: HttpRequest }) {
             className={classNames(
               "cursor-default select-none",
               "whitespace-nowrap w-full pl-3 overflow-x-auto font-mono text-sm hide-scrollbars",
-              "font-mono text-editor border rounded px-1.5 py-0.5 truncate w-full",
+              "font-mono text-editor border rounded-sm px-1.5 py-0.5 truncate w-full",
             )}
           >
             {latestResponse.state !== "closed" && <LoadingIcon size="sm" />}

apps/yaak-client/components/FolderSettingsDialog.tsx

@@ -84,12 +84,12 @@ export function FolderSettingsDialog({ folderId, tab }: Props) {
   return (
     <div className="h-full flex flex-col">
       <div className="flex items-center gap-3 px-6 pr-10 mt-4 mb-2 min-w-0 text-xl">
-        <Icon icon="folder_cog" size="lg" color="secondary" className="flex-shrink-0" />
+        <Icon icon="folder_cog" size="lg" color="secondary" className="shrink-0" />
         <div className="flex items-center gap-1.5 font-semibold text-text min-w-0 overflow-hidden flex-1">
           {breadcrumbs.map((item, index) => (
             <Fragment key={item.id}>
               {index > 0 && (
-                <Icon icon="chevron_right" size="lg" className="opacity-50 flex-shrink-0" />
+                <Icon icon="chevron_right" size="lg" className="opacity-50 shrink-0" />
               )}
               <span className="text-text-subtle truncate min-w-0" title={item.name}>
                 {item.name}
@@ -97,7 +97,7 @@ export function FolderSettingsDialog({ folderId, tab }: Props) {
             </Fragment>
           ))}
           {breadcrumbs.length > 0 && (
-            <Icon icon="chevron_right" size="lg" className="opacity-50 flex-shrink-0" />
+            <Icon icon="chevron_right" size="lg" className="opacity-50 shrink-0" />
           )}
           <span className="whitespace-nowrap" title={folder.name}>
             {folder.name}
@@ -149,7 +149,7 @@ export function FolderSettingsDialog({ folderId, tab }: Props) {
               <InlineCode className="flex gap-1 items-center text-primary pl-2.5">
                 {folder.id}
                 <CopyIconButton
-                  className="opacity-70 !text-primary"
+                  className="opacity-70 text-primary!"
                   size="2xs"
                   iconSize="sm"
                   title="Copy folder ID"

apps/yaak-client/components/GrpcEditor.tsx

@@ -126,7 +126,7 @@ export function GrpcEditor({
 
   const actions = useMemo(
     () => [
-      <div key="reflection" className={classNames(services == null && "!opacity-100")}>
+      <div key="reflection" className={classNames(services == null && "opacity-100!")}>
         <Button
           size="xs"
           color={

apps/yaak-client/components/GrpcRequestPane.tsx

@@ -162,7 +162,7 @@ export function GrpcRequestPane({
         className={classNames(
           "grid grid-cols-[minmax(0,1fr)_auto] gap-1.5",
           paneWidth === 0 && "opacity-0",
-          paneWidth > 0 && paneWidth < 400 && "!grid-cols-1",
+          paneWidth > 0 && paneWidth < 400 && "grid-cols-1!",
         )}
       >
         <UrlBar
@@ -201,7 +201,7 @@ export function GrpcRequestPane({
               rightSlot={<Icon size="sm" icon="chevron_down" />}
               disabled={isStreaming || services == null}
               className={classNames(
-                "font-mono text-editor min-w-[5rem] !ring-0",
+                "font-mono text-editor min-w-20 ring-0!",
                 paneWidth < 400 && "flex-1",
               )}
             >
@@ -259,7 +259,7 @@ export function GrpcRequestPane({
       <Tabs
         label="Request"
         tabs={tabs}
-        tabListClassName="mt-1 !mb-1.5"
+        tabListClassName="mt-1 mb-1.5!"
         storageKey="grpc_request_tabs"
         activeTabKey={activeRequest.id}
       >
@@ -296,7 +296,7 @@ export function GrpcRequestPane({
               hideLabel
               forceUpdateKey={forceUpdateKey}
               defaultValue={activeRequest.name}
-              className="font-sans !text-xl !px-0"
+              className="font-sans text-xl! px-0!"
               containerClassName="border-0"
               placeholder={resolvedModelName(activeRequest)}
               onChange={(name) => patchModel(activeRequest, { name })}

apps/yaak-client/components/HttpAuthenticationEditor.tsx

@@ -156,7 +156,7 @@ export function HttpAuthenticationEditor({ model }: Props) {
                 title="Authentication Actions"
                 icon="settings"
                 size="xs"
-                className="!text-secondary"
+                className="text-secondary!"
               />
             </Dropdown>
           )}

apps/yaak-client/components/HttpRequestLayout.tsx

@@ -57,7 +57,7 @@ export function HttpRequestLayout({ activeRequest, style }: Props) {
           <GraphQLDocsExplorer
             requestId={activeRequest.id}
             schema={graphQLSchema}
-            className={classNames(orientation === "horizontal" && "!ml-0")}
+            className={classNames(orientation === "horizontal" && "ml-0!")}
             style={style}
           />
         )}

apps/yaak-client/components/HttpRequestPane.tsx

@@ -346,7 +346,7 @@ export function HttpRequestPane({ style, fullHeight, className, activeRequest }:
             onUrlChange={handleUrlChange}
             leftSlot={
               <div className="py-0.5">
-                <RequestMethodDropdown request={activeRequest} className="ml-0.5 !h-full" />
+                <RequestMethodDropdown request={activeRequest} className="ml-0.5 h-full!" />
               </div>
             }
             forceUpdateKey={updateKey}
@@ -456,7 +456,7 @@ export function HttpRequestPane({ style, fullHeight, className, activeRequest }:
                   hideLabel
                   forceUpdateKey={updateKey}
                   defaultValue={activeRequest.name}
-                  className="font-sans !text-xl !px-0"
+                  className="font-sans text-xl! px-0!"
                   containerClassName="border-0"
                   placeholder={resolvedModelName(activeRequest)}
                   onChange={(name) => patchModel(activeRequest, { name })}

apps/yaak-client/components/HttpResponsePane.tsx

@@ -167,7 +167,7 @@ export function HttpResponsePane({ style, className, activeRequestId }: Props) {
         <div className="h-full w-full grid grid-rows-[auto_minmax(0,1fr)] grid-cols-1">
           <HStack
             className={classNames(
-              "text-text-subtle w-full flex-shrink-0",
+              "text-text-subtle w-full shrink-0",
               // Remove a bit of space because the tabs have lots too
               "-mb-1.5",
             )}
@@ -180,7 +180,7 @@ export function HttpResponsePane({ style, className, activeRequestId }: Props) {
                   "whitespace-nowrap w-full pl-3 overflow-x-auto font-mono text-sm hide-scrollbars",
                 )}
               >
-                <HStack space={2} className="w-full flex-shrink-0">
+                <HStack space={2} className="w-full shrink-0">
                   {activeResponse.state !== "closed" && <LoadingIcon size="sm" />}
                   <HttpStatusTag showReason response={activeResponse} />
                   <span>&bull;</span>
@@ -194,7 +194,7 @@ export function HttpResponsePane({ style, className, activeRequestId }: Props) {
                 {shouldShowRedirectDropWarning ? (
                   <Tooltip
                     tabIndex={0}
-                    className="my-auto pl-3 flex-shrink-0 max-w-full justify-self-end overflow-hidden"
+                    className="my-auto pl-3 shrink-0 max-w-full justify-self-end overflow-hidden"
                     content={
                       <VStack alignItems="start" space={1} className="text-xs">
                         <span className="font-medium text-warning">
@@ -223,7 +223,7 @@ export function HttpResponsePane({ style, className, activeRequestId }: Props) {
                     <span className="inline-flex min-w-0">
                       <PillButton
                         color="warning"
-                        className="font-sans text-sm !flex-shrink max-w-full"
+                        className="font-sans text-sm shrink! max-w-full"
                         innerClassName="flex items-center"
                         leftSlot={<Icon icon="alert_triangle" size="xs" color="warning" />}
                       >
@@ -236,7 +236,7 @@ export function HttpResponsePane({ style, className, activeRequestId }: Props) {
                 ) : (
                   <span />
                 )}
-                <div className="justify-self-end flex-shrink-0">
+                <div className="justify-self-end shrink-0">
                   <RecentHttpResponsesDropdown
                     responses={responses}
                     activeResponse={activeResponse}
@@ -249,7 +249,7 @@ export function HttpResponsePane({ style, className, activeRequestId }: Props) {
 
           <div className="overflow-hidden flex flex-col min-h-0">
             {activeResponse?.error && (
-              <Banner color="danger" className="mx-3 mt-1 flex-shrink-0">
+              <Banner color="danger" className="mx-3 mt-1 shrink-0">
                 {activeResponse.error}
               </Banner>
             )}

apps/yaak-client/components/JsonBodyEditor.tsx

@@ -73,14 +73,14 @@ export function JsonBodyEditor({ forceUpdateKey, heightMode, request }: Props) {
   const actions = useMemo<EditorProps["actions"]>(
     () => [
       showBanner && (
-        <Banner color="notice" className="!opacity-100 h-sm !py-0 !px-2 flex items-center text-xs">
+        <Banner color="notice" className="opacity-100! h-sm py-0! px-2! flex items-center text-xs">
           <p className="inline-flex items-center gap-1 min-w-0">
             <span className="truncate">Auto-fix enabled</span>
             <Icon icon="arrow_right" size="sm" className="opacity-disabled" />
           </p>
         </Banner>
       ),
-      <div key="settings" className="!opacity-100 !shadow">
+      <div key="settings" className="opacity-100! shadow!">
         <Dropdown
           onOpen={handleDropdownOpen}
           items={

apps/yaak-client/components/LicenseBadge.tsx

@@ -59,7 +59,7 @@ function getDetail(
             label: `License expired ${formatDate(data.data.periodEnd, "MMM dd, yyyy")}`,
           },
           {
-            label: <div className="min-w-[12rem]">Renew License</div>,
+            label: <div className="min-w-48">Renew License</div>,
             leftSlot: <Icon icon="refresh" />,
             rightSlot: <Icon icon="external_link" size="sm" className="opacity-disabled" />,
             hidden: data.data.changesUrl == null,

apps/yaak-client/components/MarkdownEditor.tsx

@@ -33,7 +33,7 @@ export function MarkdownEditor({
     <Editor
       hideGutter
       wrapLines
-      className={classNames(editorClassName, "[&_.cm-line]:!max-w-lg max-h-full")}
+      className={classNames(editorClassName, "[&_.cm-line]:max-w-lg! max-h-full")}
       language="markdown"
       defaultValue={defaultValue}
       onChange={onChange}
@@ -46,7 +46,7 @@ export function MarkdownEditor({
     defaultValue.length === 0 ? (
       <p className="text-text-subtlest">No description</p>
     ) : (
-      <div className="pr-1.5 overflow-y-auto max-h-full [&_*]:cursor-auto [&_*]:select-auto">
+      <div className="pr-1.5 overflow-y-auto max-h-full **:cursor-auto **:select-auto">
         <Markdown className="max-w-lg select-auto cursor-auto">{defaultValue}</Markdown>
       </div>
     );

apps/yaak-client/components/ModelSettingsEditor.tsx

@@ -539,7 +539,7 @@ function NumberUnitInput({
       placeholder={placeholder}
       defaultValue={value}
       className="[appearance:textfield] [&::-webkit-inner-spin-button]:appearance-none [&::-webkit-outer-spin-button]:appearance-none"
-      containerClassName="!w-48"
+      containerClassName="w-48!"
       validate={validate}
       rightSlot={
         <span className="flex self-stretch items-center border-l border-border-subtle px-2 text-xs font-medium text-text-subtle">

apps/yaak-client/components/MoveToWorkspaceDialog.tsx

@@ -66,7 +66,7 @@ export function MoveToWorkspaceDialog({ onDone, requests, activeWorkspaceId }: P
               <Button
                 size="xs"
                 color="secondary"
-                className="mr-auto min-w-[5rem]"
+                className="mr-auto min-w-20"
                 onClick={async () => {
                   await router.navigate({
                     to: "/workspaces/$workspaceId",

apps/yaak-client/components/Prose.css

@@ -1,3 +1,5 @@
+@reference "../main.css";
+
 .prose {
   @apply text-text;
 
@@ -98,7 +100,7 @@
     @apply text-notice hover:underline;
 
     * {
-      @apply text-notice !important;
+      @apply text-notice!;
     }
   }
 
@@ -113,12 +115,12 @@
   ol code,
   ul code {
     @apply text-xs bg-surface-active text-info font-normal whitespace-nowrap;
-    @apply px-1.5 py-0.5 rounded not-italic;
+    @apply px-1.5 py-0.5 rounded-sm not-italic;
     @apply select-text;
   }
 
   pre {
-    @apply bg-surface-highlight text-text !important;
+    @apply bg-surface-highlight! text-text!;
     @apply px-4 py-3 rounded-md;
     @apply overflow-auto whitespace-pre;
     @apply text-editor font-mono;
@@ -130,7 +132,7 @@
 
   .banner {
     @apply border border-dashed;
-    @apply border-border bg-surface-highlight text-text px-4 py-3 rounded text-base;
+    @apply border-border bg-surface-highlight text-text px-4 py-3 rounded-sm text-base;
 
     &::before {
       @apply block font-bold mb-1;
@@ -161,7 +163,7 @@
   }
 
   blockquote {
-    @apply italic py-3 pl-5 pr-3 border-l-8 border-surface-active text-lg text-text bg-surface-highlight rounded shadow-lg;
+    @apply italic py-3 pl-5 pr-3 border-l-8 border-surface-active text-lg text-text bg-surface-highlight rounded-sm shadow-lg;
 
     p {
       @apply m-0;

apps/yaak-client/components/ResponseCookies.tsx

@@ -167,7 +167,7 @@ export function ResponseCookies({ response }: Props) {
                     {cookie.value}
                   </span>
                   {cookie.isDeleted && (
-                    <span className="text-xs font-sans text-danger bg-danger/10 px-1.5 py-0.5 rounded">
+                    <span className="text-xs font-sans text-danger bg-danger/10 px-1.5 py-0.5 rounded-sm">
                       Deleted
                     </span>
                   )}

apps/yaak-client/components/ResponseHeaders.tsx

@@ -34,7 +34,7 @@ export function ResponseHeaders({ response }: Props) {
               <span className="select-text cursor-text">{response.url}</span>
               <IconButton
                 iconSize="sm"
-                className="inline-block w-auto !h-auto opacity-50 hover:opacity-100"
+                className="inline-block w-auto h-auto! opacity-50 hover:opacity-100"
                 icon="external_link"
                 onClick={() => openUrl(response.url)}
                 title="Open in browser"

apps/yaak-client/components/ResponseInfo.tsx

@@ -24,7 +24,7 @@ export function ResponseInfo({ response }: Props) {
               URL
               <IconButton
                 iconSize="sm"
-                className="inline-block w-auto ml-1 !h-auto opacity-50 hover:opacity-100"
+                className="inline-block w-auto ml-1 h-auto! opacity-50 hover:opacity-100"
                 icon="external_link"
                 onClick={() => openUrl(response.url)}
                 title="Open in browser"

apps/yaak-client/components/RouteError.tsx

@@ -10,7 +10,7 @@ export default function RouteError({ error }: { error: unknown }) {
     typeof error === "object" && error != null && "stack" in error ? String(error.stack) : null;
   return (
     <div className="flex items-center justify-center h-full">
-      <VStack space={5} className="w-[50rem] !h-auto">
+      <VStack space={5} className="w-200 h-auto!">
         <Heading>Route Error 🔥</Heading>
         <FormattedError>
           {message}

apps/yaak-client/components/SelectFile.tsx

@@ -108,7 +108,7 @@ export function SelectFile({
             "rtl mr-1.5",
             inline && "w-full",
             filePath && inline && "font-mono text-xs",
-            isHovering && "!border-notice",
+            isHovering && "border-notice!",
           )}
           color={isHovering ? "primary" : "secondary"}
           onClick={handleClick}

apps/yaak-client/components/Settings/Settings.tsx

@@ -93,7 +93,7 @@ export default function Settings({ hide }: Props) {
         layout="horizontal"
         defaultValue={mainTab || tabFromQuery}
         addBorders
-        tabListClassName="min-w-[10rem] bg-surface x-theme-sidebar border-r border-border pl-3"
+        tabListClassName="min-w-40 bg-surface x-theme-sidebar border-r border-border pl-3"
         label="Settings"
         tabs={tabs.map(
           (value): TabItem => ({
@@ -131,28 +131,28 @@ export default function Settings({ hide }: Props) {
           }),
         )}
       >
-        <TabContent value={TAB_GENERAL} className="overflow-y-auto h-full px-6 !py-4">
+        <TabContent value={TAB_GENERAL} className="overflow-y-auto h-full px-6 py-4!">
           <SettingsGeneral />
         </TabContent>
-        <TabContent value={TAB_INTERFACE} className="overflow-y-auto h-full px-6 !py-4">
+        <TabContent value={TAB_INTERFACE} className="overflow-y-auto h-full px-6 py-4!">
           <SettingsInterface />
         </TabContent>
-        <TabContent value={TAB_THEME} className="overflow-y-auto h-full px-6 !py-4">
+        <TabContent value={TAB_THEME} className="overflow-y-auto h-full px-6 py-4!">
           <SettingsTheme />
         </TabContent>
-        <TabContent value={TAB_SHORTCUTS} className="overflow-y-auto h-full px-6 !py-4">
+        <TabContent value={TAB_SHORTCUTS} className="overflow-y-auto h-full px-6 py-4!">
           <SettingsHotkeys />
         </TabContent>
         <TabContent value={TAB_PLUGINS} className="h-full grid grid-rows-1">
           <SettingsPlugins defaultSubtab={mainTab === TAB_PLUGINS ? subtab : undefined} />
         </TabContent>
-        <TabContent value={TAB_PROXY} className="overflow-y-auto h-full px-6 !py-4">
+        <TabContent value={TAB_PROXY} className="overflow-y-auto h-full px-6 py-4!">
           <SettingsProxy />
         </TabContent>
-        <TabContent value={TAB_CERTIFICATES} className="overflow-y-auto h-full px-6 !py-4">
+        <TabContent value={TAB_CERTIFICATES} className="overflow-y-auto h-full px-6 py-4!">
           <SettingsCertificates />
         </TabContent>
-        <TabContent value={TAB_LICENSE} className="overflow-y-auto h-full px-6 !py-4">
+        <TabContent value={TAB_LICENSE} className="overflow-y-auto h-full px-6 py-4!">
           <SettingsLicense />
         </TabContent>
       </Tabs>

apps/yaak-client/components/Settings/SettingsGeneral.tsx

@@ -56,7 +56,7 @@ export function SettingsGeneral() {
                   model={settings}
                   modelKey="updateChannel"
                   label="Update Channel"
-                  selectClassName="!w-full"
+                  selectClassName="w-full!"
                   options={[
                     { label: "Stable", value: "stable" },
                     { label: "Beta", value: "beta" },

apps/yaak-client/components/Settings/SettingsHotkeys.tsx

@@ -341,7 +341,7 @@ function RecordHotkeyDialog({ label, onSave, onCancel }: RecordHotkeyDialogProps
           }}
           className={classNames(
             "flex items-center justify-center",
-            "px-4 py-2 rounded-lg bg-surface-highlight border outline-none cursor-default w-full",
+            "px-4 py-2 rounded-lg bg-surface-highlight border outline-hidden cursor-default w-full",
             "border-border-subtle focus:border-border-focus",
           )}
         >

apps/yaak-client/components/Settings/SettingsInterface.tsx

@@ -89,7 +89,7 @@ export function SettingsInterface() {
               <SettingSelectControl
                 name="uiFont"
                 label="Interface font"
-                selectClassName="!w-72"
+                selectClassName="w-72!"
                 value={settings.interfaceFont ?? NULL_FONT_VALUE}
                 defaultValue={NULL_FONT_VALUE}
                 options={[
@@ -106,7 +106,7 @@ export function SettingsInterface() {
             <SettingSelectControl
               name="interfaceFontSize"
               label="Interface Font Size"
-              selectClassName="!w-20"
+              selectClassName="w-20!"
               value={`${settings.interfaceFontSize}`}
               defaultValue="14"
               options={fontSizeOptions}
@@ -123,7 +123,7 @@ export function SettingsInterface() {
               <SettingSelectControl
                 name="editorFont"
                 label="Editor font"
-                selectClassName="!w-72"
+                selectClassName="w-72!"
                 value={settings.editorFont ?? NULL_FONT_VALUE}
                 defaultValue={NULL_FONT_VALUE}
                 options={[
@@ -139,7 +139,7 @@ export function SettingsInterface() {
             <SettingSelectControl
               name="editorFontSize"
               label="Editor Font Size"
-              selectClassName="!w-20"
+              selectClassName="w-20!"
               value={`${settings.editorFontSize}`}
               defaultValue="12"
               options={fontSizeOptions}

apps/yaak-client/components/Settings/SettingsPlugins.tsx

@@ -211,7 +211,7 @@ function PluginTableRow({
   return (
     <TableRow>
       {showCheckbox && (
-        <TableCell className="!py-0">
+        <TableCell className="py-0!">
           <Checkbox
             hideLabel
             title={plugin?.enabled ? "Disable plugin" : "Enable plugin"}
@@ -249,7 +249,7 @@ function PluginTableRow({
           )}
         </HStack>
       </TableCell>
-      <TableCell className="!py-0">
+      <TableCell className="py-0!">
         <HStack justifyContent="end" space={1.5}>
           {plugin != null && latestVersion != null ? (
             <Button

apps/yaak-client/components/Settings/SettingsProxy.tsx

@@ -56,7 +56,7 @@ export function SettingsProxy() {
               { label: "Custom proxy configuration", value: "enabled" },
               { label: "No proxy", value: "disabled" },
             ]}
-            selectClassName="!w-64"
+            selectClassName="w-64!"
           />
         </SettingsSection>
 
@@ -99,7 +99,7 @@ export function SettingsProxy() {
                 description="Comma-separated list of hosts that should bypass the proxy."
                 value={settings.proxy.bypass}
                 placeholder="127.0.0.1, *.example.com, localhost:3000"
-                inputWidthClassName="!w-96"
+                inputWidthClassName="w-96!"
                 onChange={(bypass) => patchProxy({ bypass })}
               />
             </SettingsSection>

apps/yaak-client/components/Settings/SettingsTheme.tsx

@@ -120,7 +120,7 @@ export function SettingsTheme() {
         <SettingsSection title="Preview">
           <VStack
             space={3}
-            className="mt-4 w-full bg-surface p-3 border border-dashed border-border-subtle rounded overflow-x-auto"
+            className="mt-4 w-full bg-surface p-3 border border-dashed border-border-subtle rounded-sm overflow-x-auto"
           >
             <HStack className="text" space={1.5}>
               <Icon icon={appearance === "dark" ? "moon" : "sun"} />

apps/yaak-client/components/Sidebar.tsx

@@ -588,7 +588,7 @@ function Sidebar({ className }: { className?: string }) {
               rightSlot={
                 filterText.text && (
                   <IconButton
-                    className="!bg-transparent !h-auto min-h-full opacity-50 hover:opacity-100 -mr-1"
+                    className="bg-transparent! h-auto! min-h-full opacity-50 hover:opacity-100 -mr-1"
                     icon="x"
                     title="Clear filter"
                     onClick={clearFilterText}
@@ -667,8 +667,8 @@ function Sidebar({ className }: { className?: string }) {
         <div className="p-3 text-sm text-center">
           {(emptyFilterSuggestions?.length ?? 0) > 0 ? (
             <EmptyStateText
-              wrapperClassName="!h-auto mb-auto"
-              className="!h-auto py-3 px-3 !text-text-subtle text-sm leading-relaxed text-center"
+              wrapperClassName="h-auto! mb-auto"
+              className="h-auto! py-3 px-3 text-text-subtle! text-sm leading-relaxed text-center"
             >
               <div>
                 No results, but found matches for{" "}
@@ -677,7 +677,7 @@ function Sidebar({ className }: { className?: string }) {
                     {i > 0 && " or "}
                     <button
                       type="button"
-                      className="max-w-full rounded align-middle focus-visible:outline focus-visible:outline-2 focus-visible:outline-info"
+                      className="max-w-full rounded-sm align-middle focus-visible:outline-solid focus-visible:outline-2 focus-visible:outline-info"
                       onClick={() => applyFilterExample(suggestion.filterText)}
                     >
                       <InlineCode className="inline-block max-w-36 truncate align-middle whitespace-nowrap transition-colors hover:border-border hover:bg-surface-active hover:text-text">
@@ -690,8 +690,8 @@ function Sidebar({ className }: { className?: string }) {
             </EmptyStateText>
           ) : (
             <EmptyStateText
-              wrapperClassName="!h-auto mb-auto"
-              className="!h-auto py-3 px-3 !text-text-subtle text-sm leading-relaxed text-center"
+              wrapperClassName="h-auto! mb-auto"
+              className="h-auto! py-3 px-3 text-text-subtle! text-sm leading-relaxed text-center"
             >
               <div>
                 No results for{" "}

apps/yaak-client/components/TemplateFunctionDialog.tsx

@@ -208,10 +208,10 @@ function InitializedTemplateFunctionDialog({
                 )}
               />
             </HStack>
-            <div className="relative w-full max-h-[10rem]">
+            <div className="relative w-full max-h-40">
               <InlineCode
                 className={classNames(
-                  "block whitespace-pre-wrap !select-text cursor-text max-h-[10rem] overflow-auto hide-scrollbars !border-text-subtlest",
+                  "block whitespace-pre-wrap select-text! cursor-text max-h-40 overflow-auto hide-scrollbars border-text-subtlest!",
                   tooLarge && "italic text-danger",
                 )}
               >
@@ -246,7 +246,7 @@ function InitializedTemplateFunctionDialog({
         ) : (
           <span />
         )}
-        <div className="flex justify-stretch w-full flex-grow gap-2 [&>*]:flex-1">
+        <div className="flex justify-stretch w-full grow gap-2 *:flex-1">
           {templateFunction.data.name === "secure" && (
             <Button variant="border" color="secondary" onClick={setupOrConfigureEncryption}>
               Reveal Encryption Key
@@ -271,7 +271,7 @@ TemplateFunctionDialog.show = (
   showDialog({
     id: `template-function-${Math.random()}`, // Allow multiple at once
     size: "md",
-    className: "h-[60rem]",
+    className: "h-240",
     noPadding: true,
     title: <InlineCode>{fn.name}(…)</InlineCode>,
     description: fn.description,

apps/yaak-client/components/UrlBar.tsx

@@ -94,7 +94,7 @@ export const UrlBar = memo(function UrlBar({
                   iconSize="md"
                   title="Send Request"
                   type="submit"
-                  className="w-8 mr-0.5 !h-full"
+                  className="w-8 mr-0.5 h-full!"
                   iconColor="secondary"
                   icon={isLoading ? "x" : submitIcon}
                   hotkeyAction="request.send"

apps/yaak-client/components/WebsocketRequestPane.tsx

@@ -217,7 +217,7 @@ export function WebsocketRequestPane({ style, fullHeight, className, activeReque
                     title="Close connection"
                     icon="x"
                     iconColor="secondary"
-                    className="w-8 mr-0.5 !h-full"
+                    className="w-8 mr-0.5 h-full!"
                     onClick={handleCancel}
                   />
                 )
@@ -236,7 +236,7 @@ export function WebsocketRequestPane({ style, fullHeight, className, activeReque
             ref={tabsRef}
             label="Request"
             tabs={tabs}
-            tabListClassName="mt-1 !mb-1.5"
+            tabListClassName="mt-1 mb-1.5!"
             storageKey={TABS_STORAGE_KEY}
             activeTabKey={activeRequestId}
           >
@@ -283,7 +283,7 @@ export function WebsocketRequestPane({ style, fullHeight, className, activeReque
                   hideLabel
                   forceUpdateKey={forceUpdateKey}
                   defaultValue={activeRequest.name}
-                  className="font-sans !text-xl !px-0"
+                  className="font-sans text-xl! px-0!"
                   containerClassName="border-0"
                   placeholder={resolvedModelName(activeRequest)}
                   onChange={(name) => patchModel(activeRequest, { name })}

apps/yaak-client/components/Workspace.tsx

@@ -85,7 +85,7 @@ export function Workspace() {
         <div style={environmentBgStyle} className="absolute inset-0 opacity-[0.07]" />
         <div
           style={environmentBgStyle}
-          className="absolute left-0 right-0 -bottom-[1px] h-[1px] opacity-20"
+          className="absolute left-0 right-0 -bottom-px h-px opacity-20"
         />
       </div>
       <WorkspaceHeader className="pointer-events-none" floatingSidebar={floating} />
@@ -162,7 +162,7 @@ function WorkspaceBody() {
         // Delay the entering because the workspaces might load after a slight delay
         transition={{ delay: 0.5 }}
       >
-        <Banner color="warning" className="max-w-[30rem]">
+        <Banner color="warning" className="max-w-120">
           The active workspace was not found. Select a workspace from the header menu or report this
           bug to <FeedbackLink />
         </Banner>

apps/yaak-client/components/WorkspaceActionsDropdown.tsx

@@ -176,7 +176,7 @@ export const WorkspaceActionsDropdown = memo(function WorkspaceActionsDropdown({
         size="sm"
         className={classNames(
           className,
-          "text !px-2 truncate",
+          "text px-2! truncate",
           workspace === null && "italic opacity-disabled",
         )}
         {...buttonProps}

apps/yaak-client/components/WorkspaceEncryptionSetting.tsx

@@ -324,7 +324,7 @@ function KeyRevealer({
 
 function HighlightedKey({ keyText, show }: { keyText: string; show: boolean }) {
   return (
-    <span className="text-xs font-mono [&_*]:cursor-auto [&_*]:select-text">
+    <span className="text-xs font-mono **:cursor-auto **:select-text">
       {show ? (
         keyText.split("").map((c, i) => {
           return (

apps/yaak-client/components/WorkspaceSettingsDialog.tsx

@@ -127,7 +127,7 @@ export function WorkspaceSettingsDialog({ workspaceId, hide, tab }: Props) {
             placeholder="Workspace Name"
             label="Name"
             defaultValue={workspace.name}
-            className="!text-base font-sans"
+            className="text-base! font-sans"
             onChange={(name) => patchModel(workspace, { name })}
           />
 
@@ -161,7 +161,7 @@ export function WorkspaceSettingsDialog({ workspaceId, hide, tab }: Props) {
             <InlineCode className="flex gap-1 items-center text-primary pl-2.5">
               {workspaceId}
               <CopyIconButton
-                className="opacity-70 !text-primary"
+                className="opacity-70 text-primary!"
                 size="2xs"
                 iconSize="sm"
                 title="Copy workspace ID"
@@ -182,7 +182,7 @@ WorkspaceSettingsDialog.show = (workspaceId: string, tab?: WorkspaceSettingsTab)
   showDialog({
     id: "workspace-settings",
     size: "lg",
-    className: "h-[calc(100vh-5rem)] !max-h-[50rem]",
+    className: "h-[calc(100vh-5rem)] max-h-200!",
     noPadding: true,
     render: ({ hide }) => (
       <WorkspaceSettingsDialog workspaceId={workspaceId} hide={hide} tab={tab} />

apps/yaak-client/components/core/AutoScroller.tsx

@@ -72,7 +72,7 @@ export function AutoScroller<T>({
             size="sm"
             iconSize="md"
             variant="border"
-            className="!bg-surface z-10"
+            className="bg-surface! z-10"
             onClick={() => setAutoScroll((v) => !v)}
           />
         </div>
@@ -80,7 +80,7 @@ export function AutoScroller<T>({
       {header ?? <span aria-hidden />}
       <div
         ref={containerRef}
-        className="h-full w-full overflow-y-auto focus:outline-none"
+        className="h-full w-full overflow-y-auto focus:outline-hidden"
         onScroll={handleScroll}
         tabIndex={focusable ? 0 : undefined}
       >

apps/yaak-client/components/core/Checkbox.tsx

@@ -39,10 +39,10 @@ export function Checkbox({
         <input
           aria-hidden
           className={classNames(
-            "appearance-none flex-shrink-0 border border-border",
+            "appearance-none shrink-0 border border-border",
             size === "sm" && "w-4 h-4",
             size === "md" && "w-5 h-5",
-            "rounded outline-none ring-0",
+            "rounded-sm outline-hidden ring-0",
             !disabled && "hocus:border-border-focus hocus:bg-focus/[5%]",
             disabled && "border-dotted",
           )}

apps/yaak-client/components/core/ColorPicker.tsx

@@ -17,7 +17,7 @@ export function ColorPicker({ onChange, color, className }: Props) {
     <div className={className}>
       <HexColorPicker
         color={color ?? undefined}
-        className="!w-full"
+        className="w-full!"
         onChange={(color) => {
           onChange(color);
           regenerateKey(); // To force input to change
@@ -96,7 +96,7 @@ export function ColorPickerWithThemeColors({ onChange, color, className }: Props
         <>
           <HexColorPicker
             color={color ?? undefined}
-            className="!w-full"
+            className="w-full!"
             onChange={(color) => {
               onChange(color);
               regenerateKey(); // To force input to change

apps/yaak-client/components/core/CountBadge.tsx

@@ -18,7 +18,7 @@ export function CountBadge({ count, count2, className, color, showZero }: Props)
       className={classNames(
         className,
         "flex items-center",
-        "opacity-70 border text-4xs rounded mb-0.5 px-1 ml-1 h-4 font-mono",
+        "opacity-70 border text-4xs rounded-sm mb-0.5 px-1 ml-1 h-4 font-mono",
         color == null && "border-border-subtle",
         color === "primary" && "text-primary",
         color === "secondary" && "text-secondary",

apps/yaak-client/components/core/DetailsBanner.tsx

@@ -42,7 +42,7 @@ export function DetailsBanner({
   return (
     <Banner color={color} className={className}>
       <details className="group list-none" open={isOpen} onToggle={handleToggle} {...extraProps}>
-        <summary className="!cursor-default !select-none list-none flex items-center gap-3 focus:outline-none opacity-70">
+        <summary className="cursor-default! select-none! list-none flex items-center gap-3 focus:outline-hidden opacity-70">
           <div
             className={classNames(
               "transition-transform",

apps/yaak-client/components/core/Dialog.tsx

@@ -74,13 +74,13 @@ export function Dialog({
             "relative bg-surface pointer-events-auto",
             "rounded-lg",
             "border border-border-subtle shadow-lg shadow-[rgba(0,0,0,0.1)]",
-            "min-h-[10rem]",
+            "min-h-40",
             "max-w-[calc(100vw-5rem)] max-h-[calc(100vh-5rem)]",
-            size === "sm" && "w-[30rem]",
-            size === "md" && "w-[50rem]",
-            size === "lg" && "w-[70rem]",
-            size === "full" && "w-[100vw] h-[100vh]",
-            size === "dynamic" && "min-w-[20rem] max-w-[100vw]",
+            size === "sm" && "w-120",
+            size === "md" && "w-200",
+            size === "lg" && "w-280",
+            size === "full" && "w-screen h-screen",
+            size === "dynamic" && "min-w-80 max-w-[100vw]",
           )}
         >
           {title ? (

apps/yaak-client/components/core/Dropdown.tsx

@@ -712,7 +712,7 @@ const Menu = forwardRef<Omit<DropdownRef, "open" | "isOpen" | "toggle" | "items"
         className={classNames(
           className,
           "x-theme-menu",
-          "outline-none my-1 pointer-events-auto z-40",
+          "outline-hidden my-1 pointer-events-auto z-40",
           "fixed",
         )}
       >
@@ -734,7 +734,7 @@ const Menu = forwardRef<Omit<DropdownRef, "open" | "isOpen" | "toggle" | "items"
           {filter && (
             <HStack
               space={2}
-              className="pb-0.5 px-1.5 mb-2 text-sm border border-border-subtle mx-2 rounded font-mono h-xs"
+              className="pb-0.5 px-1.5 mb-2 text-sm border border-border-subtle mx-2 rounded-sm font-mono h-xs"
             >
               <Icon icon="search" size="xs" />
               <div className="text">{filter}</div>
@@ -916,24 +916,24 @@ function MenuItem({
         )
       }
       rightSlot={rightSlot && <div className="ml-auto pl-3">{rightSlot}</div>}
-      innerClassName="!text-left"
+      innerClassName="text-left!"
       color="custom"
       className={classNames(
         className,
         "h-xs", // More compact
-        "min-w-[8rem] outline-none px-2 mx-1.5 flex whitespace-nowrap",
-        "focus:bg-surface-highlight focus:text rounded focus:outline-none focus-visible:outline-1",
-        isParentOfActiveSubmenu && "bg-surface-highlight text rounded",
-        item.color === "danger" && "!text-danger",
-        item.color === "primary" && "!text-primary",
-        item.color === "success" && "!text-success",
-        item.color === "warning" && "!text-warning",
-        item.color === "notice" && "!text-notice",
-        item.color === "info" && "!text-info",
+        "min-w-32 outline-hidden px-2 mx-1.5 flex whitespace-nowrap",
+        "focus:bg-surface-highlight focus:text rounded-sm focus:outline-hidden focus-visible:outline-1",
+        isParentOfActiveSubmenu && "bg-surface-highlight text rounded-sm",
+        item.color === "danger" && "text-danger!",
+        item.color === "primary" && "text-primary!",
+        item.color === "success" && "text-success!",
+        item.color === "warning" && "text-warning!",
+        item.color === "notice" && "text-notice!",
+        item.color === "info" && "text-info!",
       )}
       {...props}
     >
-      <div className={classNames("truncate min-w-[5rem]")}>{item.label}</div>
+      <div className={classNames("truncate min-w-20")}>{item.label}</div>
     </Button>
   );
 }

apps/yaak-client/components/core/Editor/DiffViewer.css

@@ -1,3 +1,5 @@
+@reference "../../../main.css";
+
 .cm-wrapper.cm-multiline .cm-mergeView {
   @apply h-full w-full overflow-auto pr-0.5;
 
@@ -9,7 +11,7 @@
     @apply w-full min-h-full relative;
 
     .cm-collapsedLines {
-      @apply bg-none bg-surface border border-border py-1 mx-0.5 text-text opacity-80 hover:opacity-100 rounded cursor-default;
+      @apply bg-none bg-surface border border-border py-1 mx-0.5 text-text opacity-80 hover:opacity-100 rounded-sm cursor-default;
     }
   }
 
@@ -19,21 +21,21 @@
   .cm-changedLine {
     /* Round top corners only if previous line is not a changed line */
     &:not(.cm-changedLine + &) {
-      @apply rounded-t;
+      @apply rounded-t-sm;
     }
     /* Round bottom corners only if next line is not a changed line */
     &:not(:has(+ .cm-changedLine)) {
-      @apply rounded-b;
+      @apply rounded-b-sm;
     }
   }
 
   /* Let content grow and disable individual scrolling for sync */
   .cm-editor {
-    @apply h-auto relative !important;
+    @apply h-auto! relative!;
     position: relative !important;
   }
 
   .cm-scroller {
-    @apply overflow-visible !important;
+    @apply overflow-visible!;
   }
 }

apps/yaak-client/components/core/Editor/Editor.css

@@ -1,3 +1,5 @@
+@reference "../../../main.css";
+
 .cm-wrapper {
   @apply h-full overflow-hidden;
 
@@ -7,7 +9,7 @@
     /* Regular cursor */
 
     .cm-cursor {
-      @apply border-text !important;
+      @apply border-text!;
       /* Widen the cursor a bit */
       @apply border-l-[2px];
     }
@@ -15,8 +17,8 @@
     /* Vim-mode cursor */
 
     .cm-fat-cursor {
-      @apply outline-0 bg-text !important;
-      @apply text-surface !important;
+      @apply outline-0! bg-text!;
+      @apply text-surface!;
     }
 
     /* Matching bracket */
@@ -59,12 +61,12 @@
 
       * {
         @apply cursor-text;
-        @apply caret-transparent !important;
+        @apply caret-transparent!;
       }
     }
 
     .cm-selectionBackground {
-      @apply bg-selection !important;
+      @apply bg-selection!;
     }
 
     /* Fix WebKit/WKWebView rendering bug where selection layer leaves a ghost
@@ -88,7 +90,7 @@
     }
 
     .cm-gutter-lint {
-      @apply w-auto !important;
+      @apply w-auto!;
 
       .cm-gutterElement {
         @apply px-0;
@@ -111,7 +113,7 @@
       @apply bg-surface text-text-subtle border-border-subtle whitespace-nowrap cursor-default;
       @apply hover:border-border hover:text-text hover:bg-surface-highlight;
 
-      @apply inline border px-1 mx-[0.5px] rounded dark:shadow;
+      @apply inline border px-1 mx-[0.5px] rounded-sm dark:shadow;
 
       -webkit-text-security: none;
 
@@ -162,7 +164,7 @@
 
       &::-webkit-scrollbar-corner,
       &::-webkit-scrollbar {
-        @apply hidden !important;
+        @apply hidden!;
       }
     }
   }
@@ -189,16 +191,16 @@
 
 /* Style search matches */
 .cm-searchMatch {
-  @apply bg-transparent !important;
+  @apply bg-transparent!;
   @apply rounded-[2px] outline outline-1;
 
   &.cm-searchMatch-selected {
     @apply outline-text;
-    @apply bg-text !important;
+    @apply bg-text!;
 
     &,
     * {
-      @apply text-surface font-semibold !important;
+      @apply text-surface! font-semibold!;
     }
   }
 }
@@ -223,8 +225,8 @@
 }
 
 .cm-editor .fold-gutter-icon {
-  @apply pt-[0.25em] pl-[0.4em] px-[0.4em] h-4 rounded;
-  @apply cursor-default !important;
+  @apply pt-[0.25em] pl-[0.4em] px-[0.4em] h-4 rounded-sm;
+  @apply cursor-default!;
 }
 
 .cm-editor .fold-gutter-icon::after {
@@ -248,7 +250,7 @@
 .cm-editor .cm-foldPlaceholder {
   @apply px-2 border border-border-subtle bg-surface-highlight;
   @apply hover:text-text hover:border-border-subtle text-text;
-  @apply cursor-default !important;
+  @apply cursor-default!;
 }
 
 .cm-editor .cm-activeLineGutter {
@@ -277,7 +279,7 @@
 }
 
 .cm-tooltip-lint {
-  @apply font-mono text-editor rounded overflow-hidden bg-surface-highlight border border-border shadow !important;
+  @apply font-mono! text-editor! rounded-sm! overflow-hidden! bg-surface-highlight! border! border-border! shadow!;
 
   .cm-diagnostic-error {
     @apply border-l-danger px-4 py-2;
@@ -293,18 +295,18 @@
 }
 
 .cm-tooltip.cm-tooltip-hover {
-  @apply shadow-lg bg-surface rounded text-text-subtle border border-border-subtle z-50 pointer-events-auto text-sm;
+  @apply shadow-lg bg-surface rounded-sm text-text-subtle border border-border-subtle z-50 pointer-events-auto text-sm;
   @apply p-1.5;
 
   /* Style the tooltip for popping up "open in browser" and other stuff */
 
   a,
   button {
-    @apply text-text hover:bg-surface-highlight w-full h-sm flex items-center px-2 rounded;
+    @apply text-text hover:bg-surface-highlight w-full h-sm flex items-center px-2 rounded-sm;
   }
 
   a {
-    @apply cursor-default !important;
+    @apply cursor-default!;
 
     &::after {
       @apply text-text bg-text h-3 w-3 ml-1;
@@ -319,10 +321,10 @@
 /* NOTE: Extra selector required to override default styles */
 .cm-tooltip.cm-tooltip-autocomplete,
 .cm-tooltip.cm-completionInfo {
-  @apply shadow-lg bg-surface rounded text-text-subtle border border-border-subtle z-50 pointer-events-auto;
+  @apply shadow-lg bg-surface rounded-sm text-text-subtle border border-border-subtle z-50 pointer-events-auto;
 
   & * {
-    @apply font-mono text-editor !important;
+    @apply font-mono! text-editor!;
   }
 
   .cm-completionIcon {
@@ -409,7 +411,7 @@
     }
 
     .cm-completionIcon {
-      @apply text-sm flex items-center pb-0.5 flex-shrink-0;
+      @apply text-sm flex items-center pb-0.5 shrink-0;
     }
 
     .cm-completionLabel {
@@ -427,7 +429,7 @@
 
   input,
   button {
-    @apply rounded-sm outline-none;
+    @apply rounded-sm outline-hidden;
   }
 
   button {
@@ -436,12 +438,12 @@
   }
 
   button[name="close"] {
-    @apply text-text-subtle hocus:text-text px-2 -mr-1.5 !important;
+    @apply text-text-subtle! hocus:text-text! px-2! -mr-1.5!;
   }
 
   input {
     @apply bg-surface border-border-subtle focus:border-border-focus;
-    @apply border outline-none;
+    @apply border outline-hidden;
   }
 
   input.cm-textfield {

apps/yaak-client/components/core/Editor/Editor.tsx

@@ -486,7 +486,7 @@ function EditorInner({
   const decoratedActions = useMemo(() => {
     const results = [];
     const actionClassName = classNames(
-      "bg-surface transition-opacity transform-gpu opacity-0 group-hover:opacity-100 hover:!opacity-100 shadow",
+      "bg-surface transition-opacity transform-gpu opacity-0 group-hover:opacity-100 hover:opacity-100! shadow",
     );
 
     if (format) {

apps/yaak-client/components/core/EventViewerRow.tsx

@@ -24,8 +24,8 @@ export function EventViewerRow({
         onClick={onClick}
         className={classNames(
           "w-full grid grid-cols-[auto_minmax(0,1fr)_auto] gap-2 items-center text-left",
-          "px-1.5 h-xs font-mono text-editor cursor-default group focus:outline-none focus:text-text rounded",
-          isActive && "bg-surface-active !text-text",
+          "px-1.5 h-xs font-mono text-editor cursor-default group focus:outline-hidden focus:text-text rounded-sm",
+          isActive && "bg-surface-active text-text!",
           "text-text-subtle hover:text",
         )}
       >

apps/yaak-client/components/core/Hotkey.tsx

@@ -30,7 +30,7 @@ export function HotkeyRaw({ labelParts, className, variant }: HotkeyRawProps) {
       className={classNames(
         className,
         variant === "with-bg" &&
-          "rounded bg-surface-highlight px-1 border border-border text-text-subtle",
+          "rounded-sm bg-surface-highlight px-1 border border-border text-text-subtle",
         variant === "text" && "text-text-subtlest",
       )}
     >

apps/yaak-client/components/core/HttpMethodTag.tsx

@@ -81,7 +81,7 @@ export function HttpMethodTagRaw({
         colored && m === "PATCH" && "text-notice",
         colored && m === "POST" && "text-success",
         colored && m === "DELETE" && "text-danger",
-        "font-mono flex-shrink-0 whitespace-pre",
+        "font-mono shrink-0 whitespace-pre",
         "pt-[0.15em]", // Fix for monospace font not vertically centering
       )}
     >

apps/yaak-client/components/core/Input.tsx

@@ -201,7 +201,7 @@ function BaseInput({
   const id = useRef(`input-${generateId()}`);
   const editorClassName = classNames(
     className,
-    "!bg-transparent min-w-0 h-auto w-full focus:outline-none placeholder:text-placeholder",
+    "bg-transparent! min-w-0 h-auto w-full focus:outline-hidden placeholder:text-placeholder",
   );
 
   const isValid = useMemo(() => {
@@ -264,7 +264,7 @@ function BaseInput({
           "border",
           focused && !disabled ? "border-border-focus" : "border-border",
           disabled && "border-dotted",
-          !isValid && hasChanged && "!border-danger",
+          !isValid && hasChanged && "border-danger!",
           size === "md" && "min-h-md",
           size === "sm" && "min-h-sm",
           size === "xs" && "min-h-xs",
@@ -333,7 +333,7 @@ function BaseInput({
                 : `Obscure ${typeof label === "string" ? label : "field"}`
             }
             size="xs"
-            className={classNames("mr-0.5 !h-auto my-0.5", disabled && "opacity-disabled")}
+            className={classNames("mr-0.5 h-auto! my-0.5", disabled && "opacity-disabled")}
             color={tint}
             // iconClassName={classNames(
             //   tint === 'primary' && 'text-primary',
@@ -548,9 +548,9 @@ function EncryptionInput({
             color={tint}
             aria-label="Configure encryption"
             className={classNames(
-              "flex items-center justify-center !h-full !px-1",
+              "flex items-center justify-center h-full! px-1!",
               "opacity-70", // Makes it a bit subtler
-              props.disabled && "!opacity-disabled",
+              props.disabled && "opacity-disabled!",
             )}
           >
             <HStack space={0.5}>

apps/yaak-client/components/core/KeyValueRow.tsx

@@ -73,7 +73,7 @@ export function KeyValueRow({
     <>
       <td
         className={classNames(
-          "select-none py-0.5 pr-2 h-full max-w-[10rem]",
+          "select-none py-0.5 pr-2 h-full max-w-40",
           align === "top" && "align-top",
           align === "middle" && "align-middle",
           labelClassName,
@@ -86,12 +86,12 @@ export function KeyValueRow({
       </td>
       <td
         className={classNames(
-          "select-none py-0.5 break-all max-w-[15rem]",
+          "select-none py-0.5 break-all max-w-60",
           align === "top" && "align-top",
           align === "middle" && "align-middle",
         )}
       >
-        <div className="select-text cursor-text max-h-[12rem] overflow-y-auto grid grid-cols-[auto_minmax(0,1fr)_auto]">
+        <div className="select-text cursor-text max-h-48 overflow-y-auto grid grid-cols-[auto_minmax(0,1fr)_auto]">
           {leftSlot ?? <span aria-hidden />}
           {children}
           {resolvedRightSlot ? (

apps/yaak-client/components/core/Label.tsx

@@ -27,7 +27,7 @@ export function Label({
       className={classNames(
         className,
         visuallyHidden && "sr-only",
-        "flex-shrink-0 text-sm",
+        "shrink-0 text-sm",
         "text-text-subtle whitespace-nowrap flex items-center gap-1 mb-0.5",
       )}
       {...props}

apps/yaak-client/components/core/PairEditor.tsx

@@ -566,7 +566,7 @@ export function PairEditorRow({
         title={pair.enabled ? "Disable item" : "Enable item"}
         disabled={isLast || disabled}
         checked={isLast ? false : !!pair.enabled}
-        className={classNames(isLast && "!opacity-disabled")}
+        className={classNames(isLast && "opacity-disabled!")}
         onChange={handleChangeEnabled}
       />
       {!isLast && !disableDrag ? (
@@ -586,7 +586,7 @@ export function PairEditorRow({
       <div
         className={classNames(
           "grid items-center",
-          "@xs:gap-2 @xs:!grid-rows-1 @xs:!grid-cols-[minmax(0,1fr)_minmax(0,1fr)]",
+          "@xs:gap-2 @xs:grid-rows-1! @xs:grid-cols-[minmax(0,1fr)_minmax(0,1fr)]!",
           "gap-0.5 grid-cols-1 grid-rows-2",
         )}
       >
@@ -830,7 +830,7 @@ function MultilineEditDialog({
   const [value, setValue] = useState<string>(defaultValue);
   const language = languageFromContentType(contentType, value);
   return (
-    <div className="w-[100vw] max-w-[40rem] h-[50vh] max-h-full grid grid-rows-[minmax(0,1fr)_auto]">
+    <div className="w-screen max-w-160 h-[50vh] max-h-full grid grid-rows-[minmax(0,1fr)_auto]">
       <Editor
         heightMode="auto"
         defaultValue={defaultValue}

apps/yaak-client/components/core/PairOrBulkEditor.tsx

@@ -26,7 +26,7 @@ export function PairOrBulkEditor({ preferenceName, ...props }: Props) {
           variant="border"
           title={useBulk ? "Enable form edit" : "Enable bulk edit"}
           className={classNames(
-            "transition-opacity opacity-0 group-hover:opacity-80 hover:!opacity-100 shadow",
+            "transition-opacity opacity-0 group-hover:opacity-80 hover:opacity-100! shadow",
             "bg-surface hover:text group-hover/wrapper:opacity-100",
           )}
           onClick={() => setUseBulk((b) => !b)}

apps/yaak-client/components/core/PillButton.tsx

@@ -7,7 +7,7 @@ export function PillButton({ className, ...props }: ButtonProps) {
     <Button
       size="2xs"
       variant="border"
-      className={classNames(className, "!rounded-full mx-1 !px-3")}
+      className={classNames(className, "rounded-full! mx-1 px-3!")}
       {...props}
     />
   );

apps/yaak-client/components/core/PlainInput.tsx

@@ -116,7 +116,7 @@ export const PlainInput = forwardRef<{ focus: () => void }, PlainInputProps>(fun
   const id = useRef(`input-${generateId()}`);
   const commonClassName = classNames(
     className,
-    "!bg-transparent min-w-0 w-full focus:outline-none placeholder:text-placeholder",
+    "bg-transparent! min-w-0 w-full focus:outline-hidden placeholder:text-placeholder",
     "px-2 text-xs font-mono cursor-text",
   );
 
@@ -167,7 +167,7 @@ export const PlainInput = forwardRef<{ focus: () => void }, PlainInputProps>(fun
           "overflow-hidden",
           focused && !disabled ? "border-border-focus" : "border-border-subtle",
           disabled && "border-dotted",
-          hasChanged && "has-[:invalid]:border-danger", // For built-in HTML validation
+          hasChanged && "has-invalid:border-danger", // For built-in HTML validation
           size === "md" && "min-h-md",
           size === "sm" && "min-h-sm",
           size === "xs" && "min-h-xs",
@@ -225,7 +225,7 @@ export const PlainInput = forwardRef<{ focus: () => void }, PlainInputProps>(fun
                 : `Obscure ${typeof label === "string" ? label : "field"}`
             }
             size="xs"
-            className="mr-0.5 group/obscure !h-auto my-0.5"
+            className="mr-0.5 group/obscure h-auto! my-0.5"
             iconClassName="group-hover/obscure:text"
             iconSize="sm"
             icon={obscured ? "eye" : "eye_closed"}

apps/yaak-client/components/core/RadioCards.tsx

@@ -43,7 +43,7 @@ export function RadioCards<T extends string>({
             />
             <div
               className={classNames(
-                "mt-1 w-4 h-4 flex-shrink-0 rounded-full border",
+                "mt-1 w-4 h-4 shrink-0 rounded-full border",
                 "flex items-center justify-center",
                 selected ? "border-focus" : "border-border",
               )}

apps/yaak-client/components/core/SegmentedControl.tsx

@@ -92,7 +92,7 @@ export function SegmentedControl<T extends string>({
                 role="radio"
                 tabIndex={isSelected ? 0 : -1}
                 className={classNames(
-                  isActive && "!text-text",
+                  isActive && "text-text!",
                   "focus:ring-1 focus:ring-border-focus",
                 )}
                 onClick={() => onChange(o.value)}
@@ -111,8 +111,8 @@ export function SegmentedControl<T extends string>({
                 role="radio"
                 tabIndex={isSelected ? 0 : -1}
                 className={classNames(
-                  isActive && "!text-text",
-                  "!px-1.5 !w-auto",
+                  isActive && "text-text!",
+                  "px-1.5! w-auto!",
                   "focus:ring-border-focus",
                 )}
                 title={o.label}

apps/yaak-client/components/core/Select.tsx

@@ -90,8 +90,8 @@ export function Select<T extends string>({
             onBlur={() => setFocused(false)}
             disabled={disabled}
             className={classNames(
-              "pr-7 w-full outline-none bg-transparent disabled:opacity-disabled",
-              "leading-[1] rounded-none", // Center the text better vertically
+              "pr-7 w-full outline-hidden bg-transparent disabled:opacity-disabled",
+              "leading-none rounded-none", // Center the text better vertically
             )}
           >
             {isInvalidSelection && <option value={"__NONE__"}>-- Select an Option --</option>}

apps/yaak-client/components/core/SettingRow.tsx

@@ -189,7 +189,7 @@ export function ModelSettingRowBoolean<M extends AnyModel, K extends ModelKeyOfV
 
 export function SettingRowNumber({
   inputClassName,
-  inputWidthClassName = "!w-48",
+  inputWidthClassName = "w-48!",
   name,
   onChange,
   placeholder,
@@ -251,7 +251,7 @@ export function ModelSettingRowNumber<M extends AnyModel, K extends ModelKeyOfVa
 
 export function SettingRowText({
   inputClassName,
-  inputWidthClassName = "!w-80",
+  inputWidthClassName = "w-80!",
   name,
   onChange,
   placeholder,
@@ -358,7 +358,7 @@ export function SettingRowSelect<T extends string>({
   name,
   onChange,
   options,
-  selectClassName = "!w-48",
+  selectClassName = "w-48!",
   title,
   value,
   ...props
@@ -393,7 +393,7 @@ export function SettingSelectControl<T extends string>({
   name,
   onChange,
   options,
-  selectClassName = "!w-48",
+  selectClassName = "w-48!",
   value,
 }: {
   defaultValue?: T;

apps/yaak-client/components/core/Tabs/Tabs.tsx

@@ -342,7 +342,7 @@ export const Tabs = forwardRef<TabsRef, Props>(function Tabs(
       <div
         className={classNames(
           layout === "horizontal" && "flex flex-col w-full pb-3 mb-auto",
-          layout === "vertical" && "flex flex-row flex-shrink-0 w-full",
+          layout === "vertical" && "flex flex-row shrink-0 w-full",
         )}
       >
         {tabButtons}
@@ -456,9 +456,9 @@ function TabButton({
           onChangeValue?.(tab.value);
         },
     className: classNames(
-      "flex items-center rounded whitespace-nowrap",
-      "!px-2 ml-[1px]",
-      "outline-none",
+      "flex items-center rounded-sm whitespace-nowrap",
+      "px-2! ml-px",
+      "outline-hidden",
       "ring-none",
       "focus-visible-or-class:outline-2",
       addBorders && "border focus-visible:bg-surface-highlight",
@@ -468,7 +468,7 @@ function TabButton({
         : layout === "vertical"
           ? "border-border-subtle"
           : "border-transparent",
-      layout === "horizontal" && "min-w-[10rem]",
+      layout === "horizontal" && "min-w-40",
       isDragging && "opacity-50",
       overlay && "opacity-80",
     ),

apps/yaak-client/components/core/Toast.tsx

@@ -54,11 +54,11 @@ export function Toast({ children, open, onClose, timeout, action, icon, color }:
           `x-theme-toast x-theme-toast--${color}`,
           "pointer-events-auto overflow-hidden",
           "relative pointer-events-auto bg-surface text-text rounded-lg",
-          "border border-border shadow-lg w-[25rem]",
+          "border border-border shadow-lg w-100",
         )}
       >
-        <div className="pl-3 py-3 pr-10 flex items-start gap-2 w-full max-h-[11rem] overflow-auto">
-          {toastIcon && <Icon icon={toastIcon} color={color} className="mt-1 flex-shrink-0" />}
+        <div className="pl-3 py-3 pr-10 flex items-start gap-2 w-full max-h-44 overflow-auto">
+          {toastIcon && <Icon icon={toastIcon} color={color} className="mt-1 shrink-0" />}
           <VStack space={2} className="w-full min-w-0">
             <div className="select-auto">{children}</div>
             {action?.({ hide: onClose })}
@@ -68,7 +68,7 @@ export function Toast({ children, open, onClose, timeout, action, icon, color }:
         <IconButton
           color={color}
           variant="border"
-          className="opacity-60 border-0 !absolute top-2 right-2"
+          className="opacity-60 border-0 absolute! top-2 right-2"
           title="Dismiss"
           icon="x"
           onClick={onClose}

apps/yaak-client/components/core/Tooltip.tsx

@@ -116,7 +116,7 @@ export function Tooltip({ children, className, content, tabIndex, size = "md" }:
         role="button"
         aria-describedby={openState ? id.current : undefined}
         tabIndex={tabIndex ?? -1}
-        className={classNames(className, "flex-grow-0 flex items-center")}
+        className={classNames(className, "grow-0 flex items-center")}
         onClick={handleToggleImmediate}
         onMouseEnter={handleOpen}
         onMouseLeave={handleClose}
@@ -141,10 +141,10 @@ function Triangle({ className, position }: { className?: string; position: "top"
       shapeRendering="crispEdges"
       className={classNames(
         className,
-        "absolute z-50 left-[calc(50%-0.4rem)] h-[0.5rem] w-[0.8rem]",
+        "absolute z-50 left-[calc(50%-0.4rem)] h-2 w-[0.8rem]",
         isBottom
-          ? "border-t-[2px] border-surface-highlight -bottom-[calc(0.5rem-3px)] mb-2"
-          : "border-b-[2px] border-surface-highlight -top-[calc(0.5rem-3px)] mt-2",
+          ? "border-t-2 border-surface-highlight -bottom-[calc(0.5rem-3px)] mb-2"
+          : "border-b-2 border-surface-highlight -top-[calc(0.5rem-3px)] mt-2",
       )}
     >
       <title>Triangle</title>

apps/yaak-client/components/git/FileHistoryDialog.tsx

@@ -117,7 +117,7 @@ function CommitListItem({
     <button
       type="button"
       className={classNames(
-        "w-full min-w-0 text-left rounded px-2 py-1.5",
+        "w-full min-w-0 text-left rounded-sm px-2 py-1.5",
         selected && "bg-surface-active",
       )}
       onClick={onSelect}

apps/yaak-client/components/git/GitCommitDialog.tsx

@@ -241,7 +241,7 @@ export function GitCommitDialog({ syncDir, onDone, workspace }: Props) {
               secondSlot={({ style: innerStyle }) => (
                 <div style={innerStyle} className="grid grid-rows-[minmax(0,1fr)_auto] gap-3 pb-2">
                   <Input
-                    className="!text-base font-sans rounded-md"
+                    className="text-base! font-sans rounded-md"
                     placeholder="Commit message..."
                     onChange={setMessage}
                     stateKey={null}
@@ -325,7 +325,7 @@ function TreeNodeChildren({
         )}
       >
         {isSelected && (
-          <div className="absolute -left-[100vw] right-0 top-0 bottom-0 bg-surface-active opacity-30 -z-10" />
+          <div className="absolute left-[-100vw] right-0 top-0 bottom-0 bg-surface-active opacity-30 -z-10" />
         )}
         <Checkbox
           checked={checked}
@@ -358,7 +358,7 @@ function TreeNodeChildren({
           {node.status.status !== "current" && (
             <InlineCode
               className={classNames(
-                "py-0 bg-transparent w-[6rem] text-center shrink-0",
+                "py-0 bg-transparent w-24 text-center shrink-0",
                 node.status.status === "modified" && "text-info",
                 node.status.status === "untracked" && "text-success",
                 node.status.status === "removed" && "text-danger",
@@ -400,7 +400,7 @@ function ExternalTreeNode({
   return (
     <Checkbox
       fullWidth
-      className="h-xs w-full hover:bg-surface-highlight rounded px-1 group"
+      className="h-xs w-full hover:bg-surface-highlight rounded-sm px-1 group"
       checked={entry.staged}
       onChange={() => onCheck(entry)}
       title={
@@ -409,7 +409,7 @@ function ExternalTreeNode({
           <div className="truncate">{entry.relaPath}</div>
           <InlineCode
             className={classNames(
-              "py-0 ml-auto bg-transparent w-[6rem] text-center",
+              "py-0 ml-auto bg-transparent w-24 text-center",
               entry.status === "modified" && "text-info",
               entry.status === "untracked" && "text-success",
               entry.status === "removed" && "text-danger",

apps/yaak-client/components/git/GitDropdown.tsx

@@ -559,7 +559,7 @@ const GitMenuButton = forwardRef<HTMLButtonElement, HTMLAttributes<HTMLButtonEle
         ref={ref}
         className={classNames(
           className,
-          "px-3 h-md border-t border-border flex items-center justify-between text-text-subtle outline-none focus-visible:bg-surface-highlight",
+          "px-3 h-md border-t border-border flex items-center justify-between text-text-subtle outline-hidden focus-visible:bg-surface-highlight",
         )}
         {...props}
       />

apps/yaak-client/components/graphql/GraphQLDocsExplorer.tsx

@@ -113,19 +113,19 @@ export const GraphQLDocsExplorer = memo(function GraphQLDocsExplorer({
               name={{ value: "query", color: "primary" }}
               item={qryItem}
               setItem={setActiveItem}
-              className="!my-0"
+              className="my-0!"
             />
             <GqlTypeRow
               name={{ value: "mutation", color: "primary" }}
               item={mutItem}
               setItem={setActiveItem}
-              className="!my-0"
+              className="my-0!"
             />
             <GqlTypeRow
               name={{ value: "subscription", color: "primary" }}
               item={subItem}
               setItem={setActiveItem}
-              className="!my-0"
+              className="my-0!"
             />
             <Subheading count={Object.keys(allTypes).length}>All Schema Types</Subheading>
             <DocMarkdown>{schema.description ?? null}</DocMarkdown>
@@ -192,7 +192,7 @@ function GraphQLExplorerHeader({
                     noTruncate
                     item={crumb}
                     setItem={setItem}
-                    className="!font-sans !text-sm flex-shrink-0"
+                    className="font-sans! text-sm! shrink-0"
                   />
                 )}
               </Fragment>
@@ -208,7 +208,7 @@ function GraphQLExplorerHeader({
           className="hidden @[10rem]:block"
         />
       </div>
-      <div className="ml-auto flex gap-1 [&>*]:text-text-subtle">
+      <div className="ml-auto flex gap-1 *:text-text-subtle">
         <IconButton icon="x" size="sm" title="Close documentation explorer" onClick={onClose} />
       </div>
     </nav>
@@ -528,7 +528,7 @@ function GqlTypeRow({
           <span className="text-text-subtle">:</span>{" "}
           <GqlTypeLink color="notice" item={returnItem} setItem={setItem} />
         </div>
-        <DocMarkdown className="!text-text-subtle mt-0.5">
+        <DocMarkdown className="text-text-subtle! mt-0.5">
           {item.type.description ?? null}
         </DocMarkdown>
       </div>
@@ -786,8 +786,8 @@ function GqlSchemaSearch({
       className={classNames(
         className,
         "relative flex items-center bg-surface z-20 min-w-0",
-        !focused && "max-w-[6rem] ml-auto",
-        focused && "!absolute top-0 left-1.5 right-1.5 bottom-0 pt-1.5",
+        !focused && "max-w-24 ml-auto",
+        focused && "absolute! top-0 left-1.5 right-1.5 bottom-0 pt-1.5",
       )}
     >
       <PlainInput
@@ -879,7 +879,7 @@ function SearchResult({
       ref={initRef}
       className={classNames(
         className,
-        "px-3 truncate w-full text-left h-sm rounded text-editor font-mono",
+        "px-3 truncate w-full text-left h-sm rounded-sm text-editor font-mono",
         isActive && "bg-surface-highlight",
       )}
       {...extraProps}
@@ -893,7 +893,7 @@ function Heading({ children }: { children: ReactNode }) {
 
 function DocMarkdown({ children, className }: { children: string | null; className?: string }) {
   return (
-    <Markdown className={classNames(className, "!text-text-subtle italic")}>{children}</Markdown>
+    <Markdown className={classNames(className, "text-text-subtle! italic")}>{children}</Markdown>
   );
 }
 

apps/yaak-client/components/graphql/GraphQLEditor.tsx

@@ -77,8 +77,8 @@ function GraphQLEditorInner({ request, onChange, baseRequest, ...extraEditorProp
 
   const actions = useMemo<EditorProps["actions"]>(
     () => [
-      <div key="actions" className="flex flex-row !opacity-100 !shadow">
-        <div key="introspection" className="!opacity-100">
+      <div key="actions" className="flex flex-row opacity-100! shadow!">
+        <div key="introspection" className="opacity-100!">
           {schema === undefined ? null /* Initializing */ : (
             <Dropdown
               items={[
@@ -217,7 +217,7 @@ function GraphQLEditorInner({ request, onChange, baseRequest, ...extraEditorProp
         stateKey={`graphql_body.${request.id}`}
         {...extraEditorProps}
       />
-      <div className="grid grid-rows-[auto_minmax(0,1fr)] grid-cols-1 min-h-[5rem]">
+      <div className="grid grid-rows-[auto_minmax(0,1fr)] grid-cols-1 min-h-20">
         <Separator dashed className="pb-1">
           Variables
         </Separator>

apps/yaak-client/components/responseViewers/EventStreamViewer.tsx

@@ -298,7 +298,7 @@ function SseSummaryFooter({
               <Markdown className="select-auto cursor-auto">{summary}</Markdown>
             </div>
           ) : (
-            <pre className="font-mono whitespace-pre-wrap break-words select-auto cursor-auto">
+            <pre className="font-mono whitespace-pre-wrap wrap-break-word select-auto cursor-auto">
               {summary}
             </pre>
           )

apps/yaak-client/components/responseViewers/MultipartViewer.tsx

@@ -63,7 +63,7 @@ export function MultipartViewer({ data, boundary, idPrefix = "multipart" }: Prop
             <div className="h-5 w-5 overflow-auto flex items-center justify-end">
               <ImageViewer
                 data={part.arrayBuffer}
-                className="ml-auto w-auto rounded overflow-hidden"
+                className="ml-auto w-auto rounded-sm overflow-hidden"
               />
             </div>
           ) : part.filename ? (
@@ -76,7 +76,7 @@ export function MultipartViewer({ data, boundary, idPrefix = "multipart" }: Prop
           // oxlint-disable-next-line react/no-array-index-key -- Nothing else to key on
           key={idPrefix + part.name + i}
           value={tabValue(part, i)}
-          className="pl-3 !pt-0"
+          className="pl-3 pt-0!"
         >
           <Part part={part} />
         </TabContent>

apps/yaak-client/components/responseViewers/TextViewer.tsx

@@ -72,7 +72,7 @@ export function TextViewer({
 
     if (isSearching) {
       nodes.push(
-        <div key="input" className="w-full !opacity-100">
+        <div key="input" className="w-full opacity-100!">
           <Input
             key={filterKey ?? "filter"}
             validate={!filteredResponse.error}
@@ -100,7 +100,7 @@ export function TextViewer({
         icon={isSearching ? "x" : "filter"}
         title={isSearching ? "Close filter" : "Filter response"}
         onClick={toggleSearch}
-        className={classNames("border !border-border-subtle", isSearching && "!opacity-100")}
+        className={classNames("border border-border-subtle!", isSearching && "opacity-100!")}
       />,
     );
 

apps/yaak-client/hooks/useToggleCommandPalette.tsx

@@ -8,7 +8,7 @@ export function useToggleCommandPalette() {
       id: "command_palette",
       size: "dynamic",
       hideX: true,
-      className: "mb-auto mt-[4rem] !max-h-[min(30rem,calc(100vh-4rem))]",
+      className: "mb-auto mt-16 max-h-[min(30rem,calc(100vh-4rem))]!",
       vAlign: "top",
       noPadding: true,
       noScroll: true,

apps/yaak-client/lib/editEnvironment.tsx

@@ -45,7 +45,7 @@ export async function editEnvironment(
       id: "environment-editor",
       noPadding: true,
       size: "lg",
-      className: "h-[90vh] max-h-[60rem]",
+      className: "h-[90vh] max-h-240",
       render: () => (
         <EnvironmentEditDialog
           initialEnvironmentId={environment?.id ?? null}

apps/yaak-client/lib/initGlobalListeners.tsx

@@ -166,7 +166,7 @@ function showUpdateInstalledToast(version: string) {
     action: ({ hide }) => (
       <ButtonInfiniteLoading
         size="xs"
-        className="mr-auto min-w-[5rem]"
+        className="mr-auto min-w-20"
         color="primary"
         loadingChildren="Restarting..."
         onClick={() => {
@@ -206,7 +206,7 @@ async function showUpdateAvailableToast(updateInfo: UpdateInfo) {
         <ButtonInfiniteLoading
           size="xs"
           color="info"
-          className="min-w-[10rem]"
+          className="min-w-40"
           loadingChildren={downloaded ? "Installing..." : "Downloading..."}
           onClick={async () => {
             await emit<UpdateResponse>(replyEventId, {
@@ -259,7 +259,7 @@ function showPluginUpdatesToast(updateInfo: PluginUpdateNotification) {
         <ButtonInfiniteLoading
           size="xs"
           color="info"
-          className="min-w-[5rem]"
+          className="min-w-20"
           loadingChildren="Updating..."
           onClick={async () => {
             const updated = await updateAllPlugins();
@@ -311,7 +311,7 @@ function showNotificationToast(n: YaakNotification) {
         <Button
           size="xs"
           color={stringToColor(n.color) ?? undefined}
-          className="mr-auto min-w-[5rem]"
+          className="mr-auto min-w-20"
           rightSlot={<Icon icon="external_link" />}
           onClick={() => {
             hide();

apps/yaak-client/lib/toast.tsx

@@ -61,7 +61,7 @@ export function showErrorToast<T>({
     message: (
       <div className="w-full">
         <h2 className="text-lg font-bold mb-2">{title}</h2>
-        <div className="whitespace-pre-wrap break-words">{String(message)}</div>
+        <div className="whitespace-pre-wrap wrap-break-word">{String(message)}</div>
       </div>
     ),
   });

apps/yaak-client/main.css

@@ -1,6 +1,6 @@
-@tailwind base;
-@tailwind components;
-@tailwind utilities;
+@import "tailwindcss";
+@import "../../packages/tailwind-config/index.css";
+@source "../../packages/ui/src";
 
 @layer base {
   html,
@@ -50,7 +50,7 @@
 
   a,
   a[href] * {
-    @apply cursor-pointer !important;
+    @apply cursor-pointer!;
   }
 
   table th {
@@ -72,14 +72,14 @@
     }
 
     &::-webkit-scrollbar-thumb:hover {
-      @apply opacity-40 !important;
+      @apply opacity-40!;
     }
   }
 
   .hide-scrollbars {
     &::-webkit-scrollbar-corner,
     &::-webkit-scrollbar {
-      @apply hidden !important;
+      @apply hidden!;
     }
   }
 

apps/yaak-client/package.json

@@ -79,8 +79,6 @@
   "devDependencies": {
     "@lezer/generator": "^1.8.0",
     "@rolldown/plugin-babel": "^0.2.3",
-    "@tailwindcss/container-queries": "^0.1.1",
-    "@tailwindcss/nesting": "^0.0.0-insiders.565cd3e",
     "@tanstack/router-plugin": "^1.127.5",
     "@types/babel__core": "^7.20.5",
     "@types/node": "^24.0.13",
@@ -94,14 +92,10 @@
     "@vitejs/plugin-react": "^6.0.1",
     "@yaakapp-internal/theme": "^1.0.0",
     "@yaakapp-internal/ui": "^1.0.0",
-    "autoprefixer": "^10.4.21",
     "babel-plugin-react-compiler": "^1.0.0",
     "decompress": "^4.2.1",
     "internal-ip": "^8.0.0",
-    "postcss": "^8.5.14",
-    "postcss-nesting": "^13.0.2",
     "rollup": "^4.60.3",
-    "tailwindcss": "^3.4.17",
     "vite": "npm:@voidzero-dev/vite-plus-core@^0.2.1",
     "vite-plugin-static-copy": "^3.3.0",
     "vite-plugin-svgr": "^4.5.0",

apps/yaak-client/postcss.config.cjs

@@ -1,7 +1,3 @@
 module.exports = {
-  plugins: [
-    require("@tailwindcss/nesting")(require("postcss-nesting")),
-    require("tailwindcss"),
-    require("autoprefixer"),
-  ],
+  plugins: [require("@tailwindcss/postcss")],
 };

apps/yaak-client/tailwind.config.cjs

@@ -1,16 +0,0 @@
-const sharedConfig = require("@yaakapp-internal/tailwind-config");
-
-/** @type {import('tailwindcss').Config} */
-module.exports = {
-  ...sharedConfig,
-  content: [
-    "./*.{html,ts,tsx}",
-    "./commands/**/*.{ts,tsx}",
-    "./components/**/*.{ts,tsx}",
-    "./hooks/**/*.{ts,tsx}",
-    "./init/**/*.{ts,tsx}",
-    "./lib/**/*.{ts,tsx}",
-    "./routes/**/*.{ts,tsx}",
-    "../../packages/ui/src/**/*.{ts,tsx}",
-  ],
-};

apps/yaak-proxy/main.css

@@ -1,6 +1,6 @@
-@tailwind base;
-@tailwind components;
-@tailwind utilities;
+@import "tailwindcss";
+@import "../../packages/tailwind-config/index.css";
+@source "../../packages/ui/src";
 
 @layer base {
   html,
@@ -46,7 +46,7 @@
 
   a,
   a[href] * {
-    @apply cursor-pointer !important;
+    @apply cursor-pointer!;
   }
 
   table th {
@@ -68,14 +68,14 @@
     }
 
     &::-webkit-scrollbar-thumb:hover {
-      @apply opacity-40 !important;
+      @apply opacity-40!;
     }
   }
 
   .hide-scrollbars {
     &::-webkit-scrollbar-corner,
     &::-webkit-scrollbar {
-      @apply hidden !important;
+      @apply hidden!;
     }
   }
 

apps/yaak-proxy/postcss.config.cjs

@@ -1,7 +1,3 @@
 module.exports = {
-  plugins: [
-    require("@tailwindcss/nesting")(require("postcss-nesting")),
-    require("tailwindcss"),
-    require("autoprefixer"),
-  ],
+  plugins: [require("@tailwindcss/postcss")],
 };

apps/yaak-proxy/tailwind.config.cjs

@@ -1,7 +0,0 @@
-const sharedConfig = require("@yaakapp-internal/tailwind-config");
-
-/** @type {import('tailwindcss').Config} */
-module.exports = {
-  ...sharedConfig,
-  content: ["./**/*.{html,ts,tsx}", "../../packages/ui/src/**/*.{ts,tsx}"],
-};

package.json

@@ -112,6 +112,7 @@
   },
   "devDependencies": {
     "@rolldown/plugin-babel": "^0.2.3",
+    "@tailwindcss/postcss": "^4.3.2",
     "@tauri-apps/cli": "^2.11.1",
     "@types/babel__core": "^7.20.5",
     "@vitejs/plugin-react": "^6.0.1",
@@ -120,6 +121,8 @@
     "dotenv-cli": "^11.0.0",
     "nodejs-file-downloader": "^4.13.0",
     "npm-run-all": "^4.1.5",
+    "postcss": "^8.5.16",
+    "tailwindcss": "^4.3.2",
     "typescript": "^5.8.3",
     "vite": "npm:@voidzero-dev/vite-plus-core@^0.2.1",
     "vite-plus": "^0.2.1",

packages/tailwind-config/index.cjs

@@ -1,134 +0,0 @@
-const plugin = require("tailwindcss/plugin");
-
-const sizes = {
-  "2xs": "1.4rem",
-  xs: "1.8rem",
-  sm: "2.0rem",
-  md: "2.3rem",
-  lg: "2.6rem",
-};
-
-/** @type {import('tailwindcss').Config} */
-module.exports = {
-  darkMode: ["class", '[data-resolved-appearance="dark"]'],
-  theme: {
-    extend: {
-      keyframes: {
-        blinkRing: {
-          "0%, 49%": { "--tw-ring-color": "var(--primary)" },
-          "50%, 99%": { "--tw-ring-color": "transparent" },
-          "100%": { "--tw-ring-color": "var(--primary)" },
-        },
-      },
-      animation: {
-        blinkRing: "blinkRing 150ms step-start 400ms infinite",
-      },
-      opacity: {
-        disabled: "0.3",
-      },
-      fontSize: {
-        xs: "0.8rem",
-      },
-      height: sizes,
-      width: sizes,
-      minHeight: sizes,
-      minWidth: sizes,
-      lineHeight: {
-        // HACK: Minus 2 to account for borders inside inputs
-        xs: "calc(1.75rem - 2px)",
-        sm: "calc(2.0rem - 2px)",
-        md: "calc(2.5rem - 2px)",
-      },
-      transitionProperty: {
-        grid: "grid",
-      },
-    },
-    fontFamily: {
-      mono: [
-        "var(--font-family-editor)",
-        "JetBrains Mono",
-        "ui-monospace",
-        "SFMono-Regular",
-        "Menlo",
-        "Monaco",
-        "Fira Code",
-        "Ubuntu Mono",
-        "Consolas",
-        "Liberation Mono",
-        "Courier New",
-        "DejaVu Sans Mono",
-        "Hack",
-        "monospace",
-      ],
-      sans: [
-        "var(--font-family-interface)",
-        "Inter UI",
-        "-apple-system",
-        "BlinkMacSystemFont",
-        "Segoe UI",
-        "Roboto",
-        "Oxygen-Sans",
-        "Ubuntu",
-        "Cantarell",
-        "Helvetica Neue",
-        "sans-serif",
-        "Apple Color Emoji",
-        "Segoe UI Emoji",
-        "Segoe UI Symbol",
-      ],
-    },
-    fontSize: {
-      "4xs": "0.6rem",
-      "3xs": "0.675rem",
-      "2xs": "0.75rem",
-      xs: "0.8rem",
-      sm: "0.9rem",
-      base: "1rem",
-      lg: "1.12rem",
-      xl: "1.25rem",
-      "2xl": "1.5rem",
-      "3xl": "2rem",
-      "4xl": "2.5rem",
-      "5xl": "3rem",
-      editor: "var(--editor-font-size)",
-      shrink: "0.8em",
-    },
-    boxShadow: {
-      DEFAULT: "0 1px 3px 0 var(--shadow)",
-      lg: "0 10px 15px -3px var(--shadow)",
-    },
-    colors: {
-      transparent: "transparent",
-      placeholder: "var(--textSubtlest)",
-      shadow: "var(--shadow)",
-      backdrop: "var(--backdrop)",
-      selection: "var(--selection)",
-
-      // New theme values
-      surface: "var(--surface)",
-      "surface-highlight": "var(--surfaceHighlight)",
-      "surface-active": "var(--surfaceActive)",
-      text: "var(--text)",
-      "text-subtle": "var(--textSubtle)",
-      "text-subtlest": "var(--textSubtlest)",
-      border: "var(--border)",
-      "border-subtle": "var(--borderSubtle)",
-      "border-focus": "var(--borderFocus)",
-      primary: "var(--primary)",
-      danger: "var(--danger)",
-      secondary: "var(--secondary)",
-      success: "var(--success)",
-      info: "var(--info)",
-      notice: "var(--notice)",
-      warning: "var(--warning)",
-    },
-  },
-  plugins: [
-    require("@tailwindcss/container-queries"),
-    // oxlint-disable-next-line unbound-method -- destructured from plugin API
-    plugin(({ addVariant }) => {
-      addVariant("hocus", ["&:hover", "&:focus-visible", "&.focus:focus"]);
-      addVariant("focus-visible-or-class", ["&:focus-visible", "&.focus:focus"]);
-    }),
-  ],
-};

packages/tailwind-config/index.css

@@ -0,0 +1,124 @@
+@custom-variant dark (&:is([data-resolved-appearance="dark"] *));
+@custom-variant hocus (&:hover, &:focus-visible, &.focus:focus);
+@custom-variant focus-visible-or-class (&:focus-visible, &.focus:focus);
+
+@theme inline {
+  --font-mono:
+    var(--font-family-editor), JetBrains Mono, ui-monospace, SFMono-Regular,
+    Menlo, Monaco, Fira Code, Ubuntu Mono, Consolas, Liberation Mono,
+    Courier New, DejaVu Sans Mono, Hack, monospace;
+  --font-sans:
+    var(--font-family-interface), Inter UI, -apple-system, BlinkMacSystemFont,
+    Segoe UI, Roboto, Oxygen-Sans, Ubuntu, Cantarell, Helvetica Neue,
+    sans-serif, Apple Color Emoji, Segoe UI Emoji, Segoe UI Symbol;
+  --font-serif: initial;
+
+  --text-*: initial;
+  --text-4xs: 0.6rem;
+  --text-3xs: 0.675rem;
+  --text-2xs: 0.75rem;
+  --text-xs: 0.8rem;
+  --text-sm: 0.9rem;
+  --text-base: 1rem;
+  --text-lg: 1.12rem;
+  --text-xl: 1.25rem;
+  --text-2xl: 1.5rem;
+  --text-3xl: 2rem;
+  --text-4xl: 2.5rem;
+  --text-5xl: 3rem;
+  --text-editor: var(--editor-font-size);
+  --text-shrink: 0.8em;
+
+  --shadow-*: initial;
+  --shadow: 0 1px 3px 0 var(--shadow);
+  --shadow-lg: 0 10px 15px -3px var(--shadow);
+
+  --color-*: initial;
+  --color-transparent: transparent;
+  --color-placeholder: var(--textSubtlest);
+  --color-shadow: var(--shadow);
+  --color-backdrop: var(--backdrop);
+  --color-selection: var(--selection);
+  --color-surface: var(--surface);
+  --color-surface-highlight: var(--surfaceHighlight);
+  --color-surface-active: var(--surfaceActive);
+  --color-text: var(--text);
+  --color-text-subtle: var(--textSubtle);
+  --color-text-subtlest: var(--textSubtlest);
+  --color-border: var(--border);
+  --color-border-subtle: var(--borderSubtle);
+  --color-border-focus: var(--borderFocus);
+  --color-primary: var(--primary);
+  --color-danger: var(--danger);
+  --color-secondary: var(--secondary);
+  --color-success: var(--success);
+  --color-info: var(--info);
+  --color-notice: var(--notice);
+  --color-warning: var(--warning);
+
+  --animate-blinkRing: blinkRing 150ms step-start 400ms infinite;
+
+  --opacity-disabled: 30%;
+
+  --height-2xs: 1.4rem;
+  --height-xs: 1.8rem;
+  --height-sm: 2rem;
+  --height-md: 2.3rem;
+  --height-lg: 2.6rem;
+
+  --width-2xs: 1.4rem;
+  --width-xs: 1.8rem;
+  --width-sm: 2rem;
+  --width-md: 2.3rem;
+  --width-lg: 2.6rem;
+
+  --min-height-2xs: 1.4rem;
+  --min-height-xs: 1.8rem;
+  --min-height-sm: 2rem;
+  --min-height-md: 2.3rem;
+  --min-height-lg: 2.6rem;
+
+  --min-width-2xs: 1.4rem;
+  --min-width-xs: 1.8rem;
+  --min-width-sm: 2rem;
+  --min-width-md: 2.3rem;
+  --min-width-lg: 2.6rem;
+
+  --leading-xs: calc(1.75rem - 2px);
+  --leading-sm: calc(2rem - 2px);
+  --leading-md: calc(2.5rem - 2px);
+
+  --transition-property-grid: grid;
+
+  @keyframes blinkRing {
+    0%,
+    49% {
+      --tw-ring-color: var(--primary);
+    }
+    50%,
+    99% {
+      --tw-ring-color: transparent;
+    }
+    100% {
+      --tw-ring-color: var(--primary);
+    }
+  }
+}
+
+/*
+  The default border color has changed to `currentcolor` in Tailwind CSS v4,
+  so we've added these compatibility styles to make sure everything still
+  looks the same as it did with Tailwind CSS v3.
+
+  If we ever want to remove these styles, we need to add an explicit border
+  color utility to any element that depends on these defaults.
+*/
+@layer base {
+  *,
+  ::after,
+  ::before,
+  ::backdrop,
+  ::file-selector-button {
+    border-color: var(--color-gray-200, currentcolor);
+  }
+}

packages/tailwind-config/index.d.ts

@@ -1,5 +0,0 @@
-import type { Config } from "tailwindcss";
-
-declare const config: Config;
-
-export = config;

packages/tailwind-config/package.json

@@ -2,10 +2,5 @@
   "name": "@yaakapp-internal/tailwind-config",
   "version": "1.0.0",
   "private": true,
-  "main": "index.cjs",
-  "types": "index.d.ts",
-  "dependencies": {
-    "@tailwindcss/container-queries": "^0.1.1",
-    "tailwindcss": "^3.4.17"
-  }
+  "style": "index.css"
 }

packages/ui/src/components/Button.tsx

@@ -61,8 +61,8 @@ export const Button = forwardRef<HTMLButtonElement, ButtonProps>(function Button
         "border",
         "max-w-full min-w-0",
         "hocus:opacity-100",
-        "whitespace-nowrap outline-none",
-        "flex-shrink-0 flex items-center",
+        "whitespace-nowrap outline-hidden",
+        "shrink-0 flex items-center",
         "outline-0",
         isDisabled ? "pointer-events-none opacity-disabled" : "pointer-events-auto",
         justify === "start" && "justify-start",
@@ -70,7 +70,7 @@ export const Button = forwardRef<HTMLButtonElement, ButtonProps>(function Button
         size === "md" && "h-md px-3 rounded-md",
         size === "sm" && "h-sm px-2.5 rounded-md",
         size === "xs" && "h-xs px-2 text-sm rounded-md",
-        size === "2xs" && "h-2xs px-2 text-xs rounded",
+        size === "2xs" && "h-2xs px-2 text-xs rounded-sm",
         size === "auto" && "px-3 py-2 rounded-md",
         variant === "solid" && "border-transparent",
         variant === "solid" &&

packages/ui/src/components/DropMarker.tsx

@@ -23,8 +23,8 @@ export const DropMarker = memo(
         <div
           className={classNames(
             "absolute bg-primary rounded-full",
-            orientation === "horizontal" && "left-2 right-2 -bottom-[0.1rem] h-[0.2rem]",
-            orientation === "vertical" && "-left-[0.1rem] top-0 bottom-0 w-[0.2rem]",
+            orientation === "horizontal" && "left-2 right-2 bottom-[-0.1rem] h-[0.2rem]",
+            orientation === "vertical" && "left-[-0.1rem] top-0 bottom-0 w-[0.2rem]",
           )}
         />
       </div>

packages/ui/src/components/FormattedError.tsx

@@ -12,8 +12,8 @@ export function FormattedError({ children, className }: Props) {
       className={classNames(
         className,
         "cursor-text select-auto",
-        "[&_*]:cursor-text [&_*]:select-auto",
-        "font-mono text-sm w-full bg-surface-highlight p-3 rounded",
+        "**:cursor-text **:select-auto",
+        "font-mono text-sm w-full bg-surface-highlight p-3 rounded-sm",
         "whitespace-pre-wrap border border-danger border-dashed overflow-x-auto",
       )}
     >