Skip to content

Commit 7948757

Browse files
authored
Merge branch 'WordPress:trunk' into toolbar-sass-front-end
2 parents 10eda66 + 4d3b0b9 commit 7948757

4 files changed

Lines changed: 26 additions & 8 deletions

File tree

src/wp-admin/css/forms.css

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -538,16 +538,34 @@ input[type="number"].tiny-text {
538538
display: none;
539539
}
540540

541-
.tablenav .actions select {
541+
.wp-core-ui .tablenav input[type="text"],
542+
.wp-core-ui .tablenav input[type="password"],
543+
.wp-core-ui .tablenav input[type="date"],
544+
.wp-core-ui .tablenav input[type="datetime"],
545+
.wp-core-ui .tablenav input[type="datetime-local"],
546+
.wp-core-ui .tablenav input[type="email"],
547+
.wp-core-ui .tablenav input[type="month"],
548+
.wp-core-ui .tablenav input[type="number"],
549+
.wp-core-ui .tablenav input[type="search"],
550+
.wp-core-ui .tablenav input[type="tel"],
551+
.wp-core-ui .tablenav input[type="time"],
552+
.wp-core-ui .tablenav input[type="url"],
553+
.wp-core-ui .tablenav input[type="week"],
554+
.wp-core-ui .tablenav select {
555+
padding: 0 12px;
556+
/* inherits font size 14px */
557+
line-height: 2.14285714; /* 30px for 32px height with 14px font */
558+
min-height: 32px;
559+
}
560+
561+
.wp-core-ui .tablenav select {
542562
float: left;
543563
margin-right: 6px;
544564
max-width: 12.5rem;
545-
min-height: 32px;
546-
line-height: 2.14285714; /* 30px for 32px height with 14px font */
547565
padding: 0 24px 0 8px;
548566
}
549567

550-
.tablenav .actions .button {
568+
.wp-core-ui .tablenav .button {
551569
min-height: 32px;
552570
line-height: 2.30769231; /* 30px for 32px height with 13px font */
553571
padding: 0 12px;

src/wp-admin/css/login.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@ p {
333333
.login #nav a:hover,
334334
.login #backtoblog a:hover,
335335
.login h1 a:hover {
336-
color: #135e96;
336+
color: var(--wp-admin-theme-color-darker-20);
337337
}
338338

339339
.login #nav a:focus,

src/wp-includes/block-patterns/navigation-overlay-centered-with-extras.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
'title' => _x( 'Overlay with site info and CTA', 'Block pattern title' ),
1010
'blockTypes' => array( 'core/template-part/navigation-overlay' ),
1111
'categories' => array( 'navigation' ),
12-
'content' => '<!-- wp:group {"metadata":{"name":"' . esc_attr( __( 'Navigation Overlay' ) ) . '"},"style":{"spacing":{"padding":{"right":"var:preset|spacing|40","left":"var:preset|spacing|40","top":"var:preset|spacing|40","bottom":"var:preset|spacing|40"}},"dimensions":{"minHeight":"100vh"},"elements":{"link":{"color":{"text":"var:preset|color|black"}}},"backgroundColor":"white","textColor":"black","layout":{"type":"default"}} -->
12+
'content' => '<!-- wp:group {"metadata":{"name":"' . esc_attr( __( 'Navigation Overlay' ) ) . '"},"style":{"spacing":{"padding":{"right":"var:preset|spacing|40","left":"var:preset|spacing|40","top":"var:preset|spacing|40","bottom":"var:preset|spacing|40"}},"dimensions":{"minHeight":"100vh"},"elements":{"link":{"color":{"text":"var:preset|color|black"}}}},"backgroundColor":"white","textColor":"black","layout":{"type":"default"}} -->
1313
<div class="wp-block-group has-black-color has-white-background-color has-text-color has-background has-link-color" style="min-height:100vh;padding-top:var(--wp--preset--spacing--40);padding-right:var(--wp--preset--spacing--40);padding-bottom:var(--wp--preset--spacing--40);padding-left:var(--wp--preset--spacing--40)"><!-- wp:group {"align":"wide","layout":{"type":"flex","flexWrap":"nowrap","justifyContent":"right"}} -->
1414
<div class="wp-block-group alignwide"><!-- wp:navigation-overlay-close /--></div>
1515
<!-- /wp:group -->

src/wp-includes/block-patterns/navigation-overlay.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
'title' => _x( 'Navigation Overlay', 'Block pattern title' ),
1010
'blockTypes' => array( 'core/template-part/navigation-overlay' ),
1111
'categories' => array( 'navigation' ),
12-
'content' => '<!-- wp:group {"metadata":{"name":"' . esc_attr( __( 'Navigation Overlay' ) ) . '"},"style":{"spacing":{"padding":{"right":"var:preset|spacing|40","left":"var:preset|spacing|40","top":"var:preset|spacing|40","bottom":"var:preset|spacing|40"}},"dimensions":{"minHeight":"100vh"}},"backgroundColor":"white","layout":{"type":"default"}} -->
13-
<div class="wp-block-group has-white-background-color has-background" style="min-height:100vh;padding-top:var(--wp--preset--spacing--40);padding-right:var(--wp--preset--spacing--40);padding-bottom:var(--wp--preset--spacing--40);padding-left:var(--wp--preset--spacing--40)"><!-- wp:group {"align":"wide","layout":{"type":"flex","flexWrap":"nowrap","justifyContent":"right"}} -->
12+
'content' => '<!-- wp:group {"metadata":{"name":"' . esc_attr( __( 'Navigation Overlay' ) ) . '"},"style":{"spacing":{"padding":{"right":"var:preset|spacing|40","left":"var:preset|spacing|40","top":"var:preset|spacing|40","bottom":"var:preset|spacing|40"}},"dimensions":{"minHeight":"100vh"},"elements":{"link":{"color":{"text":"var:preset|color|black"}}}},"backgroundColor":"white","textColor":"black","layout":{"type":"default"}} -->
13+
<div class="wp-block-group has-black-color has-white-background-color has-text-color has-background has-link-color" style="min-height:100vh;padding-top:var(--wp--preset--spacing--40);padding-right:var(--wp--preset--spacing--40);padding-bottom:var(--wp--preset--spacing--40);padding-left:var(--wp--preset--spacing--40)"><!-- wp:group {"align":"wide","layout":{"type":"flex","flexWrap":"nowrap","justifyContent":"right"}} -->
1414
<div class="wp-block-group alignwide"><!-- wp:navigation-overlay-close /--></div>
1515
<!-- /wp:group -->
1616

0 commit comments

Comments
 (0)