mirror of
https://github.com/RooVetGit/Roo-Code.git
synced 2026-09-08 22:21:23 +00:00
fix: resolve merge conflicts and apply scope indicator feature
- Add scope badges (global/project) to mode selector dropdown in ModeSelector.tsx
- Add scope badges to mode selector trigger and dropdown in ModesView.tsx
- Use {source || "global"} pattern for default value handling
- Adapted to new inline rename mode UX in ModesView.tsx
Resolves merge conflicts with main branch while preserving the scope indicator feature from #8238
This commit is contained in:
parent
bd5af8a0f7
commit
58cb860555
2 changed files with 718 additions and 626 deletions
|
|
@ -198,7 +198,7 @@ export const ModeSelector = ({
|
|||
disabled={disabled}
|
||||
data-testid="mode-selector-trigger"
|
||||
className={cn(
|
||||
"inline-flex items-center gap-1 relative whitespace-nowrap px-1.5 py-1 text-xs",
|
||||
"inline-flex items-center relative whitespace-nowrap px-1.5 py-1 text-xs",
|
||||
"bg-transparent border border-[rgba(255,255,255,0.08)] rounded-md text-vscode-foreground",
|
||||
"transition-all duration-150 focus:outline-none focus-visible:ring-1 focus-visible:ring-vscode-focusBorder focus-visible:ring-inset",
|
||||
disabled
|
||||
|
|
@ -311,7 +311,11 @@ export const ModeSelector = ({
|
|||
iconClass="codicon-settings-gear"
|
||||
title={t("chat:modeSelector.settings")}
|
||||
onClick={() => {
|
||||
vscode.postMessage({ type: "switchTab", tab: "modes" })
|
||||
vscode.postMessage({
|
||||
type: "switchTab",
|
||||
tab: "settings",
|
||||
values: { section: "modes" },
|
||||
})
|
||||
setOpen(false)
|
||||
}}
|
||||
/>
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
Loading…
Add table
Reference in a new issue