Skip to content

Commit 3d99f00

Browse files
manzoorwanijkmanzoorwanijk
authored
Merge branch 'trunk' into add/script-module-translations
2 parents 89a25ea + 8270db8 commit 3d99f00

15 files changed

Lines changed: 50 additions & 115 deletions

‎composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"ext-dom": "*"
2020
},
2121
"require-dev": {
22-
"composer/ca-bundle": "1.5.10",
22+
"composer/ca-bundle": "1.5.11",
2323
"squizlabs/php_codesniffer": "3.13.5",
2424
"wp-coding-standards/wpcs": "~3.3.0",
2525
"phpcompatibility/phpcompatibility-wp": "~2.1.3",

‎src/js/_enqueues/admin/post.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1028,7 +1028,7 @@ jQuery( function($) {
10281028
revert_e = $el.html();
10291029

10301030
buttons.html(
1031-
'<button type="button" class="save button button-small">' + __( 'OK' ) + '</button> ' +
1031+
'<button type="button" class="save button button-compact">' + __( 'OK' ) + '</button> ' +
10321032
'<button type="button" class="cancel button-link">' + __( 'Cancel' ) + '</button>'
10331033
);
10341034

‎src/wp-admin/css/edit.css‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,6 @@ input#link_url {
121121
#edit-slug-box .cancel {
122122
margin-right: 10px;
123123
padding: 0;
124-
font-size: 11px;
125124
}
126125

127126
#comment-link-box {
@@ -140,7 +139,7 @@ input#link_url {
140139
#editable-post-name input {
141140
font-size: 13px;
142141
font-weight: 400;
143-
height: 24px;
142+
min-height: 32px;
144143
margin: 0;
145144
width: 16em;
146145
}
@@ -1068,6 +1067,10 @@ form#tags-filter {
10681067
#edit-slug-box {
10691068
padding: 0;
10701069
}
1070+
1071+
#editable-post-name input {
1072+
min-height: 40px;
1073+
}
10711074
}
10721075

10731076
@media only screen and (max-width: 1004px) {

‎src/wp-admin/css/forms.css‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -583,6 +583,12 @@ input[type="number"].tiny-text {
583583
vertical-align: middle;
584584
}
585585

586+
.button.wp-hide-pw.user-new-password-toggle {
587+
display: inline-flex;
588+
align-items: center;
589+
column-gap: 4px;
590+
}
591+
586592
.wp-cancel-pw .dashicons-no {
587593
display: none;
588594
}

‎src/wp-admin/css/revisions.css‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,6 @@ table.diff .diff-addedline ins {
309309
float: right;
310310
margin-left: 6px;
311311
margin-right: 6px;
312-
margin-top: 2px;
313312
}
314313

315314
.diff-meta-from {
@@ -632,8 +631,4 @@ div.revisions-controls > .wp-slider > .ui-slider-handle {
632631
word-break: break-all;
633632
word-wrap: break-word;
634633
}
635-
636-
.diff-meta input.restore-revision {
637-
margin-top: 0;
638-
}
639634
}

‎src/wp-admin/includes/class-wp-screen.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1280,7 +1280,7 @@ public function render_per_page_options() {
12801280
<legend><?php _e( 'Pagination' ); ?></legend>
12811281
<?php if ( $per_page_label ) : ?>
12821282
<label for="<?php echo esc_attr( $option ); ?>"><?php echo $per_page_label; ?></label>
1283-
<input type="number" step="1" min="1" max="999" class="screen-per-page" name="wp_screen_options[value]"
1283+
<input type="number" step="1" min="1" max="999" class="screen-per-page small-text" name="wp_screen_options[value]"
12841284
id="<?php echo esc_attr( $option ); ?>"
12851285
value="<?php echo esc_attr( $per_page ); ?>" />
12861286
<?php endif; ?>

‎src/wp-admin/includes/revision.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -370,11 +370,11 @@ function wp_print_revision_templates() {
370370

371371
<script id="tmpl-revisions-buttons" type="text/html">
372372
<div class="revisions-previous">
373-
<input class="button" type="button" value="<?php echo esc_attr_x( 'Previous', 'Button label for a previous revision' ); ?>" />
373+
<input class="button button-compact" type="button" value="<?php echo esc_attr_x( 'Previous', 'Button label for a previous revision' ); ?>" />
374374
</div>
375375

376376
<div class="revisions-next">
377-
<input class="button" type="button" value="<?php echo esc_attr_x( 'Next', 'Button label for a next revision' ); ?>" />
377+
<input class="button button-compact" type="button" value="<?php echo esc_attr_x( 'Next', 'Button label for a next revision' ); ?>" />
378378
</div>
379379
</script>
380380

@@ -454,9 +454,9 @@ function wp_print_revision_templates() {
454454
<# } #>
455455
<?php } ?>
456456
<# if ( data.attributes.autosave ) { #>
457-
type="button" class="restore-revision button button-primary" value="<?php esc_attr_e( 'Restore This Autosave' ); ?>" />
457+
type="button" class="restore-revision button button-primary button-compact" value="<?php esc_attr_e( 'Restore This Autosave' ); ?>" />
458458
<# } else { #>
459-
type="button" class="restore-revision button button-primary" value="<?php esc_attr_e( 'Restore This Revision' ); ?>" />
459+
type="button" class="restore-revision button button-primary button-compact" value="<?php esc_attr_e( 'Restore This Revision' ); ?>" />
460460
<# } #>
461461
<# } #>
462462
</div>

‎src/wp-admin/user-edit.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -695,7 +695,7 @@
695695
<input type="password" name="pass1" id="pass1" class="regular-text ltr" value="" autocomplete="new-password" spellcheck="false" data-pw="<?php echo esc_attr( wp_generate_password( 24 ) ); ?>" aria-describedby="pass-strength-result" />
696696
<div style="display:none" id="pass-strength-result" aria-live="polite"></div>
697697
</div>
698-
<button type="button" class="button wp-hide-pw hide-if-no-js" data-toggle="0" aria-label="<?php esc_attr_e( 'Hide password' ); ?>">
698+
<button type="button" class="button wp-hide-pw user-new-password-toggle hide-if-no-js" data-toggle="0" aria-label="<?php esc_attr_e( 'Hide password' ); ?>">
699699
<span class="dashicons dashicons-hidden" aria-hidden="true"></span>
700700
<span class="text"><?php _e( 'Hide' ); ?></span>
701701
</button>

‎src/wp-includes/certificates/ca-bundle.crt‎

Lines changed: 23 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
##
22
## Bundle of CA Root Certificates
33
##
4-
## Certificate data from Mozilla as of: Tue Dec 2 04:12:02 2025 GMT
4+
## Certificate data from Mozilla last updated on: Wed Feb 11 18:26:30 2026 GMT
55
##
66
## Find updated versions here: https://curl.se/docs/caextract.html
77
##
@@ -15,8 +15,8 @@
1515
## an Apache+mod_ssl webserver for SSL client authentication.
1616
## Just configure this file as the SSLCACertificateFile.
1717
##
18-
## Conversion done with mk-ca-bundle.pl version 1.30.
19-
## SHA256: a903b3cd05231e39332515ef7ebe37e697262f39515a52015c23c62805b73cd0
18+
## Conversion done with mk-ca-bundle.pl version 1.32.
19+
## SHA256: 3b98d4e3ff57a326d9587c33633039c8c3a9cf0b55f7ca581d7598ff329eb1f3
2020
##
2121

2222

@@ -3480,8 +3480,8 @@ SM49BAMDA2kAMGYCMQCpKjAd0MKfkFFRQD6VVCHNFmb3U2wIFjnQEnx/Yxvf4zgAOdktUyBFCxxg
34803480
ZzFDJe0CMQCSia7pXGKDYmH5LVerVrkR3SW+ak5KGoJr3M/TvEqzPNcum9v4KGm8ay3sMaE641c=
34813481
-----END CERTIFICATE-----
34823482

3483-
OISTE Server Root RSA G1
3484-
=========================
3483+
OISTE Server Root RSA G1
3484+
========================
34853485
-----BEGIN CERTIFICATE-----
34863486
MIIFgzCCA2ugAwIBAgIQVaXZZ5Qoxu0M+ifdWwFNGDANBgkqhkiG9w0BAQwFADBLMQswCQYDVQQG
34873487
EwJDSDEZMBcGA1UECgwQT0lTVEUgRm91bmRhdGlvbjEhMB8GA1UEAwwYT0lTVEUgU2VydmVyIFJv
@@ -3509,3 +3509,21 @@ msuY33OhkKCgxeDoAaijFJzIwZqsFVAzje18KotzlUBDJvyBpCpfOZC3J8tRd/iWkx7P8nd9H0aT
35093509
olkelUTFLXVksNb54Dxp6gS1HAviRkRNQzuXSXERvSS2wq1yVAb+axj5d9spLFKebXd7Yv0PTY6Y
35103510
MjAwcRLWJTXjn/hvnLXrahut6hDTlhZyBiElxky8j3C7DOReIoMt0r7+hVu05L0=
35113511
-----END CERTIFICATE-----
3512+
3513+
e-Szigno TLS Root CA 2023
3514+
=========================
3515+
-----BEGIN CERTIFICATE-----
3516+
MIICzzCCAjGgAwIBAgINAOhvGHvWOWuYSkmYCjAKBggqhkjOPQQDBDB1MQswCQYDVQQGEwJIVTER
3517+
MA8GA1UEBwwIQnVkYXBlc3QxFjAUBgNVBAoMDU1pY3Jvc2VjIEx0ZC4xFzAVBgNVBGEMDlZBVEhV
3518+
LTIzNTg0NDk3MSIwIAYDVQQDDBllLVN6aWdubyBUTFMgUm9vdCBDQSAyMDIzMB4XDTIzMDcxNzE0
3519+
MDAwMFoXDTM4MDcxNzE0MDAwMFowdTELMAkGA1UEBhMCSFUxETAPBgNVBAcMCEJ1ZGFwZXN0MRYw
3520+
FAYDVQQKDA1NaWNyb3NlYyBMdGQuMRcwFQYDVQRhDA5WQVRIVS0yMzU4NDQ5NzEiMCAGA1UEAwwZ
3521+
ZS1Temlnbm8gVExTIFJvb3QgQ0EgMjAyMzCBmzAQBgcqhkjOPQIBBgUrgQQAIwOBhgAEAGgP36J8
3522+
PKp0iGEKjcJMpQEiFNT3YHdCnAo4YKGMZz6zY+n6kbCLS+Y53wLCMAFSAL/fjO1ZrTJlqwlZULUZ
3523+
wmgcAOAFX9pQJhzDrAQixTpN7+lXWDajwRlTEArRzT/vSzUaQ49CE0y5LBqcvjC2xN7cS53kpDzL
3524+
Ltmt3999Cd8ukv+ho2MwYTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4E
3525+
FgQUWYQCYlpGePVd3I8KECgj3NXW+0UwHwYDVR0jBBgwFoAUWYQCYlpGePVd3I8KECgj3NXW+0Uw
3526+
CgYIKoZIzj0EAwQDgYsAMIGHAkIBLdqu9S54tma4n7Zwf2Z0z+yOfP7AAXmazlIC58PRDHpty7Ve
3527+
7hekm9sEdu4pKeiv+62sUvTXK9Z3hBC9xdIoaDQCQTV2WnXzkoYI9bIeCvZlC9p2x1L/Cx6AcCIw
3528+
wzPbGO2E14vs7dOoY4G1VnxHx1YwlGhza9IuqbnZLBwpvQy6uWWL
3529+
-----END CERTIFICATE-----

‎src/wp-includes/css/buttons.css‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -380,6 +380,7 @@ TABLE OF CONTENTS:
380380

381381
.wp-core-ui .button,
382382
.wp-core-ui .button.button-large,
383+
.wp-core-ui .button.button-compact,
383384
.wp-core-ui .button.button-small,
384385
input#publish,
385386
input#save-post,

0 commit comments

Comments
 (0)