From aa37e6e2f8768f4296fc062a699a0c6d3bff6480 Mon Sep 17 00:00:00 2001 From: Andrea Fercia Date: Wed, 16 Oct 2019 17:47:28 +0000 Subject: [PATCH] Script Loader: Partially revert [46550] as it brought in unrelated CSS changes. [46550] was meant to revert [46440] but it also merged some unrelated CSS changes. See #47069. git-svn-id: https://develop.svn.wordpress.org/trunk@46559 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-admin/css/color-picker.css | 55 ++++++++++++------------- src/wp-admin/css/common.css | 9 ++-- src/wp-admin/css/customize-controls.css | 11 +++-- src/wp-admin/css/forms.css | 39 +++++++----------- src/wp-admin/css/list-tables.css | 23 ++++------- src/wp-includes/css/buttons.css | 25 +++++------ src/wp-includes/css/editor.css | 11 ++--- src/wp-includes/css/media-views.css | 2 +- 8 files changed, 77 insertions(+), 98 deletions(-) diff --git a/src/wp-admin/css/color-picker.css b/src/wp-admin/css/color-picker.css index 3d3e5e8964..9869ccb2cc 100644 --- a/src/wp-admin/css/color-picker.css +++ b/src/wp-admin/css/color-picker.css @@ -10,7 +10,7 @@ /* Needs higher specificiity. */ .wp-picker-container .wp-color-result.button { - min-height: 30px; + min-height: 28px; margin: 0 6px 6px 0px; padding: 0 0 0 30px; font-size: 11px; @@ -22,7 +22,7 @@ border-left: 1px solid #ccc; color: #555; display: block; - line-height: 2.54545455; /* 28px */ + line-height: 2.36363636; /* 26px */ padding: 0 6px; text-align: center; } @@ -73,9 +73,7 @@ .wp-picker-input-wrap .button.wp-picker-default, .wp-customizer .wp-picker-input-wrap .button.wp-picker-default { margin-left: 6px; - padding: 0 8px; - line-height: 2.54545455; /* 28px */ - min-height: 30px; + padding: 2px 8px; } .wp-picker-container .iris-square-slider .ui-slider-handle:focus { @@ -89,14 +87,14 @@ } .wp-picker-container input[type="text"].wp-color-picker { - width: 4rem; + width: 65px; font-size: 12px; font-family: monospace; - line-height: 2.33333333; /* 28px */ + line-height: 1.33333333; /* 16px */ margin: 0; - padding: 0 5px; + padding: 5px; vertical-align: top; - min-height: 30px; + min-height: 28px; } .wp-color-picker::-webkit-input-placeholder { @@ -134,38 +132,26 @@ @media screen and (max-width: 782px) { .wp-picker-container input[type="text"].wp-color-picker { - width: 5rem; + width: 80px; + padding: 6px 5px 5px; font-size: 16px; - line-height: 1.875; /* 30px */ - min-height: 32px; + line-height: 1.15; } .wp-customizer .wp-picker-container input[type="text"].wp-color-picker { - padding: 0 5px; - } - - .wp-picker-input-wrap .button.wp-picker-default { - padding: 0 8px; - line-height: 2.14285714; /* 30px */ - min-height: 32px; - } - - .wp-customizer .wp-picker-input-wrap .button.wp-picker-default { - padding: 0 8px; - font-size: 14px; - line-height: 2.14285714; /* 30px */ - min-height: 32px; + padding: 5px 5px 4px; } .wp-picker-container .wp-color-result.button { + height: auto; padding: 0 0 0 40px; font-size: 14px; - line-height: 2.14285714; /* 30px */ + line-height: 2.1; } .wp-customizer .wp-picker-container .wp-color-result.button { - font-size: 14px; - line-height: 2.14285714; /* 30px */ + font-size: 13px; + line-height: 2; } .wp-picker-container .wp-color-result-text { @@ -178,3 +164,14 @@ padding: 0 10px; } } + +@media screen and (max-width: 640px) { + .wp-customizer .wp-picker-container .wp-color-result.button { + font-size: 14px; + line-height: 2.1; + } + + .wp-customizer .wp-picker-container input[type="text"].wp-color-picker { + padding: 6px 5px; + } +} diff --git a/src/wp-admin/css/common.css b/src/wp-admin/css/common.css index 8ee084470b..f03fe26854 100644 --- a/src/wp-admin/css/common.css +++ b/src/wp-admin/css/common.css @@ -924,11 +924,11 @@ span.required, #delete-action { float: left; - line-height: 2.30769231; /* 30px */ + line-height: 2.1; } #delete-link { - line-height: 2.30769231; /* 30px */ + line-height: 2.1; vertical-align: middle; text-align: left; margin-left: 8px; @@ -945,8 +945,7 @@ span.required, } #publishing-action .spinner { - float: none; - margin-top: 5px; + float: left; } #misc-publishing-actions { @@ -1087,7 +1086,7 @@ th.action-links { } .wp-filter .search-form input[type="search"] { - margin: 1px 0; + margin: 0; width: 280px; max-width: 100%; font-size: inherit; diff --git a/src/wp-admin/css/customize-controls.css b/src/wp-admin/css/customize-controls.css index 38affb5f01..fbc6411488 100644 --- a/src/wp-admin/css/customize-controls.css +++ b/src/wp-admin/css/customize-controls.css @@ -159,7 +159,6 @@ body:not(.ready) #customize-save-button-wrapper .save { float: left; transform: none; margin-top: 0; - line-height: 2; } body:not(.ready) #publish-settings, @@ -2872,11 +2871,15 @@ body.adding-widget .add-new-widget:before, } .wp-core-ui.wp-customizer .button { - min-height: 30px; - padding: 0 14px; - line-height: 2; + padding: 6px 14px; + line-height: normal; font-size: 14px; vertical-align: middle; + height: auto; + } + + #publish-settings { + height: 31px; } #customize-control-changeset_status .customize-inside-control-row { diff --git a/src/wp-admin/css/forms.css b/src/wp-admin/css/forms.css index 284e5f4477..8eb9f90e74 100644 --- a/src/wp-admin/css/forms.css +++ b/src/wp-admin/css/forms.css @@ -28,7 +28,7 @@ label { input, select { - margin: 0 1px; + margin: 1px; } textarea.code { @@ -315,8 +315,8 @@ input[type="radio"].disabled:checked:before { border-color: #7e8993; box-shadow: none; border-radius: 3px; - padding: 4px 24px 4px 8px; - min-height: 30px; + padding: 3px 24px 3px 8px; + min-height: 28px; max-width: 25rem; vertical-align: middle; -webkit-appearance: none; @@ -484,7 +484,14 @@ input[type="number"].tiny-text { #doaction, #doaction2, #post-query-submit { - margin: 0 8px 0 0; + margin: 1px 8px 0 0; +} + +.tablenav #changeit, +.tablenav #delete_all, +.tablenav #clear-recent-list, +.wp-filter #delete_all { + margin-top: 1px; } .tablenav .actions select { @@ -501,10 +508,6 @@ input[type="number"].tiny-text { .wp-cancel-pw > .dashicons { position: relative; top: 3px; - width: 1.25rem; - height: 1.25rem; - top: 0.25rem; - font-size: 20px; } .wp-cancel-pw .dashicons-no { @@ -598,12 +601,9 @@ fieldset label, .wp-pwd [type="password"] { margin-bottom: 0; /* Same height as the buttons */ - min-height: 30px; -} - -/* Hide the Edge "reveal password" native button */ -.wp-pwd input::-ms-reveal { - display: none; + line-height: 20px; + min-height: 28px; + max-height: 40px; } #pass1-text, @@ -635,10 +635,6 @@ p.search-box { margin: 0 4px 0 0; } -.plugins-php .search-box .wp-filter-search { - font-size: inherit; -} - .js.plugins-php .search-box .wp-filter-search { margin: 0; width: 280px; @@ -1565,14 +1561,10 @@ table.form-table td .updated p { position: absolute; right: 0; top: 0; - width: 2.375rem; - height: 2.375rem; - min-width: 40px; - min-height: 40px; } .wp-pwd button.wp-hide-pw { - right: 2.5rem; + right: 40px; } .wp-pwd button.button:hover, @@ -1593,7 +1585,6 @@ table.form-table td .updated p { .wp-pwd [type="text"], .wp-pwd [type="password"] { line-height: 2; - padding-right: 5rem; } .wp-cancel-pw .dashicons-no { diff --git a/src/wp-admin/css/list-tables.css b/src/wp-admin/css/list-tables.css index 5009d8a62e..0747dcf4db 100644 --- a/src/wp-admin/css/list-tables.css +++ b/src/wp-admin/css/list-tables.css @@ -638,7 +638,6 @@ th.asc a:focus span.sorting-indicator { clear: both; height: 30px; margin: 6px 0 4px; - padding-top: 5px; vertical-align: middle; } @@ -648,7 +647,7 @@ th.asc a:focus span.sorting-indicator { .tablenav .tablenav-pages { float: right; - margin: 0 0 9px; + margin: 3px 0 9px; } .tablenav .no-pages, @@ -660,12 +659,12 @@ th.asc a:focus span.sorting-indicator { .tablenav .tablenav-pages .tablenav-pages-navspan { display: inline-block; vertical-align: baseline; - min-width: 30px; - min-height: 30px; + min-width: 28px; + min-height: 28px; margin: 0; padding: 0 4px; font-size: 16px; - line-height: 1.625; /* 26px */ + line-height: 1.5; text-align: center; } @@ -679,7 +678,8 @@ th.asc a:focus span.sorting-indicator { } .tablenav .actions { - padding: 0 8px 0 0; + overflow: hidden; + padding: 2px 8px 0 0; } .wp-filter .actions { @@ -1038,7 +1038,7 @@ tr.inline-edit-row td, line-height: 1.16666666; vertical-align: middle; text-align: center; - padding: 0 4px; + padding: 6px 4px; } .inline-edit-row fieldset label input.inline-edit-password-input { @@ -1957,15 +1957,6 @@ div.action-links, box-sizing: border-box; } - .inline-edit-row fieldset input[name=jj], - .inline-edit-row fieldset input[name=hh], - .inline-edit-row fieldset input[name=mn], - .inline-edit-row fieldset input[name=aa] { - font-size: 16px; - line-height: 2; - padding: 3px 4px; - } - .inline-edit-row fieldset ul.cat-checklist label, .inline-edit-row #bulk-titles div { font-size: 16px; diff --git a/src/wp-includes/css/buttons.css b/src/wp-includes/css/buttons.css index 86844ddde0..c2388cd19f 100644 --- a/src/wp-includes/css/buttons.css +++ b/src/wp-includes/css/buttons.css @@ -46,8 +46,8 @@ TABLE OF CONTENTS: display: inline-block; text-decoration: none; font-size: 13px; - line-height: 2.15384615; /* 28px */ - min-height: 30px; + line-height: 2; + min-height: 28px; margin: 0; padding: 0 10px; cursor: pointer; @@ -71,15 +71,15 @@ TABLE OF CONTENTS: .wp-core-ui .button.button-large, .wp-core-ui .button-group.button-large .button { - min-height: 32px; - line-height: 2.30769231; /* 30px */ - padding: 0 12px; + min-height: 30px; + line-height: 2.15384615; + padding: 0 12px 2px; } .wp-core-ui .button.button-small, .wp-core-ui .button-group.button-small .button { - min-height: 26px; - line-height: 2.18181818; /* 24px */ + min-height: 24px; + line-height: 2; padding: 0 8px; font-size: 11px; } @@ -349,11 +349,11 @@ TABLE OF CONTENTS: input#publish, input#save-post, a.preview { - padding: 0 14px; - line-height: 2.71428571; /* 38px */ + padding: 1px 14px; + line-height: 2; font-size: 14px; vertical-align: middle; - min-height: 40px; + height: auto; margin-bottom: 4px; } @@ -377,9 +377,10 @@ TABLE OF CONTENTS: /* Reset responsive styles in Press This, Customizer */ .wp-core-ui.wp-customizer .button { + padding: 0 10px 1px; font-size: 13px; - line-height: 2.15384615; /* 28px */ - min-height: 30px; + line-height: 2; + min-height: 28px; margin: 0; vertical-align: inherit; } diff --git a/src/wp-includes/css/editor.css b/src/wp-includes/css/editor.css index fe3bd106fa..79528811ab 100644 --- a/src/wp-includes/css/editor.css +++ b/src/wp-includes/css/editor.css @@ -1201,10 +1201,9 @@ i.mce-i-wp_code:before { .wp-media-buttons span.wp-media-buttons-icon { display: inline-block; - width: 20px; - height: 20px; - line-height: 1; - vertical-align: middle; + width: 18px; + height: 18px; + vertical-align: text-top; margin: 0 2px; } @@ -1777,9 +1776,7 @@ div.wp-link-input input { width: 300px; padding: 3px; box-sizing: border-box; - line-height: 1.28571429; /* 18px */ - /* Override value inherited from default input fields. */ - min-height: 26px; + line-height: 1.28571429; } .mce-toolbar div.wp-link-preview ~ .mce-btn, diff --git a/src/wp-includes/css/media-views.css b/src/wp-includes/css/media-views.css index c45c50f7c7..ad4d709042 100644 --- a/src/wp-includes/css/media-views.css +++ b/src/wp-includes/css/media-views.css @@ -73,7 +73,7 @@ .media-frame select, .wp-admin .media-frame select { - min-height: 30px; + min-height: 28px; vertical-align: middle; }