@@ -83,40 +83,40 @@ const Button = ({
8383 hover,
8484} : ButtonProps ) => {
8585 const baseClass =
86- "tw-font-bold tw-justify-center tw-items-center tw-border tw-border-solid tw-rounded-md tw-transition-colors tw-min-w-max" ;
86+ "tw-font-bold tw-justify-center tw-items-center tw-border tw-border-solid tw-rounded-lg tw-transition-all tw-duration-300 tw-ease-out tw-min-w-max" ;
8787 const baseNotFullWidthClass = ! fullwidth && "tw-inline-flex" ;
8888 const lightHoverClass =
8989 ! disabled &&
9090 ! active &&
9191 hover === "light" &&
92- "hover:tw-bg-white hover:tw-border-white hover:tw-text-primary" ;
92+ "hover:tw-bg-white hover:tw-border-white hover:tw-text-primary hover:tw-shadow-lg hover:tw-shadow-white/25 hover:tw-scale-105 active:tw-scale-95 " ;
9393
9494 // Primary Button
95- const containedPrimaryClass = "tw-bg-primary tw-border-primary tw-text-white" ;
95+ const containedPrimaryClass = "tw-bg-primary tw-border-primary tw-text-white tw-shadow-md tw-shadow-primary/20 " ;
9696 const containedPrimaryHoverClass =
9797 ! disabled &&
9898 ! active &&
9999 hover === "default" &&
100- "hover:tw-bg-secondary hover:tw-border-secondary hover:tw-text-white" ;
100+ "hover:tw-bg-secondary hover:tw-border-secondary hover:tw-text-white hover:tw-shadow-lg hover:tw-shadow-primary/30 hover:tw-scale-105 active:tw-scale-95 " ;
101101 const containedPrimaryActiveClass =
102102 ! disabled &&
103103 active &&
104- "tw-bg-secondary tw-border-secondary active:tw-bg-secondary active:tw-border-secondary" ;
104+ "tw-bg-secondary tw-border-secondary active:tw-bg-secondary active:tw-border-secondary tw-shadow-xl tw-shadow-primary/40 " ;
105105 const containedPrimaryBtn = color === "primary" && [
106106 containedPrimaryClass ,
107107 containedPrimaryHoverClass ,
108108 containedPrimaryActiveClass ,
109109 lightHoverClass ,
110110 ] ;
111111
112- const outlinedPrimaryClass = "tw-bg-transparent tw-border-primary tw-text-primary" ;
112+ const outlinedPrimaryClass = "tw-bg-transparent tw-border-primary tw-text-primary tw-border-2 " ;
113113 const outlinedPrimaryHoverClass =
114- ! disabled && ! active && hover === "default" && "hover:tw-bg-primary hover:tw-text-white" ;
114+ ! disabled && ! active && hover === "default" && "hover:tw-bg-primary hover:tw-text-white hover:tw-shadow-lg hover:tw-shadow-primary/20 hover:tw-scale-105 active:tw-scale-95 " ;
115115 const outlinedPrimaryActiveClass =
116116 ! disabled &&
117117 active &&
118118 hover === "default" &&
119- "tw-bg-primary tw-border-primary tw-text-white active:tw-bg-primary active:tw-bg-primary" ;
119+ "tw-bg-primary tw-border-primary tw-text-white active:tw-bg-primary active:tw-bg-primary tw-shadow-lg tw-shadow-primary/30 " ;
120120 const outlinedPrimaryBtn = color === "primary" && [
121121 outlinedPrimaryClass ,
122122 outlinedPrimaryHoverClass ,
@@ -125,16 +125,16 @@ const Button = ({
125125 ] ;
126126
127127 // Light Button
128- const containedLightClass = "tw-bg-light tw-border-light tw-text-heading" ;
128+ const containedLightClass = "tw-bg-light tw-border-light tw-text-heading tw-shadow-sm " ;
129129 const containedLightHoverClass =
130130 ! disabled &&
131131 ! active &&
132132 hover === "default" &&
133- "hover:tw-bg-primary hover:tw-border-primary hover:tw-text-white" ;
133+ "hover:tw-bg-primary hover:tw-border-primary hover:tw-text-white hover:tw-shadow-lg hover:tw-shadow-primary/20 hover:tw-scale-105 active:tw-scale-95 " ;
134134 const containedLightActiveClass =
135135 ! disabled &&
136136 active &&
137- "tw-bg-primary tw-border-primary active:tw-bg-primary active:tw-border-primary" ;
137+ "tw-bg-primary tw-border-primary active:tw-bg-primary active:tw-border-primary tw-shadow-lg tw-shadow-primary/30 " ;
138138 const containedLightBtn = color === "light" && [
139139 containedLightClass ,
140140 containedLightHoverClass ,
@@ -163,6 +163,7 @@ const Button = ({
163163 const mdBtn =
164164 size === "md" &&
165165 "tw-text-md tw-px-7 tw-py-1 tw-min-h-[48px] md:tw-min-h-[52px] md:tw-px-10" ;
166+ const smBtn = size === "sm" && "tw-text-sm tw-px-6 tw-py-1 tw-min-h-[40px] md:tw-min-h-[44px]" ;
166167 const xsBtn = size === "xs" && "tw-text-[13px] tw-px-5 tw-leading-[30px] tw-min-h-8" ;
167168
168169 // Button Shapes
@@ -175,7 +176,7 @@ const Button = ({
175176 variant !== "texted" && baseNotFullWidthClass ,
176177 variant === "contained" && [ containedPrimaryBtn , containedLightBtn ] ,
177178 variant === "outlined" && [ outlinedPrimaryBtn , outlinedLightBtn ] ,
178- ! iconButton && variant !== "texted" && [ mdBtn , xsBtn ] ,
179+ ! iconButton && variant !== "texted" && [ mdBtn , smBtn , xsBtn ] ,
179180 roundedBtn ,
180181 ellipseBtn ,
181182 fullBtn ,
0 commit comments