Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix typo (overriden -> overridden) #48711

Merged
merged 1 commit into from
Mar 17, 2023
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: 1 addition & 1 deletion changelog.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4706,7 +4706,7 @@ The following contributors merged PRs in this release:
- Docs: Fix required status of `onSelectUrl` prop of `MediaReplaceFlow` component. ([44025](https://github.com/WordPress/gutenberg/pull/44025))
- Document new global styles filters. ([44111](https://github.com/WordPress/gutenberg/pull/44111))
- Document template_lock=noContent for Custom Post Types. ([43977](https://github.com/WordPress/gutenberg/pull/43977))
- InnerBlocks: document that `templateLock:NoContent` cannot be overriden by children. ([43825](https://github.com/WordPress/gutenberg/pull/43825))
- InnerBlocks: document that `templateLock:NoContent` cannot be overridden by children. ([43825](https://github.com/WordPress/gutenberg/pull/43825))
- Theme.json: Add default values for settings.spacing.spacingScale. ([43860](https://github.com/WordPress/gutenberg/pull/43860))
- Theme.json: Fix schema for useRootPaddingAwareAlignments. ([43628](https://github.com/WordPress/gutenberg/pull/43628))
- Typography block supports: Call tear_down in tests and format PHP doc blocks. ([43968](https://github.com/WordPress/gutenberg/pull/43968))
Expand Down
4 changes: 2 additions & 2 deletions lib/class-wp-theme-json-gutenberg.php
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,8 @@ class WP_Theme_JSON_Gutenberg {
* - prevent_override => Disables override of default presets by theme presets.
* The relationship between whether to override the defaults
* and whether the defaults are enabled is inverse:
* - If defaults are enabled => theme presets should not be overriden
* - If defaults are disabled => theme presets should be overriden
* - If defaults are enabled => theme presets should not be overridden
* - If defaults are disabled => theme presets should be overridden
* For example, a theme sets defaultPalette to false,
* making the default palette hidden from the user.
* In that case, we want all the theme presets to be present,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// This creates a "slot" where the block you're dragging appeared.
// We use !important as one of the rules are meant to be overriden.
// We use !important as one of the rules are meant to be overridden.
.block-editor-block-list__layout .is-dragging {
background-color: currentColor !important;
opacity: 0.05 !important;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ _Options:_
- `'insert'` — prevents inserting or removing blocks, but allows moving existing ones.
- `false` — prevents locking from being applied to an `InnerBlocks` area even if a parent block contains locking. ( Boolean )

If locking is not set in an `InnerBlocks` area: the locking of the parent `InnerBlocks` area is used. Note that `contentOnly` can't be overriden: it's present, the `templateLock` value of any children is ignored.
If locking is not set in an `InnerBlocks` area: the locking of the parent `InnerBlocks` area is used. Note that `contentOnly` can't be overridden: it's present, the `templateLock` value of any children is ignored.

If the block is a top level block: the locking of the Custom Post Type is used.

Expand Down
2 changes: 1 addition & 1 deletion packages/block-library/src/latest-comments/style.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Lower specificity - target list element.
ol.wp-block-latest-comments {
// Removes left spacing in Customizer Widgets screen.
// Due to low specificity this will be safely overriden
// Due to low specificity this will be safely overridden
// by default wp-block layout styles in the Post/Site editor
margin-left: 0;

Expand Down
2 changes: 1 addition & 1 deletion packages/components/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -836,7 +836,7 @@
### Bug Fix

- Use `Object.assign` instead of `{ ...spread }` syntax to avoid errors in the code generated by TypeScript ([#39932](https://github.com/WordPress/gutenberg/pull/39932)).
- `ItemGroup`: Ensure that the Item's text color is not overriden by the user agent's button color ([#40055](https://github.com/WordPress/gutenberg/pull/40055)).
- `ItemGroup`: Ensure that the Item's text color is not overridden by the user agent's button color ([#40055](https://github.com/WordPress/gutenberg/pull/40055)).
- `Surface`: Use updated UI text color `#1e1e1e` instead of `#000` ([#40055](https://github.com/WordPress/gutenberg/pull/40055)).
- `CustomSelectControl`: Make chevron consistent with `SelectControl` ([#40049](https://github.com/WordPress/gutenberg/pull/40049)).

Expand Down
2 changes: 1 addition & 1 deletion packages/edit-site/src/components/style-book/style.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.edit-site-style-book {
background: $white; // Fallback color, overriden by JavaScript.
background: $white; // Fallback color, overridden by JavaScript.
border-radius: $radius-block-ui;
bottom: 0;
left: 0;
Expand Down
2 changes: 1 addition & 1 deletion packages/env/lib/config/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@ function getNumberFromEnvVariable( varName ) {
* Gets the `wp-env` home directory in which generated files are created.
*
* By default: '~/.wp-env/'. On Linux with snap packages: '~/wp-env/'. Can be
* overriden with the WP_ENV_HOME environment variable.
* overridden with the WP_ENV_HOME environment variable.
*
* @return {Promise<string>} The absolute path to the `wp-env` home directory.
*/
Expand Down
6 changes: 3 additions & 3 deletions packages/env/lib/config/test/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -825,7 +825,7 @@ describe( 'readConfig', () => {
)
);
const config = await readConfig( '.wp-env.json' );
// Custom port is overriden while testsPort gets the deault value.
// Custom port is overridden while testsPort gets the deault value.
expect( config ).toMatchObject( {
env: {
development: {
Expand All @@ -848,7 +848,7 @@ describe( 'readConfig', () => {
)
);
const config = await readConfig( '.wp-env.json' );
// Custom port is overriden while testsPort gets the deault value.
// Custom port is overridden while testsPort gets the deault value.
expect( config ).toMatchObject( {
env: {
development: {
Expand Down Expand Up @@ -884,7 +884,7 @@ describe( 'readConfig', () => {
)
);
const config = await readConfig( '.wp-env.json' );
// Custom port is overriden while testsPort gets the deault value.
// Custom port is overridden while testsPort gets the deault value.
expect( config ).toMatchObject( {
env: {
development: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ open class GutenbergWebSingleBlockViewController: UIViewController {
}

/// Called when Gutenberg Web editor is loaded in the web view.
/// If overriden, is required to call super.onGutenbergReady()
/// If overridden, is required to call super.onGutenbergReady()
open func onGutenbergReady() {
onGutenbergReadyScripts().forEach(evaluateJavascript)
evaluateJavascript(jsInjection.preventAutosavesScript)
Expand Down