UI style: restyle theme with new fonts and color palette #1028
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,36 +1,31 @@ | ||
| /* This Source Code Form is subject to the terms of the Mozilla Public | ||
| - License, v. 2.0. If a copy of the MPL was not distributed with this | ||
| - file, You can obtain one at http://mozilla.org/MPL/2.0/. */ | ||
|
|
||
| import { getAttachments } from '@/chats/message-utils' | ||
| import { useShowSideview } from '@/sideview/sideview-store' | ||
| import type { ThunderboltUIMessage } from '@/chats/types' | ||
| import { buildDocumentSideviewId } from '@/sideview/sideview-id-builder' | ||
| import type { UIMessage } from 'ai' | ||
| import { MemoizedMarkdown } from './memoized-markdown' | ||
| import { FileCard } from './file-card' | ||
| import type { ResendAttachmentHandler } from './file-card' | ||
|
|
||
| type MessageBubblesProps = { | ||
| message: UIMessage | ||
| onResendAttachment?: ResendAttachmentHandler | ||
| } | ||
|
|
||
| <<<<<<< HEAD | ||
| export const MessageBubbles = ({ message, onResendAttachment }: MessageBubblesProps) => { | ||
| const showSideview = useShowSideview() | ||
| const attachments = getAttachments(message as ThunderboltUIMessage) | ||
|
|
||
| return ( | ||
| <> | ||
| {attachments.length > 0 && ( | ||
| <div className="ml-auto mt-6 flex max-w-3/4 flex-wrap justify-end gap-2"> | ||
| {attachments.map((attachment) => { | ||
| const resendTargets = | ||
| onResendAttachment && attachment.deliverAs | ||
| ? (['text', 'images'] as const).filter( | ||
|
|
@@ -60,12 +55,21 @@ | |
| /> | ||
| ) | ||
| })} | ||
| ======= | ||
| export const MessageBubbles = ({ message }: MessageBubblesProps) => | ||
| message.parts | ||
| .filter((part) => part.type === 'text') | ||
| .map((part, j) => ( | ||
| <div key={j} className="px-4 rounded-2xl max-w-3/4 bg-accent dark:bg-secondary/60 ml-auto mt-6 text-[14px]"> | ||
|
There was a problem hiding this comment. User bubble ignores responsive fontMedium Severity User message bubbles use a fixed   Reviewed by Cursor Bugbot for commit fae3d2c. Configure here. |
||
| <div className="space-y-2"> | ||
| <MemoizedMarkdown id={`${message.id}_${j}`} content={part.text || ''} /> | ||
| >>>>>>> 53c39843 (style: eliminate pure white/black and swap heading font to EB Garamond) | ||
| </div> | ||
| )} | ||
| {message.parts | ||
| .filter((part) => part.type === 'text') | ||
| .map((part, j) => ( | ||
| <div key={j} className="px-4 rounded-2xl max-w-3/4 bg-accent dark:bg-secondary/60 ml-auto mt-6 text-[14px]"> | ||
|
There was a problem hiding this comment. Unmerged conflict breaks MessageBubblesHigh Severity
Reviewed by Cursor Bugbot for commit fd56588. Configure here. |
||
| <div className="space-y-2"> | ||
| <MemoizedMarkdown id={`${message.id}_${j}`} content={part.text || ''} /> | ||
| </div> | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Unmerged conflict markers remain
High Severity
The chat prompt
classNameprop still contains Git conflict markers (<<<<<<<,=======,>>>>>>>) with two competing values. That invalid JSX prevents the file from parsing and blocks the app from building until the merge is resolved.Reviewed by Cursor Bugbot for commit fd56588. Configure here.