Merge pull request #31 from FiligranHQ/buttons/to-uppercase

Change button style to uppercase
FiligranHQ · Nov 15, 2024 · c52b075 · c52b075
2 parents 36e2fc6 + 8f282ca
commit c52b075
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 9 deletions.
diff --git a/packages/filigran-ui/src/components/clients/combobox.tsx b/packages/filigran-ui/src/components/clients/combobox.tsx
@@ -60,7 +60,10 @@ function Combobox({
           variant="outline"
           role="combobox"
           aria-expanded={open}
-          className={cn('w-full justify-between border-input', className)}
+          className={cn(
+            'normal-case w-full justify-between border-input',
+            className
+          )}
           onClick={() => setOpen(!open)}>
           {value ? (
             dataTab.find((data) => data.value === value)?.label

diff --git a/packages/filigran-ui/src/components/servers/button.tsx b/packages/filigran-ui/src/components/servers/button.tsx
@@ -2,10 +2,8 @@ import {Slot} from '@radix-ui/react-slot'
 import {cva, type VariantProps} from 'class-variance-authority'
 import * as React from 'react'
 
-import {cn} from '../../lib/utils'
-
 const buttonVariants = cva(
-  'inline-flex items-center justify-center rounded text-sm font-medium ring-offset-background transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50',
+  'uppercase inline-flex items-center justify-center rounded font-normal text-sm ring-offset-background transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50',
   {
     variants: {
       variant: {
@@ -16,7 +14,7 @@ const buttonVariants = cva(
         secondary:
           'bg-secondary text-secondary-foreground hover:bg-secondary/75',
         ghost: 'hover:bg-hover',
-        link: 'text-primary underline-offset-4 hover:underline',
+        link: 'text-primary underline-offset-4 hover:underline normal-case',
       },
       size: {
         default: 'h-9 px-4 py-2',
@@ -32,6 +30,8 @@ const buttonVariants = cva(
   }
 )
 
+import {cn} from '../../lib/utils'
+
 export interface ButtonProps
   extends React.ButtonHTMLAttributes<HTMLButtonElement>,
     VariantProps<typeof buttonVariants> {

diff --git a/packages/filigran-ui/src/components/servers/multi-select.tsx b/packages/filigran-ui/src/components/servers/multi-select.tsx
@@ -226,7 +226,7 @@ const MultiSelectFormField = React.forwardRef<
                           pointerEvents: 'auto',
                           opacity: 1,
                         }}
-                        className="flex-1 cursor-pointer justify-center">
+                        className="flex-1 cursor-pointer justify-center uppercase">
                         Clear
                       </CommandItem>
                       <Separator
@@ -242,7 +242,7 @@ const MultiSelectFormField = React.forwardRef<
                       pointerEvents: 'auto',
                       opacity: 1,
                     }}
-                    className="flex-1 cursor-pointer justify-center">
+                    className="flex-1 cursor-pointer justify-center uppercase">
                     Close
                   </CommandItem>
                 </div>

diff --git a/projects/filigran-website/components/ui/menu.tsx b/projects/filigran-website/components/ui/menu.tsx
@@ -53,7 +53,7 @@ export const Menu: FunctionComponent<MenuProps> = ({
                         key={m.slug}
                         variant="ghost"
                         className={cn(
-                          'h-9 w-full justify-start rounded-none',
+                          'h-9 w-full justify-start rounded-none normal-case',
                           currentPath === m.slug &&
                             'bg-primary/10 shadow-[inset_2px_0px] shadow-primary'
                         )}
@@ -72,7 +72,7 @@ export const Menu: FunctionComponent<MenuProps> = ({
             key={menu.slug}
             variant="ghost"
             className={cn(
-              'h-9 w-full justify-start rounded-none',
+              'h-9 w-full justify-start rounded-none normal-case',
               currentPath === menu.slug &&
                 'bg-primary/10 shadow-[inset_2px_0px] shadow-primary'
             )}