Skip to content

[pull] master from microsoft:master #293

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

Merged
pull merged 1 commit into from
Sep 10, 2026
Merged

[pull] master from microsoft:master #293

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
13 changes: 13 additions & 0 deletions theme/common.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -952,6 +952,19 @@ Avatar
width: 0;
}

.common-menu-dropdown-pane li.common-menu-dropdown-item.common-button.github-menuitem {
padding: 8px 18px;

.avatar img {
position: relative;
left: -0.25em;
width: 1.5em;
height: 1.5em;
border-radius: 1.5em;
margin-right: 0.45em;
}
}

/* Json editor */
#pxtJsonEditor .ui.content {
padding: 1rem;
Expand Down
6 changes: 3 additions & 3 deletions webapp/src/container.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -538,13 +538,13 @@ export class SettingsMenu extends data.Component<SettingsMenuProps, SettingsMenu
items.push({ role: "separator" });
items.push({
role: "menuitem",
className: "ui item",
className: "github-menuitem",
title: lf("Unlink {0} from GitHub", githubUser.name),
onClick: this.signOutGithub,
children: <>
<div className="avatar" role="presentation">
<img className="ui circular image" src={githubUser.photo} alt={lf("User picture")} />
</div>,
<img src={githubUser.photo} alt={lf("User picture")} />
</div>
{lf("Disconnect GitHub")}
</>
});
Expand Down
22 changes: 12 additions & 10 deletions webapp/src/projects.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -707,13 +707,13 @@ export class ProjectSettingsMenu extends data.Component<ProjectSettingsMenuProps
items.push({ role: "separator" });
items.push({
role: "menuitem",
className: "ui item",
className: "github-menuitem",
title: lf("Unlink {0} from GitHub", githubUser.name),
onClick: this.signOutGithub,
children: <>
<div className="avatar" role="presentation">
<img className="ui circular image" src={githubUser.photo} alt={lf("User picture")} />
</div>,
<img src={githubUser.photo} alt={lf("User picture")} />
</div>
{lf("Disconnect GitHub")}
</>
});
Expand Down Expand Up @@ -758,13 +758,15 @@ export class ProjectSettingsMenu extends data.Component<ProjectSettingsMenuProps
});
}

return <MenuDropdown
id="settings-menuitem"
className="settings-menuitem"
title={lf("Settings")}
icon="icon setting large"
items={items}
/>
return (
<MenuDropdown
id="settings-menuitem"
className="settings-menuitem"
title={lf("Settings")}
icon="icon setting large"
items={items}
/>
);
}
}

Expand Down
Loading