Skip to content

Commit f94c03d

Browse files
[cherry-pick] clean up confirmation carousel - no more collapse and better focus logic (#311419)
Co-authored-by: vs-code-engineering[bot] <vs-code-engineering[bot]@users.noreply.github.com>
1 parent 2ccda4d commit f94c03d

2 files changed

Lines changed: 54 additions & 206 deletions

File tree

src/vs/workbench/contrib/chat/browser/widget/chatContentParts/media/chatToolConfirmationCarousel.css

Lines changed: 33 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,16 @@
2929
background-color: var(--vscode-panel-background);
3030
overflow: hidden;
3131

32-
&:focus:not(:focus-visible) {
32+
&:focus {
33+
outline: none !important;
34+
}
35+
36+
&:focus-visible,
37+
&:focus-within {
38+
border-color: var(--vscode-focusBorder);
39+
}
40+
41+
.chat-tool-carousel-content .chat-confirmation-widget-container:focus {
3342
outline: none;
3443
}
3544

@@ -93,77 +102,57 @@
93102
margin-left: auto;
94103
}
95104

96-
button:focus:not(:focus-visible),
97-
.monaco-button:focus:not(:focus-visible) {
98-
outline: none !important;
99-
box-shadow: none !important;
100-
}
101-
102-
.chat-tool-carousel-nav-arrows {
103-
display: flex;
104-
align-items: center;
105-
}
106-
107-
.monaco-button.chat-tool-carousel-nav-arrow {
105+
.monaco-button.chat-tool-carousel-dismiss-button {
108106
min-width: 22px;
109107
width: 22px;
110108
height: 22px;
111109
padding: 0;
112110
border: none !important;
113111
box-shadow: none !important;
114112
background: transparent !important;
115-
color: var(--vscode-foreground) !important;
113+
color: var(--vscode-icon-foreground) !important;
114+
cursor: pointer;
115+
display: flex;
116+
align-items: center;
117+
justify-content: center;
116118
}
117119

118-
.monaco-button.chat-tool-carousel-nav-arrow:hover:not(.disabled) {
120+
.monaco-button.chat-tool-carousel-dismiss-button:hover {
119121
background: var(--vscode-toolbar-hoverBackground) !important;
120122
}
121123

122-
.monaco-button.chat-tool-carousel-nav-arrow.disabled {
123-
opacity: 0.4;
124+
button:focus,
125+
.monaco-button:focus {
126+
outline: none !important;
127+
box-shadow: none !important;
124128
}
125129

126-
.monaco-button.chat-tool-carousel-header-button {
130+
.chat-tool-carousel-nav-arrows {
131+
display: flex;
132+
align-items: center;
133+
}
134+
135+
.monaco-button.chat-tool-carousel-nav-arrow {
127136
min-width: 22px;
128137
width: 22px;
129138
height: 22px;
130139
padding: 0;
131140
border: none !important;
132141
box-shadow: none !important;
133142
background: transparent !important;
134-
color: var(--vscode-icon-foreground) !important;
135-
cursor: pointer;
136-
display: flex;
137-
align-items: center;
138-
justify-content: center;
143+
color: var(--vscode-foreground) !important;
139144
}
140145

141-
.monaco-button.chat-tool-carousel-header-button:hover:not(.disabled) {
146+
.monaco-button.chat-tool-carousel-nav-arrow:hover:not(.disabled) {
142147
background: var(--vscode-toolbar-hoverBackground) !important;
143148
}
144149

145-
&.chat-tool-carousel-content-expanded {
146-
max-height: min(650px, 70vh);
150+
.monaco-button.chat-tool-carousel-nav-arrow.disabled {
151+
opacity: 0.4;
147152
}
148153

149-
&.chat-tool-carousel-collapsed {
150-
.chat-tool-carousel-content {
151-
display: none;
152-
}
153-
154-
.chat-tool-carousel-overlay {
155-
padding: 6px 10px 6px 12px;
156-
border-bottom: none;
157-
}
158-
159-
.chat-tool-carousel-title-group {
160-
flex: 1;
161-
}
162-
163-
.chat-tool-carousel-nav-arrows,
164-
.chat-tool-carousel-step-indicator {
165-
display: none;
166-
}
154+
.monaco-list:focus {
155+
outline: none !important;
167156
}
168157

169158
.chat-tool-carousel-content {
@@ -230,12 +219,6 @@
230219
background-color: var(--vscode-sideBar-background);
231220
}
232221

233-
.chat-tool-carousel-content-expanded & {
234-
.chat-confirmation-widget-message {
235-
max-height: min(500px, 55vh);
236-
}
237-
}
238-
239222
.chat-buttons-container {
240223
flex-shrink: 0;
241224
}

0 commit comments

Comments
 (0)