CodingPirates/blockly
1
0
Fork 0
mirror of https://github.com/google/blockly.git synced 2026-06-15 15:45:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into merge-main

Browse Source
This commit is contained in:
Maribeth Moffatt
2026-06-11 15:40:42 -04:00
parent 79eeb9d17a c531405f6b
commit 11c36371cd
7 changed files with 84 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/blockly/msg/json/uk.json
+13 -1
View File
@@ -351,5 +351,17 @@
"WORKSPACE_ARIA_LABEL": "Робоча область Blockly",
"COLLAPSED_WARNINGS_WARNING": "Звернуті блоки містять попередження.",
"DIALOG_OK": "Гаразд",
"DIALOG_CANCEL": "Скасувати"
"DIALOG_CANCEL": "Скасувати",
"WINDOWS": "Windows",
"MAC_OS": "macOS",
"CHROME_OS": "ChromeOS",
"LINUX": "Linux",
"UNKNOWN": "Невідома",
"CONTROL_KEY": "Ctrl",
"COMMAND_KEY": "⌘ Command",
"OPTION_KEY": "⌥ Option",
"ALT_KEY": "Alt",
"CUT_SHORTCUT": "Вирізати",
"COPY_SHORTCUT": "Копіювати",
"PASTE_SHORTCUT": "Вставити"
}
packages/docs/docs/codelabs/getting-started/complete-code/index.html
+1 -1
View File
@@ -9,7 +9,7 @@
<link
rel="stylesheet"
href="https://code.getmdl.io/1.2.1/material.indigo-pink.min.css" />
href="https://unpkg.com/material-design-lite@1.3.0/dist/material.indigo-pink.min.css" />
<link rel="stylesheet" href="styles/index.css" />
</head>
packages/docs/docs/codelabs/getting-started/starter-code/index.html
+1 -1
View File
@@ -9,7 +9,7 @@
<link
rel="stylesheet"
href="https://code.getmdl.io/1.2.1/material.indigo-pink.min.css" />
href="https://unpkg.com/material-design-lite@1.3.0/dist/material.indigo-pink.min.css" />
<link rel="stylesheet" href="styles/index.css" />
</head>
packages/docs/docs/guides/create-custom-blocks/procedures/creating-custom-procedure-blocks.mdx
+1 -1
View File
@@ -54,7 +54,7 @@ Blockly.Blocks['my_procedure_def'] = {
// Insertion markers reference the model of the original block.
if (this.isInsertionMarker()) return;
this.workpace.getProcedureMap().delete(model.getId());
this.workspace.getProcedureMap().delete(model.getId());
}
}
```
packages/docs/docusaurus.config.js
+47 -6
View File
@@ -72,6 +72,7 @@ const config = {
alt: 'Blockly Logo',
src: 'images/logo.svg',
srcDark: 'images/blockly-dark-theme-logo.png',
href: 'https://www.blockly.com/',
},
items: [
{
@@ -116,20 +117,60 @@ const config = {
position: 'left',
},
{
type: 'docSidebar',
label: 'Codelabs',
sidebarId: 'codelabsSidebar',
type: 'dropdown',
label: 'Tutorial',
position: 'left',
items: [
{
label: 'Codelabs',
to: '/codelabs/',
},
{
label: 'Samples',
href: 'https://raspberrypifoundation.github.io/blockly-samples/',
},
],
},
{
type: 'dropdown',
label: 'Summits',
position: 'left',
items: [
{
label: 'Session Catalog',
href: 'https://blockly.com/summit/home',
},
{
label: 'Summit 2026',
href: 'https://blockly.com/summit/2026/home',
},
],
},
{
label: 'Team',
href: 'https://blockly.com/team',
position: 'left',
},
{
label: 'Samples',
href: 'https://raspberrypifoundation.github.io/blockly-samples/',
position: 'right',
type: 'dropdown',
label: 'Accessibility',
position: 'left',
items: [
{
label: 'Accessibility',
href: 'https://blockly.com/accessibility',
},
{
label: 'Projects and partnerships',
href: 'https://blockly.com/accessibility-projects',
},
],
},
{
label: 'GitHub',
href: 'https://github.com/raspberrypifoundation/blockly',
position: 'right',
className: 'navbar__item--show-external-icon',
},
],
},
packages/docs/src/css/custom.css
+13
View File
@@ -30,6 +30,10 @@
--border-divider-footer: #dadce0;
--tabs-border: #dadce0;
--codeblock-background-color: #f1f3f4;
--ifm-navbar-item-padding-vertical: 12px;
--ifm-navbar-item-padding-horizontal: 16px;
--ifm-dropdown-link-padding-vertical: 12px;
--ifm-dropdown-link-padding-horizontal: 16px;
}
/* For readability concerns, you should choose a lighter palette in dark mode. */
@@ -99,6 +103,15 @@ table th p {
font-size: 19px;
}
/* Hide external-link icons in the top nav except GitHub */
.navbar [class*='iconExternalLink_'] {
display: none;
}
.navbar__item--show-external-icon [class*='iconExternalLink_'] {
display: inline-block;
}
/* footer CSS */
.footer {
background-color: var(--background-color-footer);
packages/docs/static/_redirects
Vendored
+8
View File
@@ -120,3 +120,11 @@
/guides/contribute/samples/plugin_overview /guides/programming/plugin_overview/ 301
# End - Site refactoring - 2025
# Legacy developers.google.com/blockly marketing pages
/summits/summits https://www.blockly.com/summit/home 301
/summits/blockly-summit-2024 https://www.blockly.com/summit/home 301
/accessibility/application https://www.blockly.com/accessibility-projects 301
/accessibility-fund-recipients https://www.blockly.com/accessibility-projects 301
/accessibility-fund https://www.blockly.com/accessibility-projects 301
/accessibility https://www.blockly.com/accessibility 301