Compare commits

..

No commits in common. "bc5fcb1fa920a8c8897956dce94ab146a2e24667" and "d0afbf1897be56146e568f5d6120a9420ea83627" have entirely different histories.

5 changed files with 12 additions and 15 deletions

View File

@ -68,7 +68,7 @@ export const Suggestion = ({
className={cn( className={cn(
"cursor-pointer w-[216px] rounded-full px-[20px] py-[15px] text-sm font-normal", "cursor-pointer w-[216px] rounded-full px-[20px] py-[15px] text-sm font-normal",
"border-none bg-ws-surface-subtle text-ws-text-muted", "border-none bg-ws-surface-subtle text-ws-text-muted",
"hover:bg-ws-interactive-hover hover:text-ws-base-1", "hover:bg-ws-surface-elevated hover:text-ws-base-1",
className, className,
)} )}
onClick={handleClick} onClick={handleClick}

View File

@ -1807,6 +1807,9 @@ export const ArtifactZoomSelector = ({
className="w-52 p-[20px]" className="w-52 p-[20px]"
> >
<div className="mb-2 flex items-center justify-between"> <div className="mb-2 flex items-center justify-between">
<span className="text-muted-foreground text-xs">
{ZOOM_LEVELS[0]}%
</span>
<span className="text-foreground text-xs font-medium"> <span className="text-foreground text-xs font-medium">
{value}% {value}%
</span> </span>

View File

@ -85,7 +85,6 @@ import {
} from "@/core/threads/reference-events"; } from "@/core/threads/reference-events";
import { useIframeSkill } from "@/hooks/use-iframe-skill"; import { useIframeSkill } from "@/hooks/use-iframe-skill";
import { cn } from "@/lib/utils"; import { cn } from "@/lib/utils";
import { useBrand } from "@/core/brand/provider";
import { import {
ModelSelector, ModelSelector,
@ -307,8 +306,6 @@ export function InputBox({
} }
}, [mentionOpen, refetchReferenceFiles]); }, [mentionOpen, refetchReferenceFiles]);
const{ brand } = useBrand()
// Welcome 态下禁用收缩,始终保持展开 // Welcome 态下禁用收缩,始终保持展开
const effectiveIsFocused = const effectiveIsFocused =
(showWelcomeStyle ?? false) || isFocused || memoryPanelOpen; (showWelcomeStyle ?? false) || isFocused || memoryPanelOpen;
@ -802,7 +799,7 @@ export function InputBox({
}} }}
className="relative w-full" className="relative w-full"
> >
{/* <Tour <Tour
open={isInputToolsTourOpen} open={isInputToolsTourOpen}
onClose={closeInputToolsTour} onClose={closeInputToolsTour}
onFinish={finishInputToolsTour} onFinish={finishInputToolsTour}
@ -814,7 +811,7 @@ export function InputBox({
color: 'rgba(255,255,255, .8)', color: 'rgba(255,255,255, .8)',
}} }}
steps={inputToolsTourSteps} steps={inputToolsTourSteps}
/> */} />
<AttachmentPreviewBar <AttachmentPreviewBar
references={references} references={references}
threadId={threadId} threadId={threadId}
@ -1109,13 +1106,14 @@ export function InputBox({
status={status} status={status}
/> />
</PromptInput> </PromptInput>
{brand === "xclaw" && shouldShowSuggestionList && ( {/* TODO: 需要在sxwz中隐藏 */}
{/* {shouldShowSuggestionList && (
<SuggestionListContainer <SuggestionListContainer
ref={suggestionListTourRef} ref={suggestionListTourRef}
bootstrapAndLockSkills={iframeSkill.bootstrapAndLockSkills} bootstrapAndLockSkills={iframeSkill.bootstrapAndLockSkills}
isBootstrapping={iframeSkill.isBootstrapping} isBootstrapping={iframeSkill.isBootstrapping}
/> />
)} )} */}
{!disabled && {!disabled &&
!showWelcomeStyle && !showWelcomeStyle &&

View File

@ -10,6 +10,4 @@ const globalsCss = readFileSync(path.join(currentDir, "globals.css"), "utf8");
void test("brand selectors target :root to outrank default root variables", () => { void test("brand selectors target :root to outrank default root variables", () => {
assert.match(globalsCss, /:root\.brand-xclaw\s*\{/); assert.match(globalsCss, /:root\.brand-xclaw\s*\{/);
assert.match(globalsCss, /:root\.brand-sxwz\s*\{/); assert.match(globalsCss, /:root\.brand-sxwz\s*\{/);
assert.match(globalsCss, /:root\.brand-xclaw\s*\{[\s\S]*--ws-color-surface-elevated\s*:/);
assert.match(globalsCss, /:root\.brand-sxwz\s*\{[\s\S]*--ws-color-surface-elevated\s*:/);
}); });

View File

@ -68,18 +68,16 @@
@source inline("bg-{background,muted,primary,secondary,accent}"); @source inline("bg-{background,muted,primary,secondary,accent}");
@source inline("border-{border,input}"); @source inline("border-{border,input}");
:root.brand-xclaw { .brand-xclaw {
--brand-color-primary: #150033; --brand-color-primary: #150033;
--brand-color-primary-10: #1500331a; --brand-color-primary-10: #1500331a;
--brand-color-primary-60: #15003399; --brand-color-primary-60: #15003399;
--ws-color-surface-elevated: #fbfafc;
} }
:root.brand-sxwz { .brand-sxwz {
--brand-color-primary: #000f33; --brand-color-primary: #000f33;
--brand-color-primary-10: #000f331a; --brand-color-primary-10: #000f331a;
--brand-color-primary-60: #000f3399; --brand-color-primary-60: #000f3399;
--ws-color-surface-elevated: #f8f9fa;
} }
@custom-variant dark (&:is(.dark *)); @custom-variant dark (&:is(.dark *));
@ -649,7 +647,7 @@ code {
.workspace-code-editor .ͼ4k, .workspace-code-editor .ͼ4k,
.workspace-code-editor .ͼ4s, .workspace-code-editor .ͼ4s,
.workspace-code-editor .ͼ4q, .workspace-code-editor .ͼ4q
.workspace-code-editor .ͼ4r { .workspace-code-editor .ͼ4r {
color: var(--ws-color-fg-primary); color: var(--ws-color-fg-primary);
} }