Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
molvqingtai committed Oct 11, 2024
2 parents 08b23aa + d4e42c6 commit 509f18e
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 10 deletions.
2 changes: 1 addition & 1 deletion src/app/content/components/DanmakuMessage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ const DanmakuMessage: FC<PromptItemProps> = ({ data, className, onClick, onMouse
<AvatarImage src={data.userAvatar} className="size-full" alt="avatar" />
<AvatarFallback>{data.username.at(0)}</AvatarFallback>
</Avatar>
<div className="max-w-40 overflow-hidden text-ellipsis">{data.body}</div>
<div className="max-w-44 truncate">{data.body}</div>
</Button>
)
}
Expand Down
4 changes: 1 addition & 3 deletions src/app/content/components/MessageItem.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,7 @@ const MessageItem: FC<MessageItemProps> = (props) => {
</Avatar>
<div className="overflow-hidden">
<div className="grid grid-cols-[1fr_auto] items-center gap-x-2 leading-none">
<div className="overflow-hidden text-ellipsis text-sm font-semibold text-slate-600">
{props.data.username}
</div>
<div className="truncate text-sm font-semibold text-slate-600">{props.data.username}</div>
<FormatDate className="text-xs text-slate-400" date={props.data.date}></FormatDate>
</div>
<div>
Expand Down
10 changes: 4 additions & 6 deletions src/app/content/views/Header/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ const Header: FC = () => {
</Avatar>
<HoverCard>
<HoverCardTrigger asChild>
<Button className="overflow-hidden" variant="link">
<Button className="overflow-hidden p-2" variant="link">
<span className="truncate text-lg font-semibold text-slate-600">
{siteInfo.hostname.replace(/^www\./i, '')}
</span>
Expand All @@ -49,8 +49,8 @@ const Header: FC = () => {
</HoverCard>
<HoverCard>
<HoverCardTrigger asChild>
<Button className="overflow-hidden" variant="link">
<div className="flex items-center gap-x-1 text-nowrap text-sm text-slate-500">
<Button className="p-0" variant="link">
<div className="flex items-center gap-x-1 text-nowrap text-xs text-slate-500">
<span className="relative flex size-2">
<span
className={cn(
Expand All @@ -77,9 +77,7 @@ const Header: FC = () => {
<AvatarImage src={user.userAvatar} alt="avatar" />
<AvatarFallback>{user.username.at(0)}</AvatarFallback>
</Avatar>
<div className="flex-1 overflow-hidden text-ellipsis text-nowrap text-sm text-slate-500">
{user.username}
</div>
<div className="flex-1 truncate text-sm text-slate-500">{user.username}</div>
</div>
))}
</ScrollArea>
Expand Down

0 comments on commit 509f18e

Please sign in to comment.