Skip to content

Commit 9dc9a6c

Browse files
authored
Merge branch 'trunk' into 54915-rtl-inputs
2 parents 9994bdc + 824c70c commit 9dc9a6c

File tree

105 files changed

+1119
-719
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

105 files changed

+1119
-719
lines changed

package-lock.json

Lines changed: 28 additions & 23 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -81,24 +81,24 @@
8181
"@wordpress/api-fetch": "6.14.1",
8282
"@wordpress/autop": "3.17.1",
8383
"@wordpress/blob": "3.17.1",
84-
"@wordpress/block-directory": "3.15.11",
84+
"@wordpress/block-directory": "3.15.12",
8585
"@wordpress/block-editor": "10.0.10",
86-
"@wordpress/block-library": "7.14.11",
86+
"@wordpress/block-library": "7.14.12",
8787
"@wordpress/block-serialization-default-parser": "4.17.1",
8888
"@wordpress/blocks": "11.16.4",
8989
"@wordpress/components": "21.0.7",
9090
"@wordpress/compose": "5.15.2",
9191
"@wordpress/core-data": "5.0.4",
92-
"@wordpress/customize-widgets": "3.14.11",
92+
"@wordpress/customize-widgets": "3.14.12",
9393
"@wordpress/data": "7.1.3",
9494
"@wordpress/data-controls": "2.17.3",
9595
"@wordpress/date": "4.17.1",
9696
"@wordpress/deprecated": "3.17.1",
9797
"@wordpress/dom": "3.17.2",
9898
"@wordpress/dom-ready": "3.17.1",
99-
"@wordpress/edit-post": "6.14.11",
100-
"@wordpress/edit-site": "4.14.13",
101-
"@wordpress/edit-widgets": "4.14.11",
99+
"@wordpress/edit-post": "6.14.12",
100+
"@wordpress/edit-site": "4.14.14",
101+
"@wordpress/edit-widgets": "4.14.12",
102102
"@wordpress/editor": "12.16.10",
103103
"@wordpress/element": "4.15.1",
104104
"@wordpress/escape-html": "2.17.1",
@@ -154,7 +154,8 @@
154154
"regenerator-runtime": "0.13.9",
155155
"twemoji": "14.0.2",
156156
"underscore": "1.13.6",
157-
"whatwg-fetch": "3.6.2"
157+
"whatwg-fetch": "3.6.2",
158+
"wicg-inert": "3.1.2"
158159
},
159160
"scripts": {
160161
"build": "grunt build",

src/wp-admin/css/common.css

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3030,11 +3030,17 @@ div.action-links {
30303030

30313031
.plugin-details-modal #TB_closeWindowButton:hover,
30323032
.plugin-details-modal #TB_closeWindowButton:focus {
3033-
color: #135e96;
30343033
outline: none;
30353034
box-shadow: none;
30363035
}
30373036

3037+
.plugin-details-modal #TB_closeWindowButton:hover::after,
3038+
.plugin-details-modal #TB_closeWindowButton:focus::after {
3039+
outline: 2px solid;
3040+
outline-offset: -4px;
3041+
border-radius: 4px;
3042+
}
3043+
30383044
.plugin-details-modal .tb-close-icon {
30393045
display: none;
30403046
}

src/wp-admin/css/forms.css

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1071,7 +1071,9 @@ table.form-table td .updated p {
10711071
}
10721072

10731073
.settings-php .language-install-spinner,
1074-
.options-general-php .language-install-spinner {
1074+
.options-general-php .language-install-spinner,
1075+
.user-edit-php .language-install-spinner,
1076+
.profile-php .language-install-spinner {
10751077
display: inline-block;
10761078
float: none;
10771079
margin: -3px 5px 0;
@@ -1082,9 +1084,18 @@ table.form-table td .updated p {
10821084
margin-top: 8px;
10831085
}
10841086

1087+
.form-table.permalink-structure .available-structure-tags ul {
1088+
display: flex;
1089+
flex-wrap: wrap;
1090+
margin: 8px 0 0;
1091+
}
1092+
10851093
.form-table.permalink-structure .available-structure-tags li {
1086-
float: left;
1087-
margin-right: 5px;
1094+
margin: 6px 5px 0 0;
1095+
}
1096+
1097+
.form-table.permalink-structure .available-structure-tags li:last-child {
1098+
margin-right: 0;
10881099
}
10891100

10901101
.form-table.permalink-structure .structure-selection .row {

src/wp-admin/css/media.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@
191191

192192
.media-item .original {
193193
position: relative;
194-
height: 34px;
194+
min-height: 34px;
195195
}
196196

197197
.media-item .progress {

src/wp-admin/css/nav-menus.css

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ label.bulk-select-button:focus-within {
169169
color: #0a4b78;
170170
}
171171

172-
input.bulk-select-switcher:focus + .bulk-select-button-label{
172+
input.bulk-select-switcher:focus + .bulk-select-button-label {
173173
color: #0a4b78;
174174
}
175175

@@ -191,9 +191,7 @@ input.bulk-select-switcher:focus + .bulk-select-button-label{
191191
}
192192

193193
.bulk-actions input.menu-items-delete.disabled {
194-
cursor: default;
195-
color: #a7aaad;
196-
box-shadow: none;
194+
display: none;
197195
}
198196

199197
.menu-settings {

src/wp-admin/edit-form-blocks.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ static function( $classes ) {
203203
'unlockNonce' => wp_create_nonce( 'update-post_' . $post->ID ),
204204
'ajaxUrl' => admin_url( 'admin-ajax.php' ),
205205
),
206-
'supportsLayout' => WP_Theme_JSON_Resolver::theme_has_support(),
206+
'supportsLayout' => wp_theme_has_theme_json(),
207207
'supportsTemplateMode' => current_theme_supports( 'block-templates' ),
208208

209209
// Whether or not to load the 'postcustom' meta box is stored as a user meta

src/wp-admin/includes/ajax-actions.php

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3144,6 +3144,17 @@ function wp_ajax_save_attachment() {
31443144
wp_delete_post( $id );
31453145
} else {
31463146
wp_update_post( $post );
3147+
3148+
/**
3149+
* Fires after an attachment has been updated via the Ajax handler
3150+
* and before the JSON response is sent.
3151+
*
3152+
* @since 6.2.0
3153+
*
3154+
* @param array $post The attachment data.
3155+
* @param array $changes An array containing the updated attachment attributes.
3156+
*/
3157+
do_action( 'wp_ajax_save_attachment', $post, $changes );
31473158
}
31483159

31493160
wp_send_json_success();

src/wp-admin/includes/file.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2390,7 +2390,7 @@ function request_filesystem_credentials( $form_post, $type = '', $error = false,
23902390
<div class="ftp-password">
23912391
<label for="password">
23922392
<span class="field-title"><?php echo $label_pass; ?></span>
2393-
<input name="password" type="password" id="password" value="<?php echo $password_value; ?>"<?php disabled( defined( 'FTP_PASS' ) ); ?> />
2393+
<input name="password" type="password" id="password" value="<?php echo $password_value; ?>"<?php disabled( defined( 'FTP_PASS' ) ); ?> spellcheck="false" />
23942394
<?php
23952395
if ( ! defined( 'FTP_PASS' ) ) {
23962396
_e( 'This password will not be stored on the server.' );

src/wp-admin/includes/meta-boxes.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -888,7 +888,7 @@ function post_slug_meta_box( $post ) {
888888
/** This filter is documented in wp-admin/edit-tag-form.php */
889889
$editable_slug = apply_filters( 'editable_slug', $post->post_name, $post );
890890
?>
891-
<label class="screen-reader-text" for="post_name"><?php _e( 'Slug' ); ?></label><input name="post_name" type="text" size="13" id="post_name" value="<?php echo esc_attr( $editable_slug ); ?>" />
891+
<label class="screen-reader-text" for="post_name"><?php _e( 'Slug' ); ?></label><input name="post_name" type="text" class="large-text" id="post_name" value="<?php echo esc_attr( $editable_slug ); ?>" />
892892
<?php
893893
}
894894

0 commit comments

Comments
 (0)