diff --git a/.github/workflows/pxt-buildmain.yml b/.github/workflows/pxt-buildmain.yml index d292deb6022..737dde4e11d 100644 --- a/.github/workflows/pxt-buildmain.yml +++ b/.github/workflows/pxt-buildmain.yml @@ -31,7 +31,7 @@ jobs: uses: actions/checkout@main with: repository: microsoft/pxt-arcade-sim - ref: v0.11.12 + ref: v0.11.13 token: ${{ secrets.GH_TOKEN }} path: node_modules/pxt-arcade-sim - name: pxt ci diff --git a/.github/workflows/pxt-buildpush.yml b/.github/workflows/pxt-buildpush.yml index c903cefca68..6d8395560cf 100644 --- a/.github/workflows/pxt-buildpush.yml +++ b/.github/workflows/pxt-buildpush.yml @@ -31,7 +31,7 @@ jobs: uses: actions/checkout@main with: repository: microsoft/pxt-arcade-sim - ref: v0.11.12 + ref: v0.11.13 token: ${{ secrets.GH_TOKEN }} path: node_modules/pxt-arcade-sim - name: pxt ci diff --git a/docs/index-ref.json b/docs/index-ref.json index 2c7077e9731..ccd0dff63f9 100644 --- a/docs/index-ref.json +++ b/docs/index-ref.json @@ -1,3 +1,3 @@ { - "appref": "v1.12.59" + "appref": "v1.12.61" } diff --git a/package.json b/package.json index 38d29097250..7ba294d30a3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pxt-arcade", - "version": "2.0.19", + "version": "2.0.21", "description": "Small arcade editor for MakeCode", "keywords": [ "JavaScript", @@ -32,10 +32,10 @@ }, "dependencies": { "pxt-common-packages": "12.2.5", - "pxt-core": "11.3.22" + "pxt-core": "11.3.26" }, "optionalDependencies": { - "pxt-arcade-sim": "microsoft/pxt-arcade-sim.git#v0.11.12" + "pxt-arcade-sim": "microsoft/pxt-arcade-sim.git#v0.11.13" }, "scripts": { "serve": "node node_modules/pxt-core/built/pxt.js serve", diff --git a/theme/blockly-toolbox.less b/theme/blockly-toolbox.less index 0759875375e..973c7a77351 100644 --- a/theme/blockly-toolbox.less +++ b/theme/blockly-toolbox.less @@ -7,7 +7,7 @@ div.blocklyTreeRow { margin-bottom: 0px !important; transition-property: background-color; - transition-duration: 1s; + transition-duration: 0.2s; } .blocklyToolboxDiv, .monacoToolboxDiv { @@ -26,4 +26,4 @@ div.blocklyTreeRow { .blocklyToolboxDiv, .monacoToolboxDiv { border-left: 0 !important; } -} \ No newline at end of file +} diff --git a/theme/color-themes/arcade-dark.json b/theme/color-themes/arcade-dark.json index 94c46825880..28bb609881d 100644 --- a/theme/color-themes/arcade-dark.json +++ b/theme/color-themes/arcade-dark.json @@ -1,6 +1,7 @@ { "id": "arcade-dark", "name": "Arcade Dark", + "weight": 60, "monacoBaseTheme": "vs-dark", "overrideFiles": [ "/overrides/arcade-dark-overrides.css" @@ -106,10 +107,10 @@ "pxt-colors-red-hover": "#c0392b", "pxt-colors-red-alpha10": "#e74c3c19", - "pxt-colors-teal-background": "#02494c", + "pxt-colors-teal-background": "#1abc9c", "pxt-colors-teal-foreground": "#ffffff", - "pxt-colors-teal-hover": "#036165", - "pxt-colors-teal-alpha10": "#02494c19", + "pxt-colors-teal-hover": "#16a085", + "pxt-colors-teal-alpha10": "#1abc9c19", "pxt-colors-yellow-background": "#fde300", "pxt-colors-yellow-foreground": "#000000", diff --git a/theme/color-themes/arcade-legacy.json b/theme/color-themes/arcade-legacy.json index a4fd74e4e58..7a6c4c7620d 100644 --- a/theme/color-themes/arcade-legacy.json +++ b/theme/color-themes/arcade-legacy.json @@ -1,6 +1,7 @@ { "id": "arcade-legacy", "name": "Arcade Legacy", + "weight": 20, "overrideFiles": [], "colors": { "pxt-header-background": "#F76820", @@ -41,25 +42,25 @@ "pxt-target-background3": "#FEF3E0", "pxt-target-foreground3": "#000000", - "pxt-target-background3-hover": "#fce0af", + "pxt-target-background3-hover": "#E4E4E4", "pxt-target-foreground3-hover": "#000000", "pxt-target-stencil3": "#e4d9c7", "pxt-neutral-background1": "#FFFFFF", "pxt-neutral-foreground1": "rgba(0,0,0,.85)", - "pxt-neutral-background1-hover": "#e6e6e6", + "pxt-neutral-background1-hover": "#f2f2f2", "pxt-neutral-foreground1-hover": "rgba(0,0,0,.85)", "pxt-neutral-stencil1": "rgba(34, 36, 38, .15)", "pxt-neutral-background2": "#F8F8F8", "pxt-neutral-foreground2": "rgba(0,0,0,.85)", - "pxt-neutral-background2-hover": "#DFDFDF", + "pxt-neutral-background2-hover": "#ebebeb", "pxt-neutral-foreground2-hover": "rgba(0,0,0,.85)", "pxt-neutral-stencil2": "#e9eef2", "pxt-neutral-background3": "#4e5758", "pxt-neutral-foreground3": "#FFFFFF", - "pxt-neutral-background3-hover": "#363c3d", + "pxt-neutral-background3-hover": "#424a4a", "pxt-neutral-foreground3-hover": "#FFFFFF", "pxt-neutral-stencil3": "#FFFFFF", "pxt-neutral-background3-alpha90": "#4E5758E5", diff --git a/theme/color-themes/arcade-light.json b/theme/color-themes/arcade-light.json index 46832afc885..bce2a970006 100644 --- a/theme/color-themes/arcade-light.json +++ b/theme/color-themes/arcade-light.json @@ -1,6 +1,7 @@ { "id": "arcade-light", "name": "Arcade Light", + "weight": 40, "overrideFiles": [], "colors": { "pxt-header-background": "#116E79", @@ -47,19 +48,19 @@ "pxt-neutral-background1": "#FFFFFF", "pxt-neutral-foreground1": "rgba(0,0,0,.85)", - "pxt-neutral-background1-hover": "#e6e6e6", + "pxt-neutral-background1-hover": "#f2f2f2", "pxt-neutral-foreground1-hover": "rgba(0,0,0,.85)", "pxt-neutral-stencil1": "rgba(34, 74, 114, 0.15)", "pxt-neutral-background2": "#F8F8F8", "pxt-neutral-foreground2": "rgba(0,0,0,.85)", - "pxt-neutral-background2-hover": "#DFDFDF", + "pxt-neutral-background2-hover": "#ebebeb", "pxt-neutral-foreground2-hover": "rgba(0,0,0,.85)", "pxt-neutral-stencil2": "#e9eef2", "pxt-neutral-background3": "#4e5758", "pxt-neutral-foreground3": "#FFFFFF", - "pxt-neutral-background3-hover": "#363c3d", + "pxt-neutral-background3-hover": "#424a4a", "pxt-neutral-foreground3-hover": "#FFFFFF", "pxt-neutral-stencil3": "#FFFFFF", "pxt-neutral-background3-alpha90": "#4E5758E5", diff --git a/theme/color-themes/overrides/arcade-dark-overrides.css b/theme/color-themes/overrides/arcade-dark-overrides.css index b7bb6f6c8cb..7973e7672f6 100644 --- a/theme/color-themes/overrides/arcade-dark-overrides.css +++ b/theme/color-themes/overrides/arcade-dark-overrides.css @@ -15,8 +15,9 @@ color: var(--pxt-target-foreground3); } -.pxtToolbox .blocklyTreeIcon { - /* Better contrast in toolbox, but try to preserve some of the icon color */ +.pxtToolbox .blocklyTreeIcon, +.tutorial-container span.docs.inlineblock { + /* Better contrast in toolbox & tutorial block colors, but try to preserve some of the icon color */ filter: brightness(1.2) saturate(2); }