From 41db8c95b49ec2ca65776ef5c2eafed616b1510b Mon Sep 17 00:00:00 2001 From: Jacob Willden <67853915+jacob-willden@users.noreply.github.com> Date: Mon, 13 Oct 2025 03:38:38 -0600 Subject: [PATCH 1/5] Add label to English captions track in interactive example (#41456) Co-authored-by: Estelle Weyl --- files/en-us/web/html/reference/elements/track/index.md | 1 + 1 file changed, 1 insertion(+) diff --git a/files/en-us/web/html/reference/elements/track/index.md b/files/en-us/web/html/reference/elements/track/index.md index 7844facb9fddde9..16ab662827104ef 100644 --- a/files/en-us/web/html/reference/elements/track/index.md +++ b/files/en-us/web/html/reference/elements/track/index.md @@ -22,6 +22,7 @@ The tracks are formatted in [WebVTT format](/en-US/docs/Web/API/WebVTT_API) (`.v default kind="captions" srclang="en" + label="English" src="/shared-assets/misc/friday.vtt" /> Download the MP4 From 0bf47036590be7c13d4938e7f200ca5d67680a09 Mon Sep 17 00:00:00 2001 From: Claas Augner <495429+caugner@users.noreply.github.com> Date: Mon, 13 Oct 2025 11:54:28 +0200 Subject: [PATCH 2/5] fix(scripts/filecheck): declare as command (#41493) Otherwise positional has no effect. --- scripts/filecheck/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/filecheck/index.js b/scripts/filecheck/index.js index 4c5822c177afac8..9117ff88ec95be0 100644 --- a/scripts/filecheck/index.js +++ b/scripts/filecheck/index.js @@ -35,7 +35,7 @@ function resolveFiles(files, cwd) { const argv = yargs(hideBin(process.argv)) .scriptName("filecheck") .version("0.0.0") - .usage("$0 [options] [files...]") + .command("$0 [files...]", "Check image files") .option("cwd", { type: "string", describe: "Explicit current-working-directory", From 364ba96ccd14ddbe2b3bb25dd13ffafc4cc070f6 Mon Sep 17 00:00:00 2001 From: Claas Augner <495429+caugner@users.noreply.github.com> Date: Mon, 13 Oct 2025 13:13:50 +0200 Subject: [PATCH 3/5] ci(workflows): disable `actions/checkout` credential persistance (#41491) --- .github/workflows/auto-cleanup-bot.yml | 2 ++ .github/workflows/markdown-lint.yml | 2 ++ .github/workflows/pr-check_cspell_lists.yml | 1 + .github/workflows/pr-check_javascript.yml | 2 ++ .github/workflows/pr-check_json.yml | 2 ++ .github/workflows/pr-check_redirects.yml | 2 ++ .github/workflows/pr-check_scripts.yml | 10 ++++++++++ .github/workflows/pr-check_url-issues.yml | 1 + .github/workflows/pr-check_yml.yml | 2 ++ .github/workflows/pr-test.yml | 2 ++ .github/workflows/spelling-check-bot.yml | 2 ++ 11 files changed, 28 insertions(+) diff --git a/.github/workflows/auto-cleanup-bot.yml b/.github/workflows/auto-cleanup-bot.yml index eac7b8cee33dc27..453ea9600b5d47d 100644 --- a/.github/workflows/auto-cleanup-bot.yml +++ b/.github/workflows/auto-cleanup-bot.yml @@ -16,6 +16,8 @@ jobs: steps: - uses: actions/checkout@v5 + with: + persist-credentials: false - name: Setup Node.js environment uses: actions/setup-node@v4 diff --git a/.github/workflows/markdown-lint.yml b/.github/workflows/markdown-lint.yml index 9417f497f8974ee..f5747af9fcbd7e2 100644 --- a/.github/workflows/markdown-lint.yml +++ b/.github/workflows/markdown-lint.yml @@ -22,6 +22,8 @@ jobs: steps: - uses: actions/checkout@v5 + with: + persist-credentials: false - name: Setup Node.js environment uses: actions/setup-node@v4 diff --git a/.github/workflows/pr-check_cspell_lists.yml b/.github/workflows/pr-check_cspell_lists.yml index 576fc9b8c264233..f64e0dad551fea6 100644 --- a/.github/workflows/pr-check_cspell_lists.yml +++ b/.github/workflows/pr-check_cspell_lists.yml @@ -22,6 +22,7 @@ jobs: .nvmrc package.json scripts/sort_and_unique_file_lines.js + persist-credentials: false - name: Setup Node.js environment uses: actions/setup-node@v4 diff --git a/.github/workflows/pr-check_javascript.yml b/.github/workflows/pr-check_javascript.yml index 1f08e2df2939515..7190914d3f55791 100644 --- a/.github/workflows/pr-check_javascript.yml +++ b/.github/workflows/pr-check_javascript.yml @@ -19,6 +19,8 @@ jobs: steps: - uses: actions/checkout@v5 + with: + persist-credentials: false - name: Setup Node.js environment uses: actions/setup-node@v4 diff --git a/.github/workflows/pr-check_json.yml b/.github/workflows/pr-check_json.yml index b9493f6d56ace3c..fa2bd8f44c65cac 100644 --- a/.github/workflows/pr-check_json.yml +++ b/.github/workflows/pr-check_json.yml @@ -19,6 +19,8 @@ jobs: steps: - uses: actions/checkout@v5 + with: + persist-credentials: false - name: Setup Node.js environment uses: actions/setup-node@v4 diff --git a/.github/workflows/pr-check_redirects.yml b/.github/workflows/pr-check_redirects.yml index bdced02fccd740b..7929efa060581d0 100644 --- a/.github/workflows/pr-check_redirects.yml +++ b/.github/workflows/pr-check_redirects.yml @@ -14,6 +14,8 @@ jobs: steps: - uses: actions/checkout@v5 + with: + persist-credentials: false - name: Setup Node.js environment uses: actions/setup-node@v4 diff --git a/.github/workflows/pr-check_scripts.yml b/.github/workflows/pr-check_scripts.yml index c513d2239ec81fa..9471edb55c8591c 100644 --- a/.github/workflows/pr-check_scripts.yml +++ b/.github/workflows/pr-check_scripts.yml @@ -19,6 +19,8 @@ jobs: steps: - uses: actions/checkout@v5 + with: + persist-credentials: false - name: Setup Node.js environment uses: actions/setup-node@v4 @@ -39,6 +41,8 @@ jobs: steps: - uses: actions/checkout@v5 + with: + persist-credentials: false - name: Setup Node.js environment uses: actions/setup-node@v4 @@ -79,6 +83,8 @@ jobs: steps: - uses: actions/checkout@v5 + with: + persist-credentials: false - name: Setup Node.js environment uses: actions/setup-node@v4 @@ -99,6 +105,8 @@ jobs: steps: - uses: actions/checkout@v5 + with: + persist-credentials: false - name: Setup Node.js environment uses: actions/setup-node@v4 @@ -123,6 +131,8 @@ jobs: steps: - uses: actions/checkout@v5 + with: + persist-credentials: false - name: Setup Node.js environment uses: actions/setup-node@v4 diff --git a/.github/workflows/pr-check_url-issues.yml b/.github/workflows/pr-check_url-issues.yml index 2f8b2c0e24abd8f..a57e3455c119b31 100644 --- a/.github/workflows/pr-check_url-issues.yml +++ b/.github/workflows/pr-check_url-issues.yml @@ -19,6 +19,7 @@ jobs: - uses: actions/checkout@v5 with: fetch-depth: 0 + persist-credentials: false - name: Setup Node.js environment uses: actions/setup-node@v4 diff --git a/.github/workflows/pr-check_yml.yml b/.github/workflows/pr-check_yml.yml index 94c70e086847df4..387ff4eb6610f3b 100644 --- a/.github/workflows/pr-check_yml.yml +++ b/.github/workflows/pr-check_yml.yml @@ -19,6 +19,8 @@ jobs: steps: - uses: actions/checkout@v5 + with: + persist-credentials: false - name: Setup Node.js environment uses: actions/setup-node@v4 diff --git a/.github/workflows/pr-test.yml b/.github/workflows/pr-test.yml index fff98ffa4e7960e..2f7ff9c1ee24d32 100644 --- a/.github/workflows/pr-test.yml +++ b/.github/workflows/pr-test.yml @@ -30,6 +30,8 @@ jobs: steps: - uses: actions/checkout@v5 + with: + persist-credentials: false - name: Get changed files id: check diff --git a/.github/workflows/spelling-check-bot.yml b/.github/workflows/spelling-check-bot.yml index 8bc55f34fac6ab6..810a15291d3d49a 100644 --- a/.github/workflows/spelling-check-bot.yml +++ b/.github/workflows/spelling-check-bot.yml @@ -19,6 +19,8 @@ jobs: steps: - uses: actions/checkout@v5 + with: + persist-credentials: false - name: Setup Node.js environment uses: actions/setup-node@v4 From 40099ec4cc9464e5bf6ce88be9eb34da2a77ef4e Mon Sep 17 00:00:00 2001 From: kannanwisen Date: Mon, 13 Oct 2025 17:40:27 +0530 Subject: [PATCH 4/5] Docs: Clarify that flow-root is an inner display type (#40319) * Update index.md * Update files/en-us/web/css/display/index.md Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Apply suggestion Clarified the explanation of the inner display type keywords and their effects on the outer display type. * Update index.md --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Joshua Chen --- files/en-us/web/css/display/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/en-us/web/css/display/index.md b/files/en-us/web/css/display/index.md index 5312d8d7c7ec5e2..356f43c3cc2f5ba 100644 --- a/files/en-us/web/css/display/index.md +++ b/files/en-us/web/css/display/index.md @@ -146,7 +146,7 @@ The keyword values can be grouped into six value categories. ### Inside - {{CSSxRef("<display-inside>")}} - - : These keywords specify the element's inner display type, which defines the type of formatting context that its contents are laid out in (assuming it is a non-replaced element): + - : These keywords specify the element's inner display type, which defines the type of formatting context that its contents are laid out in (assuming it is a non-replaced element). When one of these keywords is used by itself as a single value, the element's outer display type defaults to `block` (with the exception of `ruby`, which defaults to `inline`). - `flow` - : The element lays out its contents using flow layout (block-and-inline layout). From 6f0bcfb2316085efc3f9704fc0eac46f87c3315c Mon Sep 17 00:00:00 2001 From: Ellin <1833921+Ellin@users.noreply.github.com> Date: Mon, 13 Oct 2025 14:35:44 +0000 Subject: [PATCH 5/5] Clarify explanation (#41472) * Clarify explanation Relates to issue #41447 and fix #41464 * Remove "vertical" and "horizontal" terms Relates to #25798 "Don't call box model parts vertical or horizontal " * Update files/en-us/learn_web_development/core/styling_basics/box_model/index.md Co-authored-by: Chris Mills --------- Co-authored-by: Chris Mills --- .../core/styling_basics/box_model/index.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/files/en-us/learn_web_development/core/styling_basics/box_model/index.md b/files/en-us/learn_web_development/core/styling_basics/box_model/index.md index 442cf231c752535..1506798b7b1f33f 100644 --- a/files/en-us/learn_web_development/core/styling_basics/box_model/index.md +++ b/files/en-us/learn_web_development/core/styling_basics/box_model/index.md @@ -54,9 +54,9 @@ Some HTML elements, such as `

` and `

`, use `block` as their outer display If a box has a display type of `inline`, then: - The box will not break onto a new line. -- The {{cssxref("width")}} and {{cssxref("height")}} properties will not apply. -- Top and bottom padding, margins, and borders will apply but will not cause other inline boxes to move away from the box. -- Left and right padding, margins, and borders will apply and will cause other inline boxes to move away from the box. +- The {{cssxref("width")}}, {{cssxref("height")}}, and top and bottom margins will have no effect. +- **Top and bottom** padding and borders will change the size of the box without affecting the position of surrounding content, which can cause overlapping. +- **Left and right** padding, margins, and borders will affect the position of surrounding inline content. Some HTML elements, such as ``, ``, `` and `` use `inline` as their outer display type by default. @@ -506,7 +506,7 @@ body { All of the above fully applies to block boxes. Some of the properties can apply to inline boxes too, such as those created by a `` element. -In the example below, we have a `` inside a paragraph. We have applied a `width`, `height`, `margin`, `border`, and `padding` to it. You can see that the width, height, and vertical margins do not affect the ``. The vertical padding and border alter the size of the inline box but don't affect the position of the surrounding content. Instead, the vertical padding and border overlap other words in the paragraph. Only the horizontal padding, margins, and borders affect the position of the text surrounding the ``. +In the example below, we have a `` inside a paragraph. We have applied a `width`, `height`, `margin`, `border`, and `padding` to it. You can see that the width, height, and top and bottom margins do not affect the ``. The top and bottom padding and borders alter the size of the inline box but don't affect the position of the surrounding content. Instead, the top and bottom padding and borders overlap other words in the paragraph. Only the left and right padding, margins, and borders affect the position of the text surrounding the ``. ```html live-sample___inline-box-model