feat: merge remote

ChatGPTNextWeb · Apr 30, 2024 · 8a14cb1 · 8a14cb1
2 parents 3d99965 + 4d5a947
commit 8a14cb1
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 6 deletions.
diff --git a/app/components/ActionsBar/index.tsx b/app/components/ActionsBar/index.tsx
@@ -103,7 +103,9 @@ export default function ActionsBar(props: ActionsBarProps) {
  selected === action.id
  ? `!bg-actions-bar-btn-default ${action.activeClassName}`
  : "bg-transparent"
- } rounded-md items-center ${action.className}`}
+ } rounded-md items-center ${
+ action.className
+ } transition duration-300 ease-in-out`}
  onClick={handlerClick(action)}
  >
  {selected === action.id ? activeIcon : inactiveIcon}

diff --git a/app/components/Input/index.tsx b/app/components/Input/index.tsx
@@ -57,7 +57,7 @@ export default function Input(props: CommonInputProps & InputProps) {
 
  return (
  <div
- className={` group/input w-[100%] rounded-chat-input bg-input flex gap-3 items-center px-3 py-2 ${className} hover:bg-select-hover ${inputClassName}`}
+ className={` group/input w-[100%] rounded-chat-input bg-input transition-colors duration-300 ease-in-out flex gap-3 items-center px-3 py-2 ${className} hover:bg-select-hover ${inputClassName}`}
  >
  <input
  {...rest}

diff --git a/app/components/Select/index.tsx b/app/components/Select/index.tsx
@@ -94,7 +94,7 @@ const Select = <Value extends number | string>(props: SearchProps<Value>) => {
  className={selectClassName}
  >
  <div
- className={`flex items-center gap-3 py-2 px-3 bg-select rounded-action-btn font-time text-sm-title cursor-pointer hover:bg-select-hover`}
+ className={`flex items-center gap-3 py-2 px-3 bg-select rounded-action-btn font-time text-sm-title cursor-pointer hover:bg-select-hover transition duration-300 ease-in-out`}
  ref={contentRef}
  >
  <div className={`flex items-center gap-2 flex-1`}>

diff --git a/app/components/Switch/index.tsx b/app/components/Switch/index.tsx
@@ -16,7 +16,7 @@ export default function Switch(props: SwitchProps) {
  checked={value}
  onCheckedChange={onChange}
  className={` 
- cursor-pointer flex w-switch h-switch p-0.5 box-content rounded-md
+ cursor-pointer flex w-switch h-switch p-0.5 box-content rounded-md transition-colors duration-300 ease-in-out
  ${switchClassName} 
  ${
  value

diff --git a/app/containers/Chat/components/ChatActions.tsx b/app/containers/Chat/components/ChatActions.tsx
@@ -236,7 +236,7 @@ export function ChatActions(props: {
  className={`${act.className ?? ""}`}
  >
  <div
- className={` cursor-pointer h-[32px] w-[32px] flex items-center justify-center hover:bg-chat-actions-btn-hovered hover:rounded-action-btn`}
+ className={` cursor-pointer h-[32px] w-[32px] flex items-center justify-center transition duration-300 ease-in-out hover:bg-chat-actions-btn-hovered hover:rounded-action-btn`}
  onClick={act.onClick}
  >
  {act.icon}
@@ -256,7 +256,7 @@ export function ChatActions(props: {
  placement={ind === arr.length - 1 ? "rt" : "t"}
  >
  <div
- className=" cursor-pointer h-[32px] w-[32px] flex items-center justify-center hover:bg-chat-actions-btn-hovered hover:rounded-action-btn"
+ className=" cursor-pointer h-[32px] w-[32px] flex items-center transition duration-300 ease-in-out justify-center hover:bg-chat-actions-btn-hovered hover:rounded-action-btn"
  onClick={act.onClick}
  >
  {act.icon}

diff --git a/app/containers/Chat/components/SessionItem.tsx b/app/containers/Chat/components/SessionItem.tsx
@@ -46,6 +46,7 @@ export default function SessionItem(props: {
  className={`
  group/chat-menu-list relative flex p-3 items-center gap-2 self-stretch rounded-md mb-2 
  border 
+ transition-colors duration-300 ease-in-out
  bg-chat-menu-session-unselected-mobile border-chat-menu-session-unselected-mobile
  md:bg-chat-menu-session-unselected md:border-chat-menu-session-unselected
  ${