Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions .github/workflows/auto-cleanup-bot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ jobs:

steps:
- uses: actions/checkout@v5
with:
persist-credentials: false

- name: Setup Node.js environment
uses: actions/setup-node@v4
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/markdown-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ jobs:

steps:
- uses: actions/checkout@v5
with:
persist-credentials: false

- name: Setup Node.js environment
uses: actions/setup-node@v4
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/pr-check_cspell_lists.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/pr-check_javascript.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ jobs:

steps:
- uses: actions/checkout@v5
with:
persist-credentials: false

- name: Setup Node.js environment
uses: actions/setup-node@v4
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/pr-check_json.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ jobs:

steps:
- uses: actions/checkout@v5
with:
persist-credentials: false

- name: Setup Node.js environment
uses: actions/setup-node@v4
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/pr-check_redirects.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ jobs:

steps:
- uses: actions/checkout@v5
with:
persist-credentials: false

- name: Setup Node.js environment
uses: actions/setup-node@v4
Expand Down
10 changes: 10 additions & 0 deletions .github/workflows/pr-check_scripts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ jobs:

steps:
- uses: actions/checkout@v5
with:
persist-credentials: false

- name: Setup Node.js environment
uses: actions/setup-node@v4
Expand All @@ -39,6 +41,8 @@ jobs:

steps:
- uses: actions/checkout@v5
with:
persist-credentials: false

- name: Setup Node.js environment
uses: actions/setup-node@v4
Expand Down Expand Up @@ -79,6 +83,8 @@ jobs:

steps:
- uses: actions/checkout@v5
with:
persist-credentials: false

- name: Setup Node.js environment
uses: actions/setup-node@v4
Expand All @@ -99,6 +105,8 @@ jobs:

steps:
- uses: actions/checkout@v5
with:
persist-credentials: false

- name: Setup Node.js environment
uses: actions/setup-node@v4
Expand All @@ -123,6 +131,8 @@ jobs:

steps:
- uses: actions/checkout@v5
with:
persist-credentials: false

- name: Setup Node.js environment
uses: actions/setup-node@v4
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/pr-check_url-issues.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/pr-check_yml.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ jobs:

steps:
- uses: actions/checkout@v5
with:
persist-credentials: false

- name: Setup Node.js environment
uses: actions/setup-node@v4
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/pr-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ jobs:

steps:
- uses: actions/checkout@v5
with:
persist-credentials: false

- name: Get changed files
id: check
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/spelling-check-bot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ jobs:

steps:
- uses: actions/checkout@v5
with:
persist-credentials: false

- name: Setup Node.js environment
uses: actions/setup-node@v4
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@ Some HTML elements, such as `<h1>` and `<p>`, 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 `<a>`, `<span>`, `<em>` and `<strong>` use `inline` as their outer display type by default.

Expand Down Expand Up @@ -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 `<span>` element.

In the example below, we have a `<span>` 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 `<span>`. 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 `<span>`.
In the example below, we have a `<span>` 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 `<span>`. 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 `<span>`.

```html live-sample___inline-box-model
<p>
Expand Down
2 changes: 1 addition & 1 deletion files/en-us/web/css/display/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ The keyword values can be grouped into six value categories.
### Inside

- {{CSSxRef("&lt;display-inside&gt;")}}
- : 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).

Expand Down
1 change: 1 addition & 0 deletions files/en-us/web/html/reference/elements/track/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
<a href="/shared-assets/videos/friday.mp4">MP4</a>
Expand Down
2 changes: 1 addition & 1 deletion scripts/filecheck/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down