🐞 fix：修复按钮主题色丢失

CCNUPracticalTraining-530-2 · Jul 11, 2024 · 8d2f3f6 · 8d2f3f6
1 parent 07837d1
commit 8d2f3f6
Show file tree

Hide file tree

Showing 12 changed files with 1 addition and 11 deletions.
diff --git a/src/common/components/chat/chat-item.tsx b/src/common/components/chat/chat-item.tsx
@@ -221,7 +221,6 @@ export const ChatItem = ({
                     </FormItem>
                   )}
                 />
-                {/* @ts-ignore */}
                 <Button disabled={isLoading} size="sm" variant="primary">
                   保存
                 </Button>

diff --git a/src/common/components/modals/create-channel-modal.tsx b/src/common/components/modals/create-channel-modal.tsx
@@ -161,7 +161,6 @@ export const CreateChannelModal = () => {
               />
             </div>
             <DialogFooter className="bg-gray-100 px-6 py-4">
-              {/* @ts-ignore */}
               <Button variant="primary" disabled={isLoading}>
                 创建频道
               </Button>

diff --git a/src/common/components/modals/create-server-modal.tsx b/src/common/components/modals/create-server-modal.tsx
@@ -123,7 +123,6 @@ export const CreateServerModal = () => {
               />
             </div>
             <DialogFooter className="bg-gray-100 px-6 py-4">
-              {/* @ts-ignore */}
               <Button variant="primary" disabled={isLoading}>
                 创建服务器
               </Button>

diff --git a/src/common/components/modals/delete-channel-modal.tsx b/src/common/components/modals/delete-channel-modal.tsx
@@ -67,7 +67,6 @@ export const DeleteChannelModal = () => {
             <Button disabled={isLoading} onClick={onClose} variant="ghost">
               取消
             </Button>
-            {/* @ts-ignore */}
             <Button disabled={isLoading} variant="primary" onClick={onClick}>
               确定
             </Button>

diff --git a/src/common/components/modals/delete-message-modal.tsx b/src/common/components/modals/delete-message-modal.tsx
@@ -58,7 +58,6 @@ export const DeleteMessageModal = () => {
             <Button disabled={isLoading} onClick={onClose} variant="ghost">
               取消
             </Button>
-            {/* @ts-ignore */}
             <Button disabled={isLoading} variant="primary" onClick={onClick}>
               确定
             </Button>

diff --git a/src/common/components/modals/delete-server-modal.tsx b/src/common/components/modals/delete-server-modal.tsx
@@ -60,7 +60,6 @@ export const DeleteServerModal = () => {
             <Button disabled={isLoading} onClick={onClose} variant="ghost">
               取消
             </Button>
-            {/* @ts-ignore */}
             <Button disabled={isLoading} variant="primary" onClick={onClick}>
               确定
             </Button>

diff --git a/src/common/components/modals/edit-channel-modal.tsx b/src/common/components/modals/edit-channel-modal.tsx
@@ -160,7 +160,6 @@ export const EditChannelModal = () => {
               />
             </div>
             <DialogFooter className="bg-gray-100 px-6 py-4">
-              {/* @ts-ignore */}
               <Button variant="primary" disabled={isLoading}>
                 保存
               </Button>

diff --git a/src/common/components/modals/edit-server-modal.tsx b/src/common/components/modals/edit-server-modal.tsx
@@ -132,7 +132,6 @@ export const EditServerModal = () => {
               />
             </div>
             <DialogFooter className="bg-gray-100 px-6 py-4">
-              {/* @ts-ignore */}
               <Button variant="primary" disabled={isLoading}>
                 保存设定
               </Button>

diff --git a/src/common/components/modals/initial-modal.tsx b/src/common/components/modals/initial-modal.tsx
@@ -126,7 +126,6 @@ export const InitialModal = () => {
               />
             </div>
             <DialogFooter className="bg-gray-100 px-6 py-4">
-              {/* @ts-ignore */}
               <Button variant="primary" disabled={isLoading}>
                 创建服务器
               </Button>

diff --git a/src/common/components/modals/leave-server-modal.tsx b/src/common/components/modals/leave-server-modal.tsx
@@ -60,7 +60,6 @@ export const LeaveServerModal = () => {
             <Button disabled={isLoading} onClick={onClose} variant="ghost">
               取消
             </Button>
-            {/* @ts-ignore */}
             <Button disabled={isLoading} variant="primary" onClick={onClick}>
               确定
             </Button>

diff --git a/src/common/components/modals/message-file-modal.tsx b/src/common/components/modals/message-file-modal.tsx
@@ -105,7 +105,6 @@ export const MessageFileModal = () => {
               </div>
             </div>
             <DialogFooter className="bg-gray-100 px-6 py-4">
-              {/* @ts-ignore */}
               <Button variant="primary" disabled={isLoading}>
                 送出
               </Button>

diff --git a/src/common/components/ui/button.tsx b/src/common/components/ui/button.tsx
@@ -18,6 +18,7 @@ const buttonVariants = cva(
           'bg-secondary text-secondary-foreground hover:bg-secondary/80',
         ghost: 'hover:bg-accent hover:text-accent-foreground',
         link: 'text-primary underline-offset-4 hover:underline',
+        primary: 'bg-yellow-500 text-white hover:bg-yellow-500/90',
       },
       size: {
         default: 'h-10 px-4 py-2',