Skip to content

Commit 3f435cd

Browse files
fix
Signed-off-by: Roman Nikitenko <rnikiten@redhat.com>
1 parent 7bca16e commit 3f435cd

3 files changed

Lines changed: 9 additions & 1 deletion

File tree

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
[
2+
{
3+
"from": ".agent-status-container {\n\tdisplay: flex;\n\tflex-direction: row;\n\tflex-wrap: nowrap;\n\talign-items: center;\n\tjustify-content: flex-start;\n\tgap: 4px;\n\t-webkit-app-region: no-drag;\n\toverflow: visible;\n\tcolor: var(--vscode-commandCenter-foreground);\n}",
4+
"by": ".agent-status-container {\n\tdisplay: flex;\n\tflex-direction: row;\n\tflex-wrap: nowrap;\n\talign-items: center;\n\tjustify-content: flex-start;\n\tgap: 4px;\n\t-webkit-app-region: no-drag;\n\toverflow: visible;\n\tcolor: inherit;\n}"
5+
}
6+
]

code/src/vs/workbench/contrib/chat/browser/agentSessions/experiments/media/agenttitlebarstatuswidget.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
gap: 4px;
4343
-webkit-app-region: no-drag;
4444
overflow: visible;
45-
color: var(--vscode-commandCenter-foreground);
45+
color: inherit;
4646
}
4747

4848
/* Pill - shared styles */

rebase.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -440,6 +440,8 @@ resolve_conflicts() {
440440
apply_changes_multi_line "$conflictingFile"
441441
elif [[ "$conflictingFile" == "code/src/vs/workbench/contrib/chat/browser/agentSessions/experiments/agentTitleBarStatusWidget.ts" ]]; then
442442
apply_changes_multi_line "$conflictingFile"
443+
elif [[ "$conflictingFile" == "code/src/vs/workbench/contrib/chat/browser/agentSessions/experiments/media/agenttitlebarstatuswidget.css" ]]; then
444+
apply_changes_multi_line "$conflictingFile"
443445
elif [[ "$conflictingFile" == "code/src/vs/workbench/browser/parts/editor/media/modalEditorPart.css" ]]; then
444446
apply_changes_multi_line "$conflictingFile"
445447
elif [[ "$conflictingFile" == "code/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts" ]]; then

0 commit comments

Comments
 (0)