client(Button.tsx): success disabled state

0l1v3rr · 0l1v3rr · commit d40451a52902 · 2023-05-03T14:43:52.000+02:00
diff --git a/client/src/components/ui/Button.tsx b/client/src/components/ui/Button.tsx
@@ -8,7 +8,7 @@ const buttonVariants = cva(
     variants: {
       variant: {
         success:
-          "bg-gh-green border-gh-green-active hover:bg-gh-green-active disabled:bg-gh-green-disabled",
+          "bg-gh-green border-gh-green-active hover:bg-gh-green-active disabled:bg-gh-green-disabled disabled:border-gh-green-disabled-border disabled:text-gh-text-secondary",
         secondary:
           "bg-gh-gray border-gh-border hover:bg-gh-gray-active hover:border-gh-border-active disabled:border-gh-border disabled:text-gh-text-secondary disabled:bg-gh-gray",
         danger:
diff --git a/client/src/components/ui/FormWrapper.tsx b/client/src/components/ui/FormWrapper.tsx
@@ -1,6 +1,5 @@
 import { FormHTMLAttributes, ReactNode } from "react";
 import { AiOutlineSetting } from "react-icons/ai";
-import { BsSendCheck } from "react-icons/bs";
 import { CgErase, CgEnter } from "react-icons/cg";
 import Button from "./Button";
 import { cn } from "./utils";
@@ -68,10 +67,11 @@ const FormWrapper = ({ title, children, className, ...props }: Props) => {
 
         <Button
           type="submit"
-          label={isLastPage ? "Generate" : "Next"}
+          disabled={isLastPage}
+          label="Next"
           variant="success"
           size="small"
-          icon={isLastPage ? <BsSendCheck /> : <CgEnter />}
+          icon={<CgEnter />}
         />
       </div>
     </form>
diff --git a/client/tailwind.config.js b/client/tailwind.config.js
@@ -19,7 +19,8 @@ export default {
         "gh-blue-active": "#58a6ff",
         "gh-green": "#238636",
         "gh-green-active": "#2EA043",
-        "gh-green-disabled": "#20702F",
+        "gh-green-disabled-border": "#20702F",
+        "gh-green-disabled": "#1A5C27",
         "gh-red": "#DA3633",
         "gh-red-active": "#F85149",
         "gh-gray": "#21262D",
