Skip to content

Commit

Permalink
Merge branch 'main' into patch-1
Browse files Browse the repository at this point in the history
  • Loading branch information
axelerod12 authored Nov 29, 2024
2 parents ffa973c + cede064 commit 5da083f
Show file tree
Hide file tree
Showing 16 changed files with 18 additions and 18 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ Try to update the code below to recreate the finished example:
<details>
<summary>Click here to show the solution</summary>

Use `background-position` with ther `center` keyword and a percentage:
Use `background-position` with the `center` keyword and a percentage:

```css
.box {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -407,7 +407,7 @@ For this tutorial we'll hosting our code on [GitHub](https://github.com/), one o
> [!NOTE]
> Using SCM tools is good software development practice!
> Ths instructions provide a basic introduction to git and GitHub.
> These instructions provide a basic introduction to git and GitHub.
> To learn more, see [Learning Git](https://docs.github.com/en/get-started/start-your-journey/git-and-github-learning-resources).
### Key concepts
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ For our sample project, we'll be using a toolchain specifically designed to aid

## Checking prerequisites

You should have most of the softwares already if you've been following along with the previous chapters. Here's what you should have before proceeding to the real setup steps. They only need to be done once and you don't need to repeat these again for future projects.
You should have most of the pieces of software already if you've been following along with the previous chapters. Here's what you should have before proceeding to the real setup steps. They only need to be done once and you don't need to repeat these again for future projects.

### Creating a GitHub account

Expand Down
2 changes: 1 addition & 1 deletion files/en-us/mozilla/firefox/experimental_features/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Experimental features can be enabled or disabled using the [Firefox Configuratio

### Autocorrection of editable text elements

The HTML [`autocorrect`](/en-US/docs/Web/HTML/Global_attributes/autocorrect) attribute (and correspoinding {{domxref("HTMLElement.autocorrect")}} property) allow autocompletion in editable text elements including: most kinds of text {{htmlelement("input")}} elements, {{htmlelement("textarea")}} elements, and elements that have the [`contenteditable`](/en-US/docs/Web/HTML/Global_attributes/contenteditable) attribute set ([Firefox bug 1725806](https://bugzil.la/1725806)).
The HTML [`autocorrect`](/en-US/docs/Web/HTML/Global_attributes/autocorrect) attribute (and corresponding {{domxref("HTMLElement.autocorrect")}} property) allow autocompletion in editable text elements including: most kinds of text {{htmlelement("input")}} elements, {{htmlelement("textarea")}} elements, and elements that have the [`contenteditable`](/en-US/docs/Web/HTML/Global_attributes/contenteditable) attribute set ([Firefox bug 1725806](https://bugzil.la/1725806)).

<table>
<thead>
Expand Down
2 changes: 1 addition & 1 deletion files/en-us/web/api/compositionevent/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ _This interface also inherits properties of its parent, {{domxref("UIEvent")}},
- {{domxref("CompositionEvent.data")}} {{ReadOnlyInline}}
- : Returns the characters generated by the input method that raised the event; its varies depending on the type of event that generated the `CompositionEvent` object.
- {{domxref("CompositionEvent.locale")}} {{ReadOnlyInline}} {{deprecated_inline}} {{Non-standard_Inline}}
- : Returns the locale of current input method (for example, the keyboard layout locale if the composition is associated with {{glossary("IME")}}).
- : Returns the locale of the current input method (for example, the keyboard layout locale if the composition is associated with an {{glossary("Input method editor")}}).

## Instance methods

Expand Down
2 changes: 1 addition & 1 deletion files/en-us/web/api/compositionevent/locale/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ browser-compat: api.CompositionEvent.locale

The **`locale`** read-only property of the
{{domxref("CompositionEvent")}} interface returns the locale of current input method
(for example, the keyboard layout locale if the composition is associated with {{glossary("IME")}}).
(for example, the keyboard layout locale if the composition is associated with an {{glossary("Input method editor")}}).

> [!WARNING]
> Even for browsers supporting it, don't trust the value contained in this property.
Expand Down
4 changes: 2 additions & 2 deletions files/en-us/web/api/element/compositionend_event/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ browser-compat: api.Element.compositionend_event

The **`compositionend`** event is fired when a text composition system such as an {{glossary("input method editor")}} completes or cancels the current composition session.

For example, this event could be fired after a user finishes entering a Chinese character using a [Pinyin](https://en.wikipedia.org/wiki/Pinyin) {{glossary("IME")}}.
For example, this event could be fired after a user finishes entering a Chinese character using a [Pinyin](https://en.wikipedia.org/wiki/Pinyin) {{glossary("Input method editor")}}.

## Syntax

Expand All @@ -35,7 +35,7 @@ _This interface also inherits properties of its parent, {{domxref("UIEvent")}},
- {{domxref("CompositionEvent.data")}} {{ReadOnlyInline}}
- : Returns the characters generated by the input method that raised the event; its varies depending on the type of event that generated the `CompositionEvent` object.
- {{domxref("CompositionEvent.locale")}} {{ReadOnlyInline}} {{deprecated_inline}}
- : Returns the locale of current input method (for example, the keyboard layout locale if the composition is associated with {{glossary("IME")}}).
- : Returns the locale of the current input method (for example, the keyboard layout locale if the composition is associated with an {{glossary("Input method editor")}}).

## Examples

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ browser-compat: api.Element.compositionstart_event

The **`compositionstart`** event is fired when a text composition system such as an {{glossary("input method editor")}} starts a new composition session.

For example, this event could be fired after a user starts entering a Chinese character using a [Pinyin](https://en.wikipedia.org/wiki/Pinyin) {{glossary("IME")}}.
For example, this event could be fired after a user starts entering a Chinese character using a [Pinyin](https://en.wikipedia.org/wiki/Pinyin) {{glossary("Input method editor")}}.

## Syntax

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ browser-compat: api.Element.compositionupdate_event

The **`compositionupdate`** event is fired when a new character is received in the context of a text composition session controlled by a text composition system such as an {{glossary("input method editor")}}.

For example, this event could be fired while a user enters a Chinese character using a [Pinyin](https://en.wikipedia.org/wiki/Pinyin) {{glossary("IME")}}.
For example, this event could be fired while a user enters a Chinese character using a [Pinyin](https://en.wikipedia.org/wiki/Pinyin) {{glossary("Input method editor")}}.

## Syntax

Expand Down
2 changes: 1 addition & 1 deletion files/en-us/web/api/element/keydown_event/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ function logKey(e) {

### keydown events with IME

Since Firefox 65, the `keydown` and [`keyup`](/en-US/docs/Web/API/Element/keyup_event) events are now fired during {{glossary("IME")}} composition, to improve cross-browser compatibility for CJKT users ([Firefox bug 354358](https://bugzil.la/354358)). To ignore all `keydown` events that are part of composition, do something like this (229 is a special value set for a `keyCode` relating to an event that has been processed by an IME):
Since Firefox 65, the `keydown` and [`keyup`](/en-US/docs/Web/API/Element/keyup_event) events are now fired during {{glossary("Input method editor")}} composition, to improve cross-browser compatibility for CJKT users ([Firefox bug 354358](https://bugzil.la/354358)). To ignore all `keydown` events that are part of composition, do something like this (229 is a special value set for a `keyCode` relating to an event that has been processed by an IME):

```js
eventTarget.addEventListener("keydown", (event) => {
Expand Down
2 changes: 1 addition & 1 deletion files/en-us/web/api/element/keyup_event/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ function logKey(e) {

### keyup events with IME

Since Firefox 65, the [`keydown`](/en-US/docs/Web/API/Element/keydown_event) and `keyup` events are now fired during {{glossary("IME")}} composition, to improve cross-browser compatibility for CJKT users ([Firefox bug 354358](https://bugzil.la/354358)). To ignore all `keyup` events that are part of composition, do something like this:
Since Firefox 65, the [`keydown`](/en-US/docs/Web/API/Element/keydown_event) and `keyup` events are now fired during {{glossary("Input method editor")}} composition, to improve cross-browser compatibility for CJKT users ([Firefox bug 354358](https://bugzil.la/354358)). To ignore all `keyup` events that are part of composition, do something like this:

```js
eventTarget.addEventListener("keyup", (event) => {
Expand Down
2 changes: 1 addition & 1 deletion files/en-us/web/api/keyboardevent/charcode/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ input.addEventListener("keypress", (e) => {
{{domxref("Element/keyup_event", "keyup")}} events. In these cases, `keyCode` is set instead.
- To get the code of the key regardless of whether it was stored in
`keyCode` or `charCode`, query the {{domxref("UIEvent/which", "which")}} property.
- Characters entered through an {{glossary("IME")}} do not register through `keyCode` or
- Characters entered through an {{glossary("Input method editor")}} do not register through `keyCode` or
`charCode`.
- For a list of the `charCode` values associated with particular keys, run
[Example 7: Displaying Event Object Properties](/en-US/docs/Web/API/Document_Object_Model/Examples#example_7_displaying_event_object_properties) and view the resulting HTML table.
Expand Down
2 changes: 1 addition & 1 deletion files/en-us/web/css/@font-face/font-weight/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Typically, a developer will want to use fonts from a single font family in a ran
To declare the font to be used for a range of font weights, declare a space-separated pair of font-weight values as the value for the `font-weight` descriptor. When CSS rules set a font weight by setting the {{cssxref("font-weight")}} property or the {{cssxref("font")}} shorthand property, the appropriate font will then be used.

For example, if the descriptor is `font-weight: 400 600;`, when the property is `font-weight: 450` or `font-weight: 550`, that font will be use for that font-family.
Whether the font is a static or a [variable font](/en-US/docs/Web/CSS/CSS_fonts/Variable_fonts_guide), the font matching the range will be used. In this case, if the font is a static font, `450` and `550` will apear the same. If the font is a variable font, the latter will be bolder.
Whether the font is a static or a [variable font](/en-US/docs/Web/CSS/CSS_fonts/Variable_fonts_guide), the font matching the range will be used. In this case, if the font is a static font, `450` and `550` will appear the same. If the font is a variable font, the latter will be bolder.

The descriptor is the same for all fonts, but the range you'll set for a variable font will generally be greater, possibly even `1 1000` to use the same font for all font weight property values.

Expand Down
2 changes: 1 addition & 1 deletion files/en-us/web/css/flood-color/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ rect {
}
```

We then apply different flood color values to the `<feFlood>` elements using the CSS `flood-color` property. We use a named color and a 3-digit hexidecimal color, but we can use any valid CSS color syntax:
We then apply different flood color values to the `<feFlood>` elements using the CSS `flood-color` property. We use a named color and a 3-digit hexadecimal color, but we can use any valid CSS color syntax:

```css
#flood1 feFlood {
Expand Down
4 changes: 2 additions & 2 deletions files/en-us/web/css/layout_cookbook/sticky_footers/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ body {
}
```

{{EmbedLiveSample("stiky-footer-example", "", "400px")}}
{{EmbedLiveSample("sticky-footer-example", "", "400px")}}

> [!NOTE]
> In this example and the following one we are using a wrapper set to `min-height: 100%`. You can also achieve this for a full page by setting a {{cssxref("min-height")}} of `100vh` on the {{htmlelement("body")}} and then using it as your grid container.
Expand Down Expand Up @@ -142,7 +142,7 @@ body {
}
```

{{EmbedLiveSample("stiky-footer-flexbox-example", "", "400px")}}
{{EmbedLiveSample("sticky-footer-flexbox-example", "", "400px")}}

The flexbox example starts out in the same way, but we use `display:flex` rather than `display:grid` on the `.wrapper`; we also set `flex-direction` to `column`. Then we set our main content to `flex-grow: 1` and the other two elements to `flex-shrink: 0` — this prevents them from shrinking smaller when content fills the main area.

Expand Down
2 changes: 1 addition & 1 deletion files/en-us/web/css/lighting-color/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ rect {
}
```

We then apply different lighting color values to the filter's child elements using the CSS `lighting-color` property. We use a named color and a 3-digit hexidecimal color, but we can use any valid CSS color syntax:
We then apply different lighting color values to the filter's child elements using the CSS `lighting-color` property. We use a named color and a 3-digit hexadecimal color, but we can use any valid CSS color syntax:

```css
feDiffuseLighting {
Expand Down

0 comments on commit 5da083f

Please sign in to comment.