Skip to content

Commit 5ed4b01

Browse files
committed
Merge branch 'trunk' into html-api/normalization-special-newlines
2 parents 9a5ce07 + ad87612 commit 5ed4b01

62 files changed

Lines changed: 622 additions & 392 deletions

File tree

Some content is hidden

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

.github/workflows/reusable-end-to-end-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ jobs:
100100

101101
- name: Install Playwright browsers
102102
if: ${{ inputs.install-playwright }}
103-
run: npx playwright install --with-deps
103+
run: npx playwright install --with-deps chromium
104104

105105
- name: Build WordPress
106106
run: npm run build

.github/workflows/reusable-performance-test-v2.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -227,9 +227,6 @@ jobs:
227227
- name: Deactivate WordPress Importer plugin
228228
run: npm run env:cli -- plugin deactivate wordpress-importer --path="/var/www/${LOCAL_DIR}"
229229

230-
- name: Update permalink structure
231-
run: npm run env:cli -- rewrite structure '/%year%/%monthnum%/%postname%/' --path="/var/www/${LOCAL_DIR}"
232-
233230
- name: Install additional languages
234231
run: |
235232
npm run env:cli -- language core install de_DE --path="/var/www/${LOCAL_DIR}"

.github/workflows/reusable-performance.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -203,9 +203,6 @@ jobs:
203203
- name: Deactivate WordPress Importer plugin
204204
run: npm run env:cli -- plugin deactivate wordpress-importer --path="/var/www/${LOCAL_DIR}"
205205

206-
- name: Update permalink structure
207-
run: npm run env:cli -- rewrite structure '/%year%/%monthnum%/%postname%/' --path="/var/www/${LOCAL_DIR}"
208-
209206
- name: Install additional languages
210207
run: |
211208
npm run env:cli -- language core install de_DE --path="/var/www/${LOCAL_DIR}"

phpcs.xml.dist

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,9 @@
4242
<!-- Exclude the build folder in the current directory. -->
4343
<exclude-pattern type="relative">^build/*</exclude-pattern>
4444

45+
<!-- Exclude the local copy of the Gutenberg repository. -->
46+
<exclude-pattern>/gutenberg/*</exclude-pattern>
47+
4548
<!-- Directories and third party library exclusions. -->
4649
<exclude-pattern>/node_modules/*</exclude-pattern>
4750
<exclude-pattern>/vendor/*</exclude-pattern>

src/wp-admin/css/common.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1575,11 +1575,11 @@ div.error.notice-alt {
15751575

15761576
.notice-info {
15771577
border-left-color: #3858e9;
1578-
background-color: transparent;
1578+
background-color: #fff;
15791579
}
15801580

15811581
.notice-info.notice-alt {
1582-
background-color: transparent;
1582+
background-color: #fff;
15831583
}
15841584

15851585
#plugin-information-footer .update-now:not(.button-disabled):before {

src/wp-admin/css/customize-controls.css

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -273,8 +273,9 @@ body.trashing #publish-settings {
273273
margin: 0;
274274
position: absolute;
275275
top: 50%;
276-
transform: translateY(-50%);
276+
transform: translateY(-50%) !important;
277277
right: 0;
278+
background: #fff !important;
278279
}
279280

280281
.preview-link-wrapper {
@@ -284,7 +285,7 @@ body.trashing #publish-settings {
284285
.customize-copy-preview-link:before,
285286
.customize-copy-preview-link:after {
286287
content: "";
287-
height: 32px;
288+
height: 40px;
288289
position: absolute;
289290
background: #fff;
290291
top: 0;

src/wp-admin/css/dashboard.css

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -219,20 +219,19 @@
219219
}
220220

221221
.welcome-panel .welcome-panel-close {
222+
display: flex;
223+
align-items: center;
222224
position: absolute;
223225
top: 10px;
224226
right: 10px;
225-
padding: 10px 15px 10px 24px;
227+
padding: 10px 15px;
226228
font-size: 13px;
227229
line-height: 1.23076923; /* Chrome rounding, needs to be 16px equivalent */
228230
text-decoration: none;
229231
z-index: 1; /* Raise above the version image. */
230232
}
231233

232234
.welcome-panel .welcome-panel-close:before {
233-
position: absolute;
234-
top: 8px;
235-
left: 0;
236235
transition: all .1s ease-in-out;
237236
content: '\f335';
238237
font-size: 24px;
@@ -721,14 +720,6 @@ body #dashboard-widgets .postbox form .submit {
721720
margin-bottom: 10px;
722721
}
723722

724-
#dashboard_right_now .inside {
725-
padding: 0;
726-
}
727-
728-
#dashboard_right_now .main {
729-
padding: 16px 16px 11px;
730-
}
731-
732723
#dashboard_right_now .main p {
733724
margin: 0;
734725
}

src/wp-admin/css/edit.css

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,16 @@
7676
pointer-events: none;
7777
}
7878

79+
#titlewrap .skiplink {
80+
background: #fff;
81+
line-height: 2.30769231; /* 30px for 32px min-height */
82+
min-height: 32px;
83+
right: 4px;
84+
}
85+
7986
#titlewrap .skiplink:focus {
8087
clip: inherit;
8188
clip-path: inherit;
82-
right: 4px;
8389
top: 4px;
8490
width: auto;
8591
}
@@ -1061,10 +1067,6 @@ form#tags-filter {
10611067
#edit-slug-box {
10621068
padding: 0;
10631069
}
1064-
1065-
#titlewrap .skiplink:focus {
1066-
top: 5px;
1067-
}
10681070
}
10691071

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

src/wp-admin/css/list-tables.css

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1424,7 +1424,7 @@ ul.cat-checklist input[name="post_category[]"]:indeterminate::before {
14241424
content: "\f463";
14251425
content: "\f463" / '';
14261426
display: inline-block;
1427-
font: normal 20px/1.9 dashicons; /* line-height 1.9 = 38px to match button */
1427+
font: normal 16px/1.875 dashicons; /* line-height 1.875 = 30px to match button */
14281428
margin: 0 5px 0 -2px;
14291429
-webkit-font-smoothing: antialiased;
14301430
-moz-osx-font-smoothing: grayscale;
@@ -1452,6 +1452,14 @@ ul.cat-checklist input[name="post_category[]"]:indeterminate::before {
14521452
content: "\f147" / '';
14531453
}
14541454

1455+
.plugin-card .updated-message:before,
1456+
.plugin-card .updating-message:before {
1457+
line-height: 1;
1458+
position: relative;
1459+
top: -2px;
1460+
vertical-align: middle;
1461+
}
1462+
14551463
.plugin-install-php #the-list {
14561464
display: flex;
14571465
flex-wrap: wrap;
@@ -1567,6 +1575,13 @@ div.action-links,
15671575
margin: 0; /* Override existing margins */
15681576
}
15691577

1578+
/* Use compact size for space-constrained plugin cards */
1579+
.plugin-action-buttons li .button {
1580+
min-height: 32px;
1581+
line-height: 2.30769231; /* 30px for 32px min-height */
1582+
padding: 0 12px;
1583+
}
1584+
15701585
.plugin-card h3 {
15711586
margin: 0 12px 12px 0;
15721587
font-size: 18px;

src/wp-admin/css/login.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ p {
4949
margin-top: 0;
5050
margin-left: 0;
5151
margin-bottom: 20px;
52-
background-color: transparent;
52+
background-color: #fff;
5353
word-wrap: break-word;
5454
}
5555

0 commit comments

Comments
 (0)