pxt-core 7.5.16 → 7.5.19

package/localtypings/pxtarget.d.ts

@@ -801,6 +801,9 @@ declare namespace ts.pxtc {
         topblock?: boolean;
         topblockWeight?: number;
         locs?: pxt.Map<string>;
+        toolboxParent?: string; // The ID of a block that will wrap this block in the toolbox. Useful for having multiple instances of the same parent block with different child shadows
+        toolboxParentArgument?: string; // Used with toolboxParent. The name of the arg that this block should be inserted into as a shadow
+
         // On namepspace
         subcategories?: string[];
         groups?: string[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pxt-core",
-  "version": "7.5.16",
+  "version": "7.5.19",
   "description": "Microsoft MakeCode provides Blocks / JavaScript / Python tools and editors",
   "keywords": [
     "TypeScript",
@@ -68,7 +68,7 @@
     "browserify": "16.2.3",
     "chai": "^3.5.0",
     "cssnano": "4.1.10",
-    "dompurify": "2.0.8",
+    "dompurify": "2.0.17",
     "faye-websocket": "0.11.1",
     "karma": "6.3.10",
     "karma-chai": "0.1.0",
@@ -85,7 +85,7 @@
     "request": "2.88.0",
     "rimraf": "2.5.4",
     "rtlcss": "2.2.1",
-    "sanitize-html": "1.22.0",
+    "sanitize-html": "2.3.2",
     "semantic-ui-less": "2.4.1",
     "terser": "5.6.0"
   },

package/theme/common.less

@@ -884,17 +884,21 @@ Field editors
         Editor Sidebar
 *******************************/
 
+@sidebarPrimaryColor: @teal;
+@sidebarSecondaryColor: @blue;
+@sidbarActiveTabIconColor: @sidebarSecondaryColor;
+
 #editorSidebar {
     border-right: 2px solid darken(desaturate(@blocklyToolboxColor, 60%), 10%);
 
     .tab-navigation {
-        color: @blue;
-        background-color: @teal;
+        color: @sidebarSecondaryColor;
+        background-color: @sidebarPrimaryColor;
     }
 
     .tab-icon.active {
-        color: @teal;
-        background-color: @blue;
+        color: @sidbarActiveTabIconColor;
+        background-color: @sidebarPrimaryColor;
     }
 }
 

package/theme/tutorial-sidebar.less

@@ -2,8 +2,11 @@
 @tutorialFontSize: 1.125rem;
 @tutorialTitleFontSize: 1.5rem;
 
-@tutorialPrimaryColor: @teal;
-@tutorialSecondaryColor: @blue;
+@tutorialPrimaryColor: @sidebarPrimaryColor;
+@tutorialSecondaryColor: @sidebarSecondaryColor;
+@tutorialBarForegroundColor: @tutorialPrimaryColor;
+@tutorialBarBackgroundColor: @tutorialSecondaryColor;
+
 @tutorialLinkColor: #0064BF;
 @tutorialLinkHoverColor: #003C94;
 
@@ -142,12 +145,12 @@
     height: 1rem;
     overflow: hidden;
     border-radius: 1rem;
-    background-color: @tutorialSecondaryColor;
+    background-color: @tutorialBarBackgroundColor;
     cursor: pointer;
 }
 
 .tutorial-step-bar-fill {
-    background-color: @tutorialPrimaryColor;
+    background-color: @tutorialBarForegroundColor;
     height: 100%;
     transition: width 0.5s ease-out;
     pointer-events: none;
@@ -530,7 +533,7 @@
     }
 
     .tutorial-step-bar-fill {
-        background-color: @tutorialSecondaryColor;
+        background-color: @tutorialBarBackgroundColor;
     }
 
     /*******************************
@@ -722,11 +725,11 @@
         }
 
         .tutorial-step-bar {
-            background-color: @tutorialSecondaryColor;
+            background-color: @tutorialBarBackgroundColor;
         }
 
         .tutorial-step-bar-fill {
-            background-color: @tutorialPrimaryColor;
+            background-color: @tutorialBarForegroundColor;
         }
 
         .tutorial-hint .tutorial-callout-button.ui.button {