From 1269731b559bf3c999ec6426e4de00396b997208 Mon Sep 17 00:00:00 2001
From: Razboy20 <razboy20@gmail.com>
Date: Wed, 14 Feb 2024 16:03:33 -0600
Subject: [PATCH] chore: update button stylings

---
 src/views/components/common/Button/Button.tsx | 18 +++++++-----------
 unocss.config.ts                              | 15 +++------------
 2 files changed, 10 insertions(+), 23 deletions(-)

diff --git a/src/views/components/common/Button/Button.tsx b/src/views/components/common/Button/Button.tsx
index d2be0bd3..7a126e63 100644
--- a/src/views/components/common/Button/Button.tsx
+++ b/src/views/components/common/Button/Button.tsx
@@ -1,7 +1,7 @@
 import clsx from 'clsx';
 import React from 'react';
-import { ThemeColor, getThemeColorHexByName, getThemeColorRgbByName } from '../../../../shared/util/themeColors';
 import type IconComponent from '~icons/material-symbols';
+import { ThemeColor, getThemeColorHexByName, getThemeColorRgbByName } from '../../../../shared/util/themeColors';
 import Text from '../Text/Text';
 
 interface Props {
@@ -40,21 +40,17 @@ export function Button({
             style={
                 {
                     ...style,
-                    '--color': colorHex,
-                    '--bg-color-8': `rgba(${colorRgb} / 0.08)`,
-                    '--shadow-color-15': `rgba(${colorRgb} / 0.15)`,
-                    '--shadow-color-30': `rgba(${colorRgb} / 0.3)`,
+                    color: colorHex,
+                    backgroundColor: `rgb(${colorRgb} / var(--un-bg-opacity)`,
                 } as React.CSSProperties
             }
             className={clsx(
                 'btn',
                 {
-                    'disabled:(cursor-not-allowed opacity-50)': disabled,
-                    'color-white bg-[var(--color)] border-[var(--color)] hover:enabled:btn-shadow':
+                    'text-white! bg-opacity-100 hover:enabled:shadow-md active:enabled:shadow-sm shadow-black/20':
                         variant === 'filled',
-                    'color-[var(--color)] bg-white border-current hover:enabled:btn-shade border border-solid':
-                        variant === 'outline',
-                    'color-[var(--color)] bg-white border-white hover:enabled:btn-shade': variant === 'single', // settings is the only "single"
+                    'bg-opacity-0 border-current hover:enabled:bg-opacity-8 border': variant === 'outline',
+                    'bg-opacity-0 border-none hover:enabled:bg-opacity-8': variant === 'single', // settings is the only "single"
                     'px-2 py-1.25': isIconOnly && variant !== 'outline',
                     'px-1.75 py-1.25': isIconOnly && variant === 'outline',
                     'px-3.75': variant === 'outline' && !isIconOnly,
@@ -65,7 +61,7 @@ export function Button({
             disabled={disabled}
             onClick={disabled ? undefined : onClick}
         >
-            {icon && <Icon className='size-6' />}
+            {icon && <Icon className='h-6 w-6' />}
             {!isIconOnly && (
                 <Text variant='h4' className='translate-y-0.08'>
                     {children}
diff --git a/unocss.config.ts b/unocss.config.ts
index 605cad07..4cf5f36f 100644
--- a/unocss.config.ts
+++ b/unocss.config.ts
@@ -7,18 +7,9 @@ import { colors } from './src/shared/util/themeColors';
 
 export default defineConfig({
     rules: [
-        ['btn-transition', { transition: 'color 180ms, border-color 150ms, background-color 150ms, transform 50ms' }],
         [
-            'btn-shadow',
-            {
-                'box-shadow': '0px 1px 3px 1px var(--shadow-color-15), 0px 1px 2px 0px var(--shadow-color-30);',
-            },
-        ],
-        [
-            'btn-shade',
-            {
-                'background-color': 'var(--bg-color-8)',
-            },
+            'btn-transition',
+            { transition: 'color 180ms, border-color 150ms, background-color 150ms, box-shadow 100ms, transform 50ms' },
         ],
         [
             'ring-offset-0',
@@ -29,7 +20,7 @@ export default defineConfig({
     ],
     shortcuts: {
         focusable: 'outline-none ring-blue-500/50 dark:ring-blue-400/60 ring-0 focus-visible:ring-4',
-        btn: 'h-10 w-auto flex cursor-pointer justify-center items-center gap-2 rounded-1 px-4 py-0 text-4.5 btn-transition',
+        btn: 'h-10 w-auto flex cursor-pointer justify-center items-center gap-2 rounded-1 px-4 py-0 text-4.5 btn-transition btn-transition disabled:(cursor-not-allowed opacity-50) active:enabled:scale-96 focusable',
     },
     theme: {
         easing: {