Skip to content

[cherry-pick] VS Code Onboarding TPI Fixes #309647

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vs-code-engineering wants to merge 1 commit into
base: main
Choose a base branch
from
+102 −16
Open

[cherry-pick] VS Code Onboarding TPI Fixes #309647

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
89 changes: 78 additions & 11 deletions src/vs/workbench/contrib/welcomeOnboarding/browser/media/variationA.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@
display: flex;
flex-direction: column;
min-height: 0;
overflow: hidden;
overflow: visible;
}

.onboarding-a-footer {
Expand Down Expand Up @@ -167,14 +167,21 @@

.onboarding-a-btn:focus-visible {
outline: 2px solid var(--vscode-focusBorder);
outline-offset: 1px;
outline-offset: 2px;
}

.onboarding-a-btn-primary {
background: var(--vscode-button-background);
color: var(--vscode-button-foreground);
}

.onboarding-a-btn-primary:focus-visible {
outline: none;
box-shadow:
0 0 0 2px var(--vscode-editorWidget-background, #252526),
0 0 0 4px var(--vscode-focusBorder);
}

.onboarding-a-btn-primary:hover {
background: var(--vscode-button-hoverBackground);
}
Expand Down Expand Up @@ -203,6 +210,19 @@
color: var(--vscode-editor-foreground);
}

.onboarding-a-btn-tertiary {
background: transparent;
color: var(--vscode-descriptionForeground);
border: none;
padding: 6px 16px;
font-size: 13px;
cursor: pointer;
}

.onboarding-a-btn-tertiary:hover {
color: var(--vscode-editor-foreground);
}

/* Sign-In step */
.onboarding-a-signin {
display: grid;
Expand Down Expand Up @@ -376,7 +396,7 @@

.onboarding-a-signin-btn:focus-visible {
outline: 2px solid var(--vscode-focusBorder);
outline-offset: 1px;
outline-offset: 2px;
}

.onboarding-a-signin-btn-label {
Expand Down Expand Up @@ -472,6 +492,7 @@
display: grid;
grid-template-columns: repeat(4, minmax(0, 1fr));
gap: 10px;
padding: 4px;
}

.onboarding-a-theme-grid.theme-grid-expanded {
Expand Down Expand Up @@ -502,6 +523,29 @@
box-shadow: 0 0 0 1px var(--vscode-focusBorder, #007acc);
}

.monaco-workbench.hc-black .onboarding-a-theme-card,
.monaco-workbench.hc-light .onboarding-a-theme-card {
border-width: 2px;
border-color: var(--vscode-contrastBorder);
}

.monaco-workbench.hc-black .onboarding-a-theme-card:hover,
.monaco-workbench.hc-light .onboarding-a-theme-card:hover {
border-color: var(--vscode-contrastActiveBorder, var(--vscode-focusBorder));
}

.monaco-workbench.hc-black .onboarding-a-theme-card:focus-visible,
.monaco-workbench.hc-light .onboarding-a-theme-card:focus-visible {
outline: 2px solid var(--vscode-contrastActiveBorder, var(--vscode-focusBorder));
outline-offset: 2px;
}

.monaco-workbench.hc-black .onboarding-a-theme-card.selected,
.monaco-workbench.hc-light .onboarding-a-theme-card.selected {
border-color: var(--vscode-contrastActiveBorder, var(--vscode-focusBorder));
box-shadow: 0 0 0 1px var(--vscode-contrastActiveBorder, var(--vscode-focusBorder));
}

.onboarding-a-theme-preview {
overflow: hidden;
}
Expand All @@ -514,7 +558,7 @@

.onboarding-a-theme-label {
padding: 4px 6px;
font-size: 10px;
font-size: 12px;
font-weight: 500;
text-align: center;
color: var(--vscode-editor-foreground);
Expand Down Expand Up @@ -720,7 +764,7 @@
align-items: center;
gap: 16px;
margin-top: auto;
padding-top: 10px;
padding: 14px 4px 4px 4px;
}

/* Tip banner */
Expand Down Expand Up @@ -788,6 +832,12 @@
text-decoration: underline;
}

.onboarding-a-doc-link:focus-visible {
outline: 2px solid var(--vscode-focusBorder);
outline-offset: 2px;
border-radius: 2px;
}

/* Sign-in icon row */
.onboarding-a-signin-icon-row {
display: flex;
Expand Down Expand Up @@ -826,13 +876,28 @@
}

.onboarding-a-signin-btn.primary {
background: var(--vscode-editor-background);
border-color: var(--vscode-focusBorder);
box-shadow: 0 0 0 1px color-mix(in srgb, var(--vscode-focusBorder) 18%, transparent);
background: var(--vscode-button-background);
color: var(--vscode-button-foreground);
border-color: var(--vscode-button-background);
}

.onboarding-a-signin-btn.primary:hover {
background: var(--vscode-list-hoverBackground);
background: var(--vscode-button-hoverBackground);
}

.onboarding-a-signin-btn.primary:focus-visible {
outline: none;
box-shadow:
0 0 0 2px var(--vscode-editorWidget-background, #252526),
0 0 0 4px var(--vscode-focusBorder);
}

.onboarding-a-signin-btn.primary .onboarding-a-provider-mark.github .codicon {
color: var(--vscode-button-foreground);
}

.onboarding-a-signin-btn.primary .onboarding-a-signin-btn-label {
color: var(--vscode-button-foreground);
}

@media (max-width: 720px) {
Expand Down Expand Up @@ -1019,8 +1084,10 @@
}

.onboarding-a-ext-install:focus-visible {
outline: 2px solid var(--vscode-focusBorder);
outline-offset: 1px;
outline: none;
box-shadow:
0 0 0 2px var(--vscode-editorWidget-background, #252526),
0 0 0 4px var(--vscode-focusBorder);
}

.onboarding-a-ext-install.installed {
Expand Down
29 changes: 24 additions & 5 deletions src/vs/workbench/contrib/welcomeOnboarding/browser/onboardingVariationA.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,9 @@ export class OnboardingVariationA extends Disposable implements IOnboardingServi
if (this._isLastStep()) {
this._logAction('complete');
this._dismiss('complete');
} else if (this.currentStepIndex === 0) {
this._logAction('continueWithoutSignIn');
this._nextStep();
} else {
this._logAction('next');
this._nextStep();
Expand Down Expand Up @@ -400,11 +403,25 @@ export class OnboardingVariationA extends Disposable implements IOnboardingServi
this.backButton.style.display = this.currentStepIndex === 0 ? 'none' : '';
}
if (this.nextButton) {
this.nextButton.textContent = this._isLastStep()
? localize('onboarding.getStarted', "Get Started")
: localize('onboarding.next', "Continue");
if (this.currentStepIndex === 0) {
// Sign-in step: secondary "Continue without Signing In"
this.nextButton.className = 'onboarding-a-btn onboarding-a-btn-secondary';
this.nextButton.textContent = localize('onboarding.continueWithoutSignIn', "Continue without Signing In");
} else if (this._isLastStep()) {
this.nextButton.className = 'onboarding-a-btn onboarding-a-btn-primary';
this.nextButton.textContent = localize('onboarding.getStarted', "Get Started");
} else {
this.nextButton.className = 'onboarding-a-btn onboarding-a-btn-primary';
this.nextButton.textContent = localize('onboarding.next', "Continue");
}
}
if (this.skipButton && this.footerLeft) {
if (this.currentStepIndex === 0) {
// Sign-in step: ghost Skip button
this.skipButton.className = 'onboarding-a-btn onboarding-a-btn-ghost';
} else {
this.skipButton.className = 'onboarding-a-btn onboarding-a-btn-ghost';
}
if (this._isLastStep()) {
this.skipButton.style.display = 'none';
// Show sign-in nudge in footer
Expand Down Expand Up @@ -679,8 +696,10 @@ export class OnboardingVariationA extends Disposable implements IOnboardingServi
for (const theme of themes) {
this._createThemeCard(themeGrid, theme, themeCards);
}
const selectedThemeIndex = themes.findIndex(t => t.id === this.selectedThemeId);
this._setupRadioGroupNavigation(themeCards, Math.max(0, selectedThemeIndex));
// Make all theme cards individually tabbable
for (const card of themeCards) {
card.setAttribute('tabindex', '0');
}

// Keyboard Mapping section — only shown when another editor is detected
const keymapOptions = this._detectedEditorIds
Expand Down
Loading