Skip to content

[pull] master from microsoft:master #280

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 3 commits into from
Aug 28, 2026
Merged

[pull] master from microsoft:master #280

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b1dcfc2
fix rows on ipad (#11555)
jwunderl Aug 27, 2026
2dc10a5
Use theme from compiled script if available (#11556)
aznhassan Aug 28, 2026
d925fdc
[pxt-cli] bump version to v13.1.15 (#11557)
abchatra Aug 28, 2026
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
1 change: 1 addition & 0 deletions localtypings/pxtarget.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1186,6 +1186,7 @@ declare namespace ts.pxtc {
usedBuiltinParts?: string[];
allParts?: string[];
breakpoints?: number[];
theme?: string | pxt.Map<string>;
}

interface UpgradePolicy {
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "pxt-core",
"version": "13.1.14",
"version": "13.1.15",
"description": "Microsoft MakeCode provides Blocks / JavaScript / Python tools and editors",
"keywords": [
"TypeScript",
Expand Down
3 changes: 2 additions & 1 deletion pxtrunner/runner.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -431,6 +431,7 @@ function initDriverAndOptions(
} = compileInfo || {};
let board = pxt.appTarget.simulator.boardDefinition;
let storedState: pxt.Map<string> = getStoredState(simOptions.id)
let theme: string | pxt.Map<string> = mainPkg.config?.theme ?? compileInfo?.theme;
let runOptions: pxsim.SimulatorRunOptions = {
debug: simOptions.debug,
mute: simOptions.mute,
Expand All @@ -449,7 +450,7 @@ function initDriverAndOptions(
autofocus: simOptions.autofocus,
queryParameters: simOptions.additionalQueryParameters,
mpRole: simOptions.mpRole,
theme: mainPkg.config?.theme,
theme,
};
if (pxt.appTarget.simulator && !simOptions.fullScreen)
runOptions.aspectRatio = parts.length && pxt.appTarget.simulator.partsAspectRatio
Expand Down
4 changes: 4 additions & 0 deletions theme/home.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -867,6 +867,10 @@
touch-action: pan-y;
}

.projectsdialog .carouselbody {
min-width: max-content;
}

.carouselitem {
float: left;
}
Expand Down
Loading