diff --git a/wp-includes/assets/script-loader-packages.php b/wp-includes/assets/script-loader-packages.php index 0ade2a0ff0..3c7789b280 100644 --- a/wp-includes/assets/script-loader-packages.php +++ b/wp-includes/assets/script-loader-packages.php @@ -1 +1 @@ - array('dependencies' => array('wp-dom-ready', 'wp-i18n', 'wp-polyfill'), 'version' => 'a38319d7ba46c6e60f7f9d4c371222c5'), 'annotations.js' => array('dependencies' => array('lodash', 'wp-data', 'wp-hooks', 'wp-i18n', 'wp-polyfill', 'wp-rich-text'), 'version' => 'e103c345829d2b4da838b701a4dff236'), 'api-fetch.js' => array('dependencies' => array('wp-i18n', 'wp-polyfill', 'wp-url'), 'version' => '0dba4ee96ad3d569997a3864aa593cd8'), 'autop.js' => array('dependencies' => array('wp-polyfill'), 'version' => '21d1d6c005241b908b592f52ad684a28'), 'blob.js' => array('dependencies' => array('wp-polyfill'), 'version' => '87cf2365cd719a6954f1e2bb8bcc692a'), 'block-directory.js' => array('dependencies' => array('lodash', 'wp-a11y', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-edit-post', 'wp-editor', 'wp-element', 'wp-hooks', 'wp-html-entities', 'wp-i18n', 'wp-notices', 'wp-plugins', 'wp-polyfill', 'wp-primitives'), 'version' => '0412215c1a30acacdab8c5c47546e4c1'), 'block-editor.js' => array('dependencies' => array('lodash', 'react', 'react-dom', 'wp-a11y', 'wp-api-fetch', 'wp-blob', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-data', 'wp-deprecated', 'wp-dom', 'wp-element', 'wp-hooks', 'wp-html-entities', 'wp-i18n', 'wp-is-shallow-equal', 'wp-keyboard-shortcuts', 'wp-keycodes', 'wp-notices', 'wp-polyfill', 'wp-primitives', 'wp-rich-text', 'wp-shortcode', 'wp-token-list', 'wp-url', 'wp-warning', 'wp-wordcount'), 'version' => '93be2c137c860a2d500985c9edae58f4'), 'block-library.js' => array('dependencies' => array('lodash', 'moment', 'wp-a11y', 'wp-autop', 'wp-blob', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-date', 'wp-deprecated', 'wp-dom', 'wp-element', 'wp-hooks', 'wp-html-entities', 'wp-i18n', 'wp-keycodes', 'wp-notices', 'wp-polyfill', 'wp-primitives', 'wp-reusable-blocks', 'wp-rich-text', 'wp-server-side-render', 'wp-url', 'wp-viewport'), 'version' => 'f8140fb86052cec4a7bf477cab749dd5'), 'block-serialization-default-parser.js' => array('dependencies' => array('wp-polyfill'), 'version' => '3f185f3bce2588a74d43034847c508e7'), 'blocks.js' => array('dependencies' => array('lodash', 'wp-autop', 'wp-blob', 'wp-block-serialization-default-parser', 'wp-compose', 'wp-data', 'wp-deprecated', 'wp-dom', 'wp-element', 'wp-hooks', 'wp-html-entities', 'wp-i18n', 'wp-is-shallow-equal', 'wp-polyfill', 'wp-shortcode'), 'version' => '44910a8b8797da3722009721a8140dfc'), 'components.js' => array('dependencies' => array('lodash', 'moment', 'react', 'react-dom', 'wp-a11y', 'wp-compose', 'wp-date', 'wp-deprecated', 'wp-dom', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-is-shallow-equal', 'wp-keycodes', 'wp-polyfill', 'wp-primitives', 'wp-rich-text', 'wp-warning'), 'version' => 'f92475d274706ed3459d56cf1d500a96'), 'compose.js' => array('dependencies' => array('lodash', 'react', 'wp-deprecated', 'wp-dom', 'wp-element', 'wp-is-shallow-equal', 'wp-keycodes', 'wp-polyfill', 'wp-priority-queue'), 'version' => 'ad740592e2b558c2c39fe2ffd5ae9f4e'), 'core-data.js' => array('dependencies' => array('lodash', 'wp-api-fetch', 'wp-blocks', 'wp-data', 'wp-deprecated', 'wp-element', 'wp-html-entities', 'wp-i18n', 'wp-is-shallow-equal', 'wp-polyfill', 'wp-url'), 'version' => '696f64c66d4aa2f873aa61e9c41c314f'), 'customize-widgets.js' => array('dependencies' => array('lodash', 'wp-a11y', 'wp-block-editor', 'wp-block-library', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-dom', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-is-shallow-equal', 'wp-keyboard-shortcuts', 'wp-keycodes', 'wp-media-utils', 'wp-polyfill', 'wp-primitives', 'wp-widgets'), 'version' => '74ca422e60c1961fa9e3d66dd4d78cf9'), 'data.js' => array('dependencies' => array('lodash', 'react', 'wp-compose', 'wp-deprecated', 'wp-element', 'wp-is-shallow-equal', 'wp-polyfill', 'wp-priority-queue', 'wp-redux-routine'), 'version' => '6c8d1d2f5fd3a0dd0f690b388be62075'), 'data-controls.js' => array('dependencies' => array('wp-api-fetch', 'wp-data', 'wp-deprecated', 'wp-polyfill'), 'version' => '6a75067d86cf9ab901a4646595575446'), 'date.js' => array('dependencies' => array('moment', 'wp-polyfill'), 'version' => '558f09b690d1af995c044a6e534af741'), 'deprecated.js' => array('dependencies' => array('wp-hooks', 'wp-polyfill'), 'version' => '96593d5d272d008fbcb6912fa0b86778'), 'dom.js' => array('dependencies' => array('lodash', 'wp-polyfill'), 'version' => 'db303ea2ff11bbb161b19a3b0cc200fe'), 'dom-ready.js' => array('dependencies' => array('wp-polyfill'), 'version' => 'd996b53411d1533a84951212ab6ac4ff'), 'edit-post.js' => array('dependencies' => array('lodash', 'wp-a11y', 'wp-block-editor', 'wp-block-library', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-data-controls', 'wp-editor', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-keyboard-shortcuts', 'wp-keycodes', 'wp-media-utils', 'wp-notices', 'wp-plugins', 'wp-polyfill', 'wp-primitives', 'wp-url', 'wp-viewport', 'wp-warning'), 'version' => '9b0320774da0e50a5655c66ff3271e4d'), 'edit-site.js' => array('dependencies' => array('lodash', 'wp-a11y', 'wp-api-fetch', 'wp-block-editor', 'wp-block-library', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-data-controls', 'wp-editor', 'wp-element', 'wp-hooks', 'wp-html-entities', 'wp-i18n', 'wp-keyboard-shortcuts', 'wp-keycodes', 'wp-media-utils', 'wp-notices', 'wp-plugins', 'wp-polyfill', 'wp-primitives', 'wp-reusable-blocks', 'wp-url', 'wp-viewport'), 'version' => 'fcbb8ebcf9e53b0e3d49e3d37a9ba141'), 'edit-widgets.js' => array('dependencies' => array('lodash', 'wp-a11y', 'wp-api-fetch', 'wp-block-editor', 'wp-block-library', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-dom', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-keyboard-shortcuts', 'wp-keycodes', 'wp-media-utils', 'wp-notices', 'wp-plugins', 'wp-polyfill', 'wp-primitives', 'wp-reusable-blocks', 'wp-url', 'wp-viewport', 'wp-widgets'), 'version' => 'ea60dda005c09871a3f19ac638e4554b'), 'editor.js' => array('dependencies' => array('lodash', 'react', 'wp-a11y', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-data-controls', 'wp-date', 'wp-deprecated', 'wp-element', 'wp-hooks', 'wp-html-entities', 'wp-i18n', 'wp-keyboard-shortcuts', 'wp-keycodes', 'wp-media-utils', 'wp-notices', 'wp-polyfill', 'wp-primitives', 'wp-reusable-blocks', 'wp-rich-text', 'wp-server-side-render', 'wp-url', 'wp-wordcount'), 'version' => 'e7d4b7e0195c7beb0ea91634b4fe6f78'), 'element.js' => array('dependencies' => array('lodash', 'react', 'react-dom', 'wp-escape-html', 'wp-polyfill'), 'version' => 'aa7fa64d714e1bfb2783c767a090406d'), 'escape-html.js' => array('dependencies' => array('wp-polyfill'), 'version' => '00a5735837e9efe13da1d979f16a7105'), 'format-library.js' => array('dependencies' => array('lodash', 'wp-a11y', 'wp-block-editor', 'wp-components', 'wp-data', 'wp-element', 'wp-html-entities', 'wp-i18n', 'wp-polyfill', 'wp-primitives', 'wp-rich-text', 'wp-url'), 'version' => '70b1875c9f8d08d0725c2d29c27c5c53'), 'hooks.js' => array('dependencies' => array('wp-polyfill'), 'version' => '6f1c406015dcc134f2736b9aa66d7e92'), 'html-entities.js' => array('dependencies' => array('wp-polyfill'), 'version' => 'aceb867c6fcca6a7ffbac9e7b5294327'), 'i18n.js' => array('dependencies' => array('wp-hooks', 'wp-polyfill'), 'version' => '2e6b2408ec717223c7a94cee48bb35e3'), 'is-shallow-equal.js' => array('dependencies' => array('wp-polyfill'), 'version' => '649feec00389556f8015a6b97efc1cb1'), 'keyboard-shortcuts.js' => array('dependencies' => array('lodash', 'wp-data', 'wp-element', 'wp-keycodes', 'wp-polyfill'), 'version' => '418fddac042f08102c4110f70e13cd47'), 'keycodes.js' => array('dependencies' => array('lodash', 'wp-i18n', 'wp-polyfill'), 'version' => '84a0e6bbcf0b9e1ea0184c3f2bf28022'), 'list-reusable-blocks.js' => array('dependencies' => array('lodash', 'wp-api-fetch', 'wp-components', 'wp-compose', 'wp-element', 'wp-i18n', 'wp-polyfill'), 'version' => '1ec5b0bdf9e6c2ea47f117db16155197'), 'media-utils.js' => array('dependencies' => array('lodash', 'wp-api-fetch', 'wp-blob', 'wp-element', 'wp-i18n', 'wp-polyfill'), 'version' => 'f03b83a599fc30ed40756ad5fcef15e4'), 'notices.js' => array('dependencies' => array('lodash', 'wp-data', 'wp-polyfill'), 'version' => 'e44820c667bf205cacdfc48cbeb3c2e6'), 'nux.js' => array('dependencies' => array('lodash', 'wp-components', 'wp-compose', 'wp-data', 'wp-deprecated', 'wp-element', 'wp-i18n', 'wp-polyfill', 'wp-primitives'), 'version' => '4872896fe3c9656bc21e3a9f6cfe38f3'), 'plugins.js' => array('dependencies' => array('lodash', 'wp-compose', 'wp-element', 'wp-hooks', 'wp-polyfill', 'wp-primitives'), 'version' => '065e2abcdf28fe132eac4a5e0498e5ff'), 'primitives.js' => array('dependencies' => array('wp-element', 'wp-polyfill'), 'version' => 'e55f3757d6aa7c23451d147b00329b13'), 'priority-queue.js' => array('dependencies' => array('wp-polyfill'), 'version' => 'efad6460ae6b28406d39866cb10731e0'), 'redux-routine.js' => array('dependencies' => array('lodash', 'wp-polyfill'), 'version' => '5156478c032ea85a2bbdceeb7a43b0c1'), 'reusable-blocks.js' => array('dependencies' => array('lodash', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-core-data', 'wp-data', 'wp-element', 'wp-i18n', 'wp-notices', 'wp-polyfill', 'wp-primitives', 'wp-url'), 'version' => '5ad087c37455ce414015aff816a4e350'), 'rich-text.js' => array('dependencies' => array('lodash', 'wp-a11y', 'wp-compose', 'wp-data', 'wp-element', 'wp-escape-html', 'wp-i18n', 'wp-keycodes', 'wp-polyfill'), 'version' => '0c2ca335c85c5c680181f1fd6d06a884'), 'server-side-render.js' => array('dependencies' => array('lodash', 'wp-api-fetch', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-data', 'wp-deprecated', 'wp-element', 'wp-i18n', 'wp-polyfill', 'wp-url'), 'version' => '1f0b4e9b7d975cf4fbaf0c2a606d38b2'), 'shortcode.js' => array('dependencies' => array('lodash', 'wp-polyfill'), 'version' => 'd6964e945049b6190adc8770cda168c4'), 'token-list.js' => array('dependencies' => array('lodash', 'wp-polyfill'), 'version' => '4ebce6423dfff99d40033fd33ce52cc9'), 'url.js' => array('dependencies' => array('lodash', 'wp-polyfill'), 'version' => 'cd20bb21dbf4896d55a0f0def110ed6e'), 'viewport.js' => array('dependencies' => array('lodash', 'wp-compose', 'wp-data', 'wp-element', 'wp-polyfill'), 'version' => 'f5b7d6832c98057c4f6fdedf2c2c0227'), 'warning.js' => array('dependencies' => array('wp-polyfill'), 'version' => 'babb99706f43063fa0925fd1a0fd775a'), 'widgets.js' => array('dependencies' => array('lodash', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-element', 'wp-i18n', 'wp-notices', 'wp-polyfill', 'wp-primitives'), 'version' => 'bd5ba1332feaa7da969664b49295f3a7'), 'wordcount.js' => array('dependencies' => array('lodash', 'wp-polyfill'), 'version' => '56960c4d13e9d7a315dffd43fdce921c')); \ No newline at end of file + array('dependencies' => array('wp-dom-ready', 'wp-i18n', 'wp-polyfill'), 'version' => 'a38319d7ba46c6e60f7f9d4c371222c5'), 'annotations.js' => array('dependencies' => array('lodash', 'wp-data', 'wp-hooks', 'wp-i18n', 'wp-polyfill', 'wp-rich-text'), 'version' => 'e103c345829d2b4da838b701a4dff236'), 'api-fetch.js' => array('dependencies' => array('wp-i18n', 'wp-polyfill', 'wp-url'), 'version' => '63050163caffa6aac54e9ebf21fe0472'), 'autop.js' => array('dependencies' => array('wp-polyfill'), 'version' => '21d1d6c005241b908b592f52ad684a28'), 'blob.js' => array('dependencies' => array('wp-polyfill'), 'version' => '87cf2365cd719a6954f1e2bb8bcc692a'), 'block-directory.js' => array('dependencies' => array('lodash', 'wp-a11y', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-edit-post', 'wp-editor', 'wp-element', 'wp-hooks', 'wp-html-entities', 'wp-i18n', 'wp-notices', 'wp-plugins', 'wp-polyfill', 'wp-primitives', 'wp-url'), 'version' => 'fd489311f434eb89ad7436e8d8f0a7e8'), 'block-editor.js' => array('dependencies' => array('lodash', 'react', 'react-dom', 'wp-a11y', 'wp-api-fetch', 'wp-blob', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-data', 'wp-date', 'wp-deprecated', 'wp-dom', 'wp-element', 'wp-hooks', 'wp-html-entities', 'wp-i18n', 'wp-is-shallow-equal', 'wp-keyboard-shortcuts', 'wp-keycodes', 'wp-notices', 'wp-polyfill', 'wp-primitives', 'wp-rich-text', 'wp-shortcode', 'wp-token-list', 'wp-url', 'wp-warning', 'wp-wordcount'), 'version' => 'f89db44f2f63108d4d0b11aa5769c07d'), 'block-library.js' => array('dependencies' => array('lodash', 'moment', 'wp-a11y', 'wp-api-fetch', 'wp-autop', 'wp-blob', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-date', 'wp-deprecated', 'wp-dom', 'wp-element', 'wp-hooks', 'wp-html-entities', 'wp-i18n', 'wp-keycodes', 'wp-notices', 'wp-polyfill', 'wp-primitives', 'wp-reusable-blocks', 'wp-rich-text', 'wp-server-side-render', 'wp-url', 'wp-viewport'), 'version' => '7c862c64f37bda777e3304956878ac38'), 'block-serialization-default-parser.js' => array('dependencies' => array('wp-polyfill'), 'version' => '8ee151736a1e51db2bafbb61ddd60634'), 'blocks.js' => array('dependencies' => array('lodash', 'wp-autop', 'wp-blob', 'wp-block-serialization-default-parser', 'wp-compose', 'wp-data', 'wp-deprecated', 'wp-dom', 'wp-element', 'wp-hooks', 'wp-html-entities', 'wp-i18n', 'wp-is-shallow-equal', 'wp-polyfill', 'wp-shortcode'), 'version' => '5f2a1df817f7318d368389a0ee3fbab4'), 'components.js' => array('dependencies' => array('lodash', 'moment', 'react', 'react-dom', 'wp-a11y', 'wp-compose', 'wp-date', 'wp-deprecated', 'wp-dom', 'wp-element', 'wp-escape-html', 'wp-hooks', 'wp-i18n', 'wp-is-shallow-equal', 'wp-keycodes', 'wp-polyfill', 'wp-primitives', 'wp-rich-text', 'wp-warning'), 'version' => '6ac0ebee2cf205e5aa8993d329a6a2ec'), 'compose.js' => array('dependencies' => array('lodash', 'react', 'wp-deprecated', 'wp-dom', 'wp-element', 'wp-is-shallow-equal', 'wp-keycodes', 'wp-polyfill', 'wp-priority-queue'), 'version' => '55c31fc1e76c3edfbfc61367b743372d'), 'core-data.js' => array('dependencies' => array('lodash', 'wp-api-fetch', 'wp-blocks', 'wp-data', 'wp-deprecated', 'wp-element', 'wp-html-entities', 'wp-i18n', 'wp-is-shallow-equal', 'wp-polyfill', 'wp-url'), 'version' => 'a16fa1df8ee0e76464d249a674e17610'), 'customize-widgets.js' => array('dependencies' => array('lodash', 'wp-block-editor', 'wp-block-library', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-deprecated', 'wp-dom', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-is-shallow-equal', 'wp-keyboard-shortcuts', 'wp-keycodes', 'wp-media-utils', 'wp-polyfill', 'wp-preferences', 'wp-primitives', 'wp-widgets'), 'version' => '1c73c17724422c6c699315524323b3c6'), 'data.js' => array('dependencies' => array('lodash', 'react', 'wp-compose', 'wp-deprecated', 'wp-element', 'wp-is-shallow-equal', 'wp-polyfill', 'wp-priority-queue', 'wp-redux-routine'), 'version' => 'e7ddc082a373bd21a10998f17d8dad52'), 'data-controls.js' => array('dependencies' => array('wp-api-fetch', 'wp-data', 'wp-deprecated', 'wp-polyfill'), 'version' => '6a75067d86cf9ab901a4646595575446'), 'date.js' => array('dependencies' => array('moment', 'wp-polyfill'), 'version' => 'e0e02b3a1c7037e6cb893486d4680631'), 'deprecated.js' => array('dependencies' => array('wp-hooks', 'wp-polyfill'), 'version' => '96593d5d272d008fbcb6912fa0b86778'), 'dom.js' => array('dependencies' => array('lodash', 'wp-polyfill'), 'version' => '3c10edc1abf3fbbc79f17fd7d1d332eb'), 'dom-ready.js' => array('dependencies' => array('wp-polyfill'), 'version' => 'd996b53411d1533a84951212ab6ac4ff'), 'edit-post.js' => array('dependencies' => array('lodash', 'wp-a11y', 'wp-api-fetch', 'wp-block-editor', 'wp-block-library', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-deprecated', 'wp-editor', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-keyboard-shortcuts', 'wp-keycodes', 'wp-media-utils', 'wp-notices', 'wp-plugins', 'wp-polyfill', 'wp-preferences', 'wp-primitives', 'wp-url', 'wp-viewport', 'wp-warning'), 'version' => '2e4d6c4dec8990df88caf2a873aaedcf'), 'edit-site.js' => array('dependencies' => array('lodash', 'react', 'wp-a11y', 'wp-api-fetch', 'wp-block-editor', 'wp-block-library', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-deprecated', 'wp-editor', 'wp-element', 'wp-hooks', 'wp-html-entities', 'wp-i18n', 'wp-keyboard-shortcuts', 'wp-keycodes', 'wp-media-utils', 'wp-notices', 'wp-plugins', 'wp-polyfill', 'wp-preferences', 'wp-primitives', 'wp-reusable-blocks', 'wp-url', 'wp-viewport'), 'version' => '1eed77f8545a9bb10ae6c4723e5a36f9'), 'edit-widgets.js' => array('dependencies' => array('lodash', 'wp-api-fetch', 'wp-block-editor', 'wp-block-library', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-deprecated', 'wp-dom', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-keyboard-shortcuts', 'wp-keycodes', 'wp-media-utils', 'wp-notices', 'wp-plugins', 'wp-polyfill', 'wp-preferences', 'wp-primitives', 'wp-reusable-blocks', 'wp-url', 'wp-viewport', 'wp-widgets'), 'version' => '7f2482b5fc9fcd25123b7cfc017fae78'), 'editor.js' => array('dependencies' => array('lodash', 'react', 'wp-a11y', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-date', 'wp-deprecated', 'wp-element', 'wp-hooks', 'wp-html-entities', 'wp-i18n', 'wp-keyboard-shortcuts', 'wp-keycodes', 'wp-media-utils', 'wp-notices', 'wp-polyfill', 'wp-preferences', 'wp-primitives', 'wp-reusable-blocks', 'wp-rich-text', 'wp-server-side-render', 'wp-url', 'wp-wordcount'), 'version' => '222292ad6ea9509712bcb073f0c3d057'), 'element.js' => array('dependencies' => array('lodash', 'react', 'react-dom', 'wp-escape-html', 'wp-polyfill'), 'version' => '3dfdc75a0abf30f057df44e9a39abe5b'), 'escape-html.js' => array('dependencies' => array('wp-polyfill'), 'version' => '00a5735837e9efe13da1d979f16a7105'), 'format-library.js' => array('dependencies' => array('lodash', 'wp-a11y', 'wp-block-editor', 'wp-components', 'wp-data', 'wp-element', 'wp-html-entities', 'wp-i18n', 'wp-polyfill', 'wp-primitives', 'wp-rich-text', 'wp-url'), 'version' => '98e32e5276b4b59e7b283addf7cdbd8c'), 'hooks.js' => array('dependencies' => array('wp-polyfill'), 'version' => 'c6d64f2cb8f5c6bb49caca37f8828ce3'), 'html-entities.js' => array('dependencies' => array('wp-polyfill'), 'version' => 'c6385fb7cd9fdada1cf8892a545f8a26'), 'i18n.js' => array('dependencies' => array('wp-hooks', 'wp-polyfill'), 'version' => 'ebee46757c6a411e38fd079a7ac71d94'), 'is-shallow-equal.js' => array('dependencies' => array('wp-polyfill'), 'version' => '649feec00389556f8015a6b97efc1cb1'), 'keyboard-shortcuts.js' => array('dependencies' => array('lodash', 'wp-data', 'wp-element', 'wp-keycodes', 'wp-polyfill'), 'version' => '418fddac042f08102c4110f70e13cd47'), 'keycodes.js' => array('dependencies' => array('lodash', 'wp-i18n', 'wp-polyfill'), 'version' => '84a0e6bbcf0b9e1ea0184c3f2bf28022'), 'list-reusable-blocks.js' => array('dependencies' => array('lodash', 'wp-api-fetch', 'wp-components', 'wp-compose', 'wp-element', 'wp-i18n', 'wp-polyfill'), 'version' => '2b04eb3e5628488fe2cb534f02806022'), 'media-utils.js' => array('dependencies' => array('lodash', 'wp-api-fetch', 'wp-blob', 'wp-element', 'wp-i18n', 'wp-polyfill'), 'version' => 'ee812d25ec8504c5b419a1aa3cae974d'), 'notices.js' => array('dependencies' => array('lodash', 'wp-data', 'wp-polyfill'), 'version' => 'e44820c667bf205cacdfc48cbeb3c2e6'), 'nux.js' => array('dependencies' => array('lodash', 'wp-components', 'wp-compose', 'wp-data', 'wp-deprecated', 'wp-element', 'wp-i18n', 'wp-polyfill', 'wp-primitives'), 'version' => '48ab41273bfd9022769c430fcd3c23cf'), 'plugins.js' => array('dependencies' => array('lodash', 'wp-compose', 'wp-element', 'wp-hooks', 'wp-polyfill', 'wp-primitives'), 'version' => '8318bcd6086deb19e800c183bd20bafb'), 'preferences.js' => array('dependencies' => array('wp-a11y', 'wp-components', 'wp-data', 'wp-element', 'wp-i18n', 'wp-polyfill', 'wp-primitives'), 'version' => 'a9b6f95c63bb642d0be7c3d1d208b302'), 'primitives.js' => array('dependencies' => array('wp-element', 'wp-polyfill'), 'version' => 'cadf5cfaabdb15c8c8fc440547afe919'), 'priority-queue.js' => array('dependencies' => array('wp-polyfill'), 'version' => 'efad6460ae6b28406d39866cb10731e0'), 'redux-routine.js' => array('dependencies' => array('lodash', 'wp-polyfill'), 'version' => '5156478c032ea85a2bbdceeb7a43b0c1'), 'reusable-blocks.js' => array('dependencies' => array('lodash', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-core-data', 'wp-data', 'wp-element', 'wp-i18n', 'wp-notices', 'wp-polyfill', 'wp-primitives', 'wp-url'), 'version' => '7387bed6e19d1b3aec4b6fda683a0768'), 'rich-text.js' => array('dependencies' => array('lodash', 'wp-a11y', 'wp-compose', 'wp-data', 'wp-element', 'wp-escape-html', 'wp-i18n', 'wp-keycodes', 'wp-polyfill'), 'version' => '3d28945690ee0ddbb0a8e37dfe2e0ac2'), 'server-side-render.js' => array('dependencies' => array('lodash', 'wp-api-fetch', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-data', 'wp-deprecated', 'wp-element', 'wp-i18n', 'wp-polyfill', 'wp-url'), 'version' => 'f3f949340f2edb72d97152f3cda119a1'), 'shortcode.js' => array('dependencies' => array('lodash', 'wp-polyfill'), 'version' => 'd6964e945049b6190adc8770cda168c4'), 'token-list.js' => array('dependencies' => array('lodash', 'wp-polyfill'), 'version' => '4ebce6423dfff99d40033fd33ce52cc9'), 'url.js' => array('dependencies' => array('lodash', 'wp-polyfill'), 'version' => '16385e4d69da65c7283790971de6b297'), 'viewport.js' => array('dependencies' => array('lodash', 'wp-compose', 'wp-data', 'wp-element', 'wp-polyfill'), 'version' => '6b3719cd3e4fd40e0ce2de0e0c86dbe4'), 'warning.js' => array('dependencies' => array('wp-polyfill'), 'version' => 'b9190af8fc6a3a48c580473c6f337b88'), 'widgets.js' => array('dependencies' => array('lodash', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-element', 'wp-i18n', 'wp-notices', 'wp-polyfill', 'wp-primitives'), 'version' => '80e98954519d1dad7a91a2248dbc2cc9'), 'wordcount.js' => array('dependencies' => array('lodash', 'wp-polyfill'), 'version' => 'fb8056c75aa0a0569f7ea3ceae97fbc6')); \ No newline at end of file diff --git a/wp-includes/blocks/archives.php b/wp-includes/blocks/archives.php index 2f4ad1045a..220f0f3229 100644 --- a/wp-includes/blocks/archives.php +++ b/wp-includes/blocks/archives.php @@ -16,21 +16,21 @@ */ function render_block_core_archives( $attributes ) { $show_post_count = ! empty( $attributes['showPostCounts'] ); - - $class = ''; + $type = isset( $attributes['type'] ) ? $attributes['type'] : 'monthly'; + $class = ''; if ( ! empty( $attributes['displayAsDropdown'] ) ) { $class .= ' wp-block-archives-dropdown'; - $dropdown_id = esc_attr( uniqid( 'wp-block-archives-' ) ); + $dropdown_id = wp_unique_id( 'wp-block-archives-' ); $title = __( 'Archives' ); /** This filter is documented in wp-includes/widgets/class-wp-widget-archives.php */ $dropdown_args = apply_filters( 'widget_archives_dropdown_args', array( - 'type' => 'monthly', + 'type' => $type, 'format' => 'option', 'show_post_count' => $show_post_count, ) @@ -62,11 +62,9 @@ function render_block_core_archives( $attributes ) { break; } - $label = esc_html( $label ); - - $block_content = ' - '; + $block_content = ' + '; return sprintf( '
%2$s
', @@ -81,7 +79,7 @@ function render_block_core_archives( $attributes ) { $archives_args = apply_filters( 'widget_archives_args', array( - 'type' => 'monthly', + 'type' => $type, 'show_post_count' => $show_post_count, ) ); @@ -90,9 +88,7 @@ function render_block_core_archives( $attributes ) { $archives = wp_get_archives( $archives_args ); - $classnames = esc_attr( $class ); - - $wrapper_attributes = get_block_wrapper_attributes( array( 'class' => $classnames ) ); + $wrapper_attributes = get_block_wrapper_attributes( array( 'class' => $class ) ); if ( empty( $archives ) ) { return sprintf( diff --git a/wp-includes/blocks/archives/block.json b/wp-includes/blocks/archives/block.json index 799d050354..e75aafbbe0 100644 --- a/wp-includes/blocks/archives/block.json +++ b/wp-includes/blocks/archives/block.json @@ -1,9 +1,10 @@ { + "$schema": "https://schemas.wp.org/trunk/block.json", "apiVersion": 2, "name": "core/archives", "title": "Archives", "category": "widgets", - "description": "Display a monthly archive of your posts.", + "description": "Display a date archive of your posts.", "textdomain": "default", "attributes": { "displayAsDropdown": { @@ -13,6 +14,10 @@ "showPostCounts": { "type": "boolean", "default": false + }, + "type": { + "type": "string", + "default": "monthly" } }, "supports": { diff --git a/wp-includes/blocks/audio/block.json b/wp-includes/blocks/audio/block.json index 969a9e7e7c..0dfe838558 100644 --- a/wp-includes/blocks/audio/block.json +++ b/wp-includes/blocks/audio/block.json @@ -1,4 +1,5 @@ { + "$schema": "https://schemas.wp.org/trunk/block.json", "apiVersion": 2, "name": "core/audio", "title": "Audio", diff --git a/wp-includes/blocks/audio/editor-rtl.css b/wp-includes/blocks/audio/editor-rtl.css index 2168638bbe..d8f4ad6672 100644 --- a/wp-includes/blocks/audio/editor-rtl.css +++ b/wp-includes/blocks/audio/editor-rtl.css @@ -77,4 +77,15 @@ .wp-block-audio { margin-right: 0; margin-left: 0; + position: relative; +} +.wp-block-audio.is-transient audio { + opacity: 0.3; +} +.wp-block-audio .components-spinner { + position: absolute; + top: 50%; + right: 50%; + margin-top: -9px; + margin-right: -9px; } \ No newline at end of file diff --git a/wp-includes/blocks/audio/editor-rtl.min.css b/wp-includes/blocks/audio/editor-rtl.min.css index ef4bb74ad5..a0a3adba5c 100644 --- a/wp-includes/blocks/audio/editor-rtl.min.css +++ b/wp-includes/blocks/audio/editor-rtl.min.css @@ -1 +1 @@ -.wp-block-audio{margin-right:0;margin-left:0} \ No newline at end of file +.wp-block-audio{margin-right:0;margin-left:0;position:relative}.wp-block-audio.is-transient audio{opacity:.3}.wp-block-audio .components-spinner{position:absolute;top:50%;right:50%;margin-top:-9px;margin-right:-9px} \ No newline at end of file diff --git a/wp-includes/blocks/audio/editor.css b/wp-includes/blocks/audio/editor.css index 8e1d9c92e3..c2445c4bb7 100644 --- a/wp-includes/blocks/audio/editor.css +++ b/wp-includes/blocks/audio/editor.css @@ -77,4 +77,15 @@ .wp-block-audio { margin-left: 0; margin-right: 0; + position: relative; +} +.wp-block-audio.is-transient audio { + opacity: 0.3; +} +.wp-block-audio .components-spinner { + position: absolute; + top: 50%; + left: 50%; + margin-top: -9px; + margin-left: -9px; } \ No newline at end of file diff --git a/wp-includes/blocks/audio/editor.min.css b/wp-includes/blocks/audio/editor.min.css index d668b18d80..f2699dda79 100644 --- a/wp-includes/blocks/audio/editor.min.css +++ b/wp-includes/blocks/audio/editor.min.css @@ -1 +1 @@ -.wp-block-audio{margin-left:0;margin-right:0} \ No newline at end of file +.wp-block-audio{margin-left:0;margin-right:0;position:relative}.wp-block-audio.is-transient audio{opacity:.3}.wp-block-audio .components-spinner{position:absolute;top:50%;left:50%;margin-top:-9px;margin-left:-9px} \ No newline at end of file diff --git a/wp-includes/blocks/avatar.php b/wp-includes/blocks/avatar.php new file mode 100644 index 0000000000..2a881c2306 --- /dev/null +++ b/wp-includes/blocks/avatar.php @@ -0,0 +1,146 @@ + $value ) { + if ( null !== $value ) { + $name = _wp_to_kebab_case( $key ); + // Add shared styles for individual border radii. + $border_style = sprintf( + 'border-%s-radius: %s;', + esc_attr( $name ), + esc_attr( $value ) + ); + $image_styles[] = $border_style; + } + } + } else { + $border_style = sprintf( 'border-radius: %s;', esc_attr( $border_radius ) ); + $image_styles[] = $border_style; + } + } + + // Add border color styles. + $has_border_color = ! empty( $attributes['style']['border']['color'] ); + + if ( $has_border_color ) { + $border_color = $attributes['style']['border']['color']; + $image_styles[] = sprintf( 'border-color: %s;', esc_attr( $border_color ) ); + } + + // Add border style (solid, dashed, dotted ). + $has_border_style = ! empty( $attributes['style']['border']['style'] ); + + if ( $has_border_style ) { + $border_style = $attributes['style']['border']['style']; + $image_styles[] = sprintf( 'border-style: %s;', esc_attr( $border_style ) ); + } + + // Add border classes to the avatar image for both custom colors and palette colors. + $image_classes = ''; + if ( $has_border_color || isset( $attributes['borderColor'] ) ) { + $image_classes .= 'has-border-color'; + } + if ( isset( $attributes['borderColor'] ) ) { + $image_classes .= ' has-' . $attributes['borderColor'] . '-border-color'; + } + + if ( ! isset( $block->context['commentId'] ) ) { + $author_id = isset( $attributes['userId'] ) ? $attributes['userId'] : get_post_field( 'post_author', $block->context['postId'] ); + $author_name = get_the_author_meta( 'display_name', $author_id ); + // translators: %s is the Author name. + $alt = sprintf( __( '%s Avatar' ), $author_name ); + $avatar_block = get_avatar( + $author_id, + $size, + '', + $alt, + array( + 'extra_attr' => isset( $image_styles ) ? sprintf( ' style="%s"', safecss_filter_attr( implode( ' ', $image_styles ) ) ) : '', + 'class' => "wp-block-avatar__image $image_classes ", + ) + ); + if ( isset( $attributes['isLink'] ) && $attributes['isLink'] ) { + $label = ''; + if ( '_blank' === $attributes['linkTarget'] ) { + // translators: %s is the Author name. + $label = 'aria-label="' . sprintf( esc_attr__( '(%s author archive, opens in a new tab)' ), $author_name ) . '"'; + } + // translators: %1$s: Author archive link. %2$s: Link target. %3$s Aria label. %4$s Avatar image. + $avatar_block = sprintf( '%4$s', get_author_posts_url( $author_id ), esc_attr( $attributes['linkTarget'] ), $label, $avatar_block ); + } + return sprintf( '
%2s
', $wrapper_attributes, $avatar_block ); + } + $comment = get_comment( $block->context['commentId'] ); + /* translators: %s is the Comment Author name */ + $alt = sprintf( __( '%s Avatar' ), $comment->comment_author ); + if ( ! $comment ) { + return ''; + } + $avatar_block = get_avatar( + $comment, + $size, + '', + $alt, + array( + 'extra_attr' => isset( $image_styles ) ? sprintf( ' style="%s"', safecss_filter_attr( implode( ' ', $image_styles ) ) ) : '', + 'class' => "wp-block-avatar__image $image_classes", + ) + ); + if ( isset( $attributes['isLink'] ) && $attributes['isLink'] && isset( $comment->comment_author_url ) && '' !== $comment->comment_author_url ) { + $label = ''; + if ( '_blank' === $attributes['linkTarget'] ) { + // translators: %s is the Comment Author name. + $label = 'aria-label="' . sprintf( esc_attr__( '(%s website link, opens in a new tab)' ), $comment->comment_author ) . '"'; + } + // translators: %1$s: Comment Author website link. %2$s: Link target. %3$s Aria label. %4$s Avatar image. + $avatar_block = sprintf( '%4$s', $comment->comment_author_url, esc_attr( $attributes['linkTarget'] ), $label, $avatar_block ); + } + return sprintf( '
%2s
', $wrapper_attributes, $avatar_block ); +} + +/** + * Registers the `core/avatar` block on the server. + */ +function register_block_core_avatar() { + register_block_type_from_metadata( + __DIR__ . '/avatar', + array( + 'render_callback' => 'render_block_core_avatar', + ) + ); +} +add_action( 'init', 'register_block_core_avatar' ); diff --git a/wp-includes/blocks/avatar/block.json b/wp-includes/blocks/avatar/block.json new file mode 100644 index 0000000000..537e21422b --- /dev/null +++ b/wp-includes/blocks/avatar/block.json @@ -0,0 +1,53 @@ +{ + "$schema": "https://schemas.wp.org/trunk/block.json", + "apiVersion": 2, + "name": "core/avatar", + "title": "Avatar", + "category": "theme", + "description": "Add a user's avatar.", + "textdomain": "default", + "attributes": { + "userId": { + "type": "number" + }, + "size": { + "type": "number", + "default": 96 + }, + "isLink": { + "type": "boolean", + "default": false + }, + "linkTarget": { + "type": "string", + "default": "_self" + } + + }, + "usesContext": [ "postType", "postId", "commentId" ], + "supports": { + "html": false, + "align": true, + "alignWide": false, + "spacing": { + "margin": true + }, + "__experimentalBorder": { + "__experimentalSkipSerialization": true, + "radius": true, + "width": true, + "color": true, + "style": true, + "__experimentalDefaultControls": { + "radius": true + } + }, + "color": { + "text": false, + "background": false, + "__experimentalDuotone": "img" + } + }, + "editorStyle": "wp-block-avatar", + "style": "wp-block-avatar" +} diff --git a/wp-includes/blocks/avatar/editor-rtl.css b/wp-includes/blocks/avatar/editor-rtl.css new file mode 100644 index 0000000000..409423c802 --- /dev/null +++ b/wp-includes/blocks/avatar/editor-rtl.css @@ -0,0 +1,83 @@ +/** + * Colors + */ +/** + * Breakpoints & Media Queries + */ +/** + * SCSS Variables. + * + * Please use variables from this sheet to ensure consistency across the UI. + * Don't add to this sheet unless you're pretty sure the value will be reused in many places. + * For example, don't add rules to this sheet that affect block visuals. It's purely for UI. + */ +/** + * Colors + */ +/** + * Fonts & basic variables. + */ +/** + * Grid System. + * https://make.wordpress.org/design/2019/10/31/proposal-a-consistent-spacing-system-for-wordpress/ + */ +/** + * Dimensions. + */ +/** + * Shadows. + */ +/** + * Editor widths. + */ +/** + * Block & Editor UI. + */ +/** + * Block paddings. + */ +/** + * React Native specific. + * These variables do not appear to be used anywhere else. + */ +/** +* Converts a hex value into the rgb equivalent. +* +* @param {string} hex - the hexadecimal value to convert +* @return {string} comma separated rgb values +*/ +/** + * Breakpoint mixins + */ +/** + * Long content fade mixin + * + * Creates a fading overlay to signify that the content is longer + * than the space allows. + */ +/** + * Focus styles. + */ +/** + * Applies editor left position to the selector passed as argument + */ +/** + * Styles that are reused verbatim in a few places + */ +/** + * Allows users to opt-out of animations via OS-level preferences. + */ +/** + * Reset default styles for JavaScript UI based pages. + * This is a WP-admin agnostic reset + */ +/** + * Reset the WP Admin page styles for Gutenberg-like pages. + */ +.wp-block-avatar__image img { + width: 100%; +} + +.wp-block-avatar.aligncenter .components-resizable-box__container { + margin: 0 auto; +} \ No newline at end of file diff --git a/wp-includes/blocks/avatar/editor-rtl.min.css b/wp-includes/blocks/avatar/editor-rtl.min.css new file mode 100644 index 0000000000..88706a04fb --- /dev/null +++ b/wp-includes/blocks/avatar/editor-rtl.min.css @@ -0,0 +1 @@ +.wp-block-avatar__image img{width:100%}.wp-block-avatar.aligncenter .components-resizable-box__container{margin:0 auto} \ No newline at end of file diff --git a/wp-includes/blocks/avatar/editor.css b/wp-includes/blocks/avatar/editor.css new file mode 100644 index 0000000000..409423c802 --- /dev/null +++ b/wp-includes/blocks/avatar/editor.css @@ -0,0 +1,83 @@ +/** + * Colors + */ +/** + * Breakpoints & Media Queries + */ +/** + * SCSS Variables. + * + * Please use variables from this sheet to ensure consistency across the UI. + * Don't add to this sheet unless you're pretty sure the value will be reused in many places. + * For example, don't add rules to this sheet that affect block visuals. It's purely for UI. + */ +/** + * Colors + */ +/** + * Fonts & basic variables. + */ +/** + * Grid System. + * https://make.wordpress.org/design/2019/10/31/proposal-a-consistent-spacing-system-for-wordpress/ + */ +/** + * Dimensions. + */ +/** + * Shadows. + */ +/** + * Editor widths. + */ +/** + * Block & Editor UI. + */ +/** + * Block paddings. + */ +/** + * React Native specific. + * These variables do not appear to be used anywhere else. + */ +/** +* Converts a hex value into the rgb equivalent. +* +* @param {string} hex - the hexadecimal value to convert +* @return {string} comma separated rgb values +*/ +/** + * Breakpoint mixins + */ +/** + * Long content fade mixin + * + * Creates a fading overlay to signify that the content is longer + * than the space allows. + */ +/** + * Focus styles. + */ +/** + * Applies editor left position to the selector passed as argument + */ +/** + * Styles that are reused verbatim in a few places + */ +/** + * Allows users to opt-out of animations via OS-level preferences. + */ +/** + * Reset default styles for JavaScript UI based pages. + * This is a WP-admin agnostic reset + */ +/** + * Reset the WP Admin page styles for Gutenberg-like pages. + */ +.wp-block-avatar__image img { + width: 100%; +} + +.wp-block-avatar.aligncenter .components-resizable-box__container { + margin: 0 auto; +} \ No newline at end of file diff --git a/wp-includes/blocks/avatar/editor.min.css b/wp-includes/blocks/avatar/editor.min.css new file mode 100644 index 0000000000..88706a04fb --- /dev/null +++ b/wp-includes/blocks/avatar/editor.min.css @@ -0,0 +1 @@ +.wp-block-avatar__image img{width:100%}.wp-block-avatar.aligncenter .components-resizable-box__container{margin:0 auto} \ No newline at end of file diff --git a/wp-includes/blocks/avatar/style-rtl.css b/wp-includes/blocks/avatar/style-rtl.css new file mode 100644 index 0000000000..c84f379170 --- /dev/null +++ b/wp-includes/blocks/avatar/style-rtl.css @@ -0,0 +1,79 @@ +/** + * Colors + */ +/** + * Breakpoints & Media Queries + */ +/** + * SCSS Variables. + * + * Please use variables from this sheet to ensure consistency across the UI. + * Don't add to this sheet unless you're pretty sure the value will be reused in many places. + * For example, don't add rules to this sheet that affect block visuals. It's purely for UI. + */ +/** + * Colors + */ +/** + * Fonts & basic variables. + */ +/** + * Grid System. + * https://make.wordpress.org/design/2019/10/31/proposal-a-consistent-spacing-system-for-wordpress/ + */ +/** + * Dimensions. + */ +/** + * Shadows. + */ +/** + * Editor widths. + */ +/** + * Block & Editor UI. + */ +/** + * Block paddings. + */ +/** + * React Native specific. + * These variables do not appear to be used anywhere else. + */ +/** +* Converts a hex value into the rgb equivalent. +* +* @param {string} hex - the hexadecimal value to convert +* @return {string} comma separated rgb values +*/ +/** + * Breakpoint mixins + */ +/** + * Long content fade mixin + * + * Creates a fading overlay to signify that the content is longer + * than the space allows. + */ +/** + * Focus styles. + */ +/** + * Applies editor left position to the selector passed as argument + */ +/** + * Styles that are reused verbatim in a few places + */ +/** + * Allows users to opt-out of animations via OS-level preferences. + */ +/** + * Reset default styles for JavaScript UI based pages. + * This is a WP-admin agnostic reset + */ +/** + * Reset the WP Admin page styles for Gutenberg-like pages. + */ +.wp-block-avatar.aligncenter { + text-align: center; +} \ No newline at end of file diff --git a/wp-includes/blocks/avatar/style-rtl.min.css b/wp-includes/blocks/avatar/style-rtl.min.css new file mode 100644 index 0000000000..19d7f1d1a8 --- /dev/null +++ b/wp-includes/blocks/avatar/style-rtl.min.css @@ -0,0 +1 @@ +.wp-block-avatar.aligncenter{text-align:center} \ No newline at end of file diff --git a/wp-includes/blocks/avatar/style.css b/wp-includes/blocks/avatar/style.css new file mode 100644 index 0000000000..c84f379170 --- /dev/null +++ b/wp-includes/blocks/avatar/style.css @@ -0,0 +1,79 @@ +/** + * Colors + */ +/** + * Breakpoints & Media Queries + */ +/** + * SCSS Variables. + * + * Please use variables from this sheet to ensure consistency across the UI. + * Don't add to this sheet unless you're pretty sure the value will be reused in many places. + * For example, don't add rules to this sheet that affect block visuals. It's purely for UI. + */ +/** + * Colors + */ +/** + * Fonts & basic variables. + */ +/** + * Grid System. + * https://make.wordpress.org/design/2019/10/31/proposal-a-consistent-spacing-system-for-wordpress/ + */ +/** + * Dimensions. + */ +/** + * Shadows. + */ +/** + * Editor widths. + */ +/** + * Block & Editor UI. + */ +/** + * Block paddings. + */ +/** + * React Native specific. + * These variables do not appear to be used anywhere else. + */ +/** +* Converts a hex value into the rgb equivalent. +* +* @param {string} hex - the hexadecimal value to convert +* @return {string} comma separated rgb values +*/ +/** + * Breakpoint mixins + */ +/** + * Long content fade mixin + * + * Creates a fading overlay to signify that the content is longer + * than the space allows. + */ +/** + * Focus styles. + */ +/** + * Applies editor left position to the selector passed as argument + */ +/** + * Styles that are reused verbatim in a few places + */ +/** + * Allows users to opt-out of animations via OS-level preferences. + */ +/** + * Reset default styles for JavaScript UI based pages. + * This is a WP-admin agnostic reset + */ +/** + * Reset the WP Admin page styles for Gutenberg-like pages. + */ +.wp-block-avatar.aligncenter { + text-align: center; +} \ No newline at end of file diff --git a/wp-includes/blocks/avatar/style.min.css b/wp-includes/blocks/avatar/style.min.css new file mode 100644 index 0000000000..19d7f1d1a8 --- /dev/null +++ b/wp-includes/blocks/avatar/style.min.css @@ -0,0 +1 @@ +.wp-block-avatar.aligncenter{text-align:center} \ No newline at end of file diff --git a/wp-includes/blocks/block.php b/wp-includes/blocks/block.php index 8b0227f43c..2cfd672aa3 100644 --- a/wp-includes/blocks/block.php +++ b/wp-includes/blocks/block.php @@ -42,9 +42,14 @@ function render_block_core_block( $attributes ) { $seen_refs[ $attributes['ref'] ] = true; - $result = do_blocks( $reusable_block->post_content ); + // Handle embeds for reusable blocks. + global $wp_embed; + $content = $wp_embed->run_shortcode( $reusable_block->post_content ); + $content = $wp_embed->autoembed( $content ); + + $content = do_blocks( $content ); unset( $seen_refs[ $attributes['ref'] ] ); - return $result; + return $content; } /** diff --git a/wp-includes/blocks/block/block.json b/wp-includes/blocks/block/block.json index 006c85c0b5..8d850ef1c3 100644 --- a/wp-includes/blocks/block/block.json +++ b/wp-includes/blocks/block/block.json @@ -1,4 +1,5 @@ { + "$schema": "https://schemas.wp.org/trunk/block.json", "apiVersion": 2, "name": "core/block", "title": "Reusable block", diff --git a/wp-includes/blocks/button/block.json b/wp-includes/blocks/button/block.json index 99119b6d1d..d2360da96f 100644 --- a/wp-includes/blocks/button/block.json +++ b/wp-includes/blocks/button/block.json @@ -1,4 +1,5 @@ { + "$schema": "https://schemas.wp.org/trunk/block.json", "apiVersion": 2, "name": "core/button", "title": "Button", @@ -59,7 +60,11 @@ "alignWide": false, "color": { "__experimentalSkipSerialization": true, - "gradients": true + "gradients": true, + "__experimentalDefaultControls": { + "background": true, + "text": true + } }, "typography": { "fontSize": true, @@ -78,7 +83,10 @@ }, "__experimentalBorder": { "radius": true, - "__experimentalSkipSerialization": true + "__experimentalSkipSerialization": true, + "__experimentalDefaultControls": { + "radius": true + } }, "__experimentalSelector": ".wp-block-button__link" }, diff --git a/wp-includes/blocks/button/editor-rtl.css b/wp-includes/blocks/button/editor-rtl.css index 55f2dd34ec..b9cf404df8 100644 --- a/wp-includes/blocks/button/editor-rtl.css +++ b/wp-includes/blocks/button/editor-rtl.css @@ -88,9 +88,6 @@ position: relative; cursor: text; } -.wp-block-button:not(.has-text-color):not(.is-style-outline) [data-rich-text-placeholder]::after { - color: #fff; -} .wp-block-button:focus { box-shadow: 0 0 0 1px #fff, 0 0 0 3px var(--wp-admin-theme-color); outline: 2px solid transparent; diff --git a/wp-includes/blocks/button/editor-rtl.min.css b/wp-includes/blocks/button/editor-rtl.min.css index 36e23c30df..24843c5037 100644 --- a/wp-includes/blocks/button/editor-rtl.min.css +++ b/wp-includes/blocks/button/editor-rtl.min.css @@ -1 +1 @@ -.wp-block[data-align=center]>.wp-block-button{text-align:center;margin-right:auto;margin-left:auto}.wp-block[data-align=right]>.wp-block-button{text-align:right}.wp-block-button{position:relative;cursor:text}.wp-block-button:not(.has-text-color):not(.is-style-outline) [data-rich-text-placeholder]:after{color:#fff}.wp-block-button:focus{box-shadow:0 0 0 1px #fff,0 0 0 3px var(--wp-admin-theme-color);outline:2px solid transparent;outline-offset:-2px}.wp-block-button[data-rich-text-placeholder]:after{opacity:.8}.wp-block-button__inline-link{color:#757575;height:0;overflow:hidden;max-width:290px}.wp-block-button__inline-link-input__suggestions{max-width:290px}@media (min-width:782px){.wp-block-button__inline-link,.wp-block-button__inline-link-input__suggestions{max-width:260px}}@media (min-width:960px){.wp-block-button__inline-link,.wp-block-button__inline-link-input__suggestions{max-width:290px}}.is-selected .wp-block-button__inline-link{height:auto;overflow:visible}.wp-button-label__width .components-button-group{display:block}.wp-button-label__width .components-base-control__field{margin-bottom:12px}div[data-type="core/button"]{display:table} \ No newline at end of file +.wp-block[data-align=center]>.wp-block-button{text-align:center;margin-right:auto;margin-left:auto}.wp-block[data-align=right]>.wp-block-button{text-align:right}.wp-block-button{position:relative;cursor:text}.wp-block-button:focus{box-shadow:0 0 0 1px #fff,0 0 0 3px var(--wp-admin-theme-color);outline:2px solid transparent;outline-offset:-2px}.wp-block-button[data-rich-text-placeholder]:after{opacity:.8}.wp-block-button__inline-link{color:#757575;height:0;overflow:hidden;max-width:290px}.wp-block-button__inline-link-input__suggestions{max-width:290px}@media (min-width:782px){.wp-block-button__inline-link,.wp-block-button__inline-link-input__suggestions{max-width:260px}}@media (min-width:960px){.wp-block-button__inline-link,.wp-block-button__inline-link-input__suggestions{max-width:290px}}.is-selected .wp-block-button__inline-link{height:auto;overflow:visible}.wp-button-label__width .components-button-group{display:block}.wp-button-label__width .components-base-control__field{margin-bottom:12px}div[data-type="core/button"]{display:table} \ No newline at end of file diff --git a/wp-includes/blocks/button/editor.css b/wp-includes/blocks/button/editor.css index 17e7883430..a2f843595f 100644 --- a/wp-includes/blocks/button/editor.css +++ b/wp-includes/blocks/button/editor.css @@ -89,9 +89,6 @@ position: relative; cursor: text; } -.wp-block-button:not(.has-text-color):not(.is-style-outline) [data-rich-text-placeholder]::after { - color: #fff; -} .wp-block-button:focus { box-shadow: 0 0 0 1px #fff, 0 0 0 3px var(--wp-admin-theme-color); outline: 2px solid transparent; diff --git a/wp-includes/blocks/button/editor.min.css b/wp-includes/blocks/button/editor.min.css index a205c08549..6e4a816352 100644 --- a/wp-includes/blocks/button/editor.min.css +++ b/wp-includes/blocks/button/editor.min.css @@ -1,2 +1,2 @@ .wp-block[data-align=center]>.wp-block-button{text-align:center;margin-left:auto;margin-right:auto}.wp-block[data-align=right]>.wp-block-button{ - /*!rtl:ignore*/text-align:right}.wp-block-button{position:relative;cursor:text}.wp-block-button:not(.has-text-color):not(.is-style-outline) [data-rich-text-placeholder]:after{color:#fff}.wp-block-button:focus{box-shadow:0 0 0 1px #fff,0 0 0 3px var(--wp-admin-theme-color);outline:2px solid transparent;outline-offset:-2px}.wp-block-button[data-rich-text-placeholder]:after{opacity:.8}.wp-block-button__inline-link{color:#757575;height:0;overflow:hidden;max-width:290px}.wp-block-button__inline-link-input__suggestions{max-width:290px}@media (min-width:782px){.wp-block-button__inline-link,.wp-block-button__inline-link-input__suggestions{max-width:260px}}@media (min-width:960px){.wp-block-button__inline-link,.wp-block-button__inline-link-input__suggestions{max-width:290px}}.is-selected .wp-block-button__inline-link{height:auto;overflow:visible}.wp-button-label__width .components-button-group{display:block}.wp-button-label__width .components-base-control__field{margin-bottom:12px}div[data-type="core/button"]{display:table} \ No newline at end of file + /*!rtl:ignore*/text-align:right}.wp-block-button{position:relative;cursor:text}.wp-block-button:focus{box-shadow:0 0 0 1px #fff,0 0 0 3px var(--wp-admin-theme-color);outline:2px solid transparent;outline-offset:-2px}.wp-block-button[data-rich-text-placeholder]:after{opacity:.8}.wp-block-button__inline-link{color:#757575;height:0;overflow:hidden;max-width:290px}.wp-block-button__inline-link-input__suggestions{max-width:290px}@media (min-width:782px){.wp-block-button__inline-link,.wp-block-button__inline-link-input__suggestions{max-width:260px}}@media (min-width:960px){.wp-block-button__inline-link,.wp-block-button__inline-link-input__suggestions{max-width:290px}}.is-selected .wp-block-button__inline-link{height:auto;overflow:visible}.wp-button-label__width .components-button-group{display:block}.wp-button-label__width .components-base-control__field{margin-bottom:12px}div[data-type="core/button"]{display:table} \ No newline at end of file diff --git a/wp-includes/blocks/buttons/block.json b/wp-includes/blocks/buttons/block.json index 818d4d20e9..d72cb42689 100644 --- a/wp-includes/blocks/buttons/block.json +++ b/wp-includes/blocks/buttons/block.json @@ -1,4 +1,5 @@ { + "$schema": "https://schemas.wp.org/trunk/block.json", "apiVersion": 2, "name": "core/buttons", "title": "Buttons", @@ -12,7 +13,7 @@ "__experimentalExposeControlsToChildren": true, "spacing": { "blockGap": true, - "margin": ["top", "bottom" ], + "margin": [ "top", "bottom" ], "__experimentalDefaultControls": { "blockGap": true } diff --git a/wp-includes/blocks/calendar.php b/wp-includes/blocks/calendar.php index 3e0e48c65b..9225a6dceb 100644 --- a/wp-includes/blocks/calendar.php +++ b/wp-includes/blocks/calendar.php @@ -107,51 +107,47 @@ function block_core_calendar_update_has_published_posts() { return $has_published_posts; } -/** - * Handler for updating the has published posts flag when a post is deleted. - * - * @param int $post_id Deleted post ID. - */ -function block_core_calendar_update_has_published_post_on_delete( $post_id ) { - if ( is_multisite() ) { - return; +// We only want to register these functions and actions when +// we are on single sites. On multi sites we use `post_count` option. +if ( ! is_multisite() ) { + /** + * Handler for updating the has published posts flag when a post is deleted. + * + * @param int $post_id Deleted post ID. + */ + function block_core_calendar_update_has_published_post_on_delete( $post_id ) { + $post = get_post( $post_id ); + + if ( ! $post || 'publish' !== $post->post_status || 'post' !== $post->post_type ) { + return; + } + + block_core_calendar_update_has_published_posts(); } - $post = get_post( $post_id ); + /** + * Handler for updating the has published posts flag when a post status changes. + * + * @param string $new_status The status the post is changing to. + * @param string $old_status The status the post is changing from. + * @param WP_Post $post Post object. + */ + function block_core_calendar_update_has_published_post_on_transition_post_status( $new_status, $old_status, $post ) { + if ( $new_status === $old_status ) { + return; + } - if ( ! $post || 'publish' !== $post->post_status || 'post' !== $post->post_type ) { - return; + if ( 'post' !== get_post_type( $post ) ) { + return; + } + + if ( 'publish' !== $new_status && 'publish' !== $old_status ) { + return; + } + + block_core_calendar_update_has_published_posts(); } - block_core_calendar_update_has_published_posts(); + add_action( 'delete_post', 'block_core_calendar_update_has_published_post_on_delete' ); + add_action( 'transition_post_status', 'block_core_calendar_update_has_published_post_on_transition_post_status', 10, 3 ); } - -/** - * Handler for updating the has published posts flag when a post status changes. - * - * @param string $new_status The status the post is changing to. - * @param string $old_status The status the post is changing from. - * @param WP_Post $post Post object. - */ -function block_core_calendar_update_has_published_post_on_transition_post_status( $new_status, $old_status, $post ) { - if ( is_multisite() ) { - return; - } - - if ( $new_status === $old_status ) { - return; - } - - if ( 'post' !== get_post_type( $post ) ) { - return; - } - - if ( 'publish' !== $new_status && 'publish' !== $old_status ) { - return; - } - - block_core_calendar_update_has_published_posts(); -} - -add_action( 'delete_post', 'block_core_calendar_update_has_published_post_on_delete' ); -add_action( 'transition_post_status', 'block_core_calendar_update_has_published_post_on_transition_post_status', 10, 3 ); diff --git a/wp-includes/blocks/calendar/block.json b/wp-includes/blocks/calendar/block.json index 07938927f5..6f498ed585 100644 --- a/wp-includes/blocks/calendar/block.json +++ b/wp-includes/blocks/calendar/block.json @@ -1,4 +1,5 @@ { + "$schema": "https://schemas.wp.org/trunk/block.json", "apiVersion": 2, "name": "core/calendar", "title": "Calendar", diff --git a/wp-includes/blocks/categories.php b/wp-includes/blocks/categories.php index 5492712d51..37d58a1a7e 100644 --- a/wp-includes/blocks/categories.php +++ b/wp-includes/blocks/categories.php @@ -31,7 +31,7 @@ function render_block_core_categories( $attributes ) { $id = 'wp-block-categories-' . $block_id; $args['id'] = $id; $args['show_option_none'] = __( 'Select Category' ); - $wrapper_markup = '
%2$s
'; + $wrapper_markup = '
%2$s
'; $items_markup = wp_dropdown_categories( $args ); $type = 'dropdown'; diff --git a/wp-includes/blocks/categories/block.json b/wp-includes/blocks/categories/block.json index 448b27c9cc..fc5b449fc5 100644 --- a/wp-includes/blocks/categories/block.json +++ b/wp-includes/blocks/categories/block.json @@ -1,4 +1,5 @@ { + "$schema": "https://schemas.wp.org/trunk/block.json", "apiVersion": 2, "name": "core/categories", "title": "Categories", diff --git a/wp-includes/blocks/code/block.json b/wp-includes/blocks/code/block.json index 992058d12f..d41657196e 100644 --- a/wp-includes/blocks/code/block.json +++ b/wp-includes/blocks/code/block.json @@ -1,4 +1,5 @@ { + "$schema": "https://schemas.wp.org/trunk/block.json", "apiVersion": 2, "name": "core/code", "title": "Code", @@ -14,7 +15,6 @@ }, "supports": { "anchor": true, - "__experimentalSelector": ".wp-block-code > code", "typography": { "fontSize": true, "lineHeight": true, @@ -34,12 +34,20 @@ "radius": true, "color": true, "width": true, - "style": true + "style": true, + "__experimentalDefaultControls": { + "width": true, + "color": true + } }, "color": { "text": true, "background": true, - "gradients": true + "gradients": true, + "__experimentalDefaultControls": { + "background": true, + "text": true + } } }, "style": "wp-block-code" diff --git a/wp-includes/blocks/code/style-rtl.css b/wp-includes/blocks/code/style-rtl.css index 9128ee3213..1c8227aef3 100644 --- a/wp-includes/blocks/code/style-rtl.css +++ b/wp-includes/blocks/code/style-rtl.css @@ -76,6 +76,7 @@ */ .wp-block-code code { display: block; - white-space: pre-wrap; + font-family: inherit; overflow-wrap: break-word; + white-space: pre-wrap; } \ No newline at end of file diff --git a/wp-includes/blocks/code/style-rtl.min.css b/wp-includes/blocks/code/style-rtl.min.css index 245e182dd0..c86ccd275e 100644 --- a/wp-includes/blocks/code/style-rtl.min.css +++ b/wp-includes/blocks/code/style-rtl.min.css @@ -1 +1 @@ -.wp-block-code code{display:block;white-space:pre-wrap;overflow-wrap:break-word} \ No newline at end of file +.wp-block-code code{display:block;font-family:inherit;overflow-wrap:break-word;white-space:pre-wrap} \ No newline at end of file diff --git a/wp-includes/blocks/code/style.css b/wp-includes/blocks/code/style.css index 9128ee3213..1c8227aef3 100644 --- a/wp-includes/blocks/code/style.css +++ b/wp-includes/blocks/code/style.css @@ -76,6 +76,7 @@ */ .wp-block-code code { display: block; - white-space: pre-wrap; + font-family: inherit; overflow-wrap: break-word; + white-space: pre-wrap; } \ No newline at end of file diff --git a/wp-includes/blocks/code/style.min.css b/wp-includes/blocks/code/style.min.css index 245e182dd0..c86ccd275e 100644 --- a/wp-includes/blocks/code/style.min.css +++ b/wp-includes/blocks/code/style.min.css @@ -1 +1 @@ -.wp-block-code code{display:block;white-space:pre-wrap;overflow-wrap:break-word} \ No newline at end of file +.wp-block-code code{display:block;font-family:inherit;overflow-wrap:break-word;white-space:pre-wrap} \ No newline at end of file diff --git a/wp-includes/blocks/code/theme-rtl.css b/wp-includes/blocks/code/theme-rtl.css index f3eed23984..69af445da9 100644 --- a/wp-includes/blocks/code/theme-rtl.css +++ b/wp-includes/blocks/code/theme-rtl.css @@ -74,10 +74,9 @@ /** * Reset the WP Admin page styles for Gutenberg-like pages. */ -.wp-block-code > code { - font-family: Menlo, Consolas, monaco, monospace; - color: #1e1e1e; - padding: 0.8em 1em; - border: 1px solid #ddd; +.wp-block-code { + border: 1px solid #ccc; border-radius: 4px; + font-family: Menlo, Consolas, monaco, monospace; + padding: 0.8em 1em; } \ No newline at end of file diff --git a/wp-includes/blocks/code/theme-rtl.min.css b/wp-includes/blocks/code/theme-rtl.min.css index 44d0c7e46d..4d73f7012a 100644 --- a/wp-includes/blocks/code/theme-rtl.min.css +++ b/wp-includes/blocks/code/theme-rtl.min.css @@ -1 +1 @@ -.wp-block-code>code{font-family:Menlo,Consolas,monaco,monospace;color:#1e1e1e;padding:.8em 1em;border:1px solid #ddd;border-radius:4px} \ No newline at end of file +.wp-block-code{border:1px solid #ccc;border-radius:4px;font-family:Menlo,Consolas,monaco,monospace;padding:.8em 1em} \ No newline at end of file diff --git a/wp-includes/blocks/code/theme.css b/wp-includes/blocks/code/theme.css index f3eed23984..69af445da9 100644 --- a/wp-includes/blocks/code/theme.css +++ b/wp-includes/blocks/code/theme.css @@ -74,10 +74,9 @@ /** * Reset the WP Admin page styles for Gutenberg-like pages. */ -.wp-block-code > code { - font-family: Menlo, Consolas, monaco, monospace; - color: #1e1e1e; - padding: 0.8em 1em; - border: 1px solid #ddd; +.wp-block-code { + border: 1px solid #ccc; border-radius: 4px; + font-family: Menlo, Consolas, monaco, monospace; + padding: 0.8em 1em; } \ No newline at end of file diff --git a/wp-includes/blocks/code/theme.min.css b/wp-includes/blocks/code/theme.min.css index 44d0c7e46d..4d73f7012a 100644 --- a/wp-includes/blocks/code/theme.min.css +++ b/wp-includes/blocks/code/theme.min.css @@ -1 +1 @@ -.wp-block-code>code{font-family:Menlo,Consolas,monaco,monospace;color:#1e1e1e;padding:.8em 1em;border:1px solid #ddd;border-radius:4px} \ No newline at end of file +.wp-block-code{border:1px solid #ccc;border-radius:4px;font-family:Menlo,Consolas,monaco,monospace;padding:.8em 1em} \ No newline at end of file diff --git a/wp-includes/blocks/column/block.json b/wp-includes/blocks/column/block.json index 44ef3438b2..8aa305ef96 100644 --- a/wp-includes/blocks/column/block.json +++ b/wp-includes/blocks/column/block.json @@ -1,4 +1,5 @@ { + "$schema": "https://schemas.wp.org/trunk/block.json", "apiVersion": 2, "name": "core/column", "title": "Column", @@ -27,13 +28,19 @@ "html": false, "color": { "gradients": true, - "link": true + "link": true, + "__experimentalDefaultControls": { + "background": true, + "text": true + } }, "spacing": { + "blockGap": true, "padding": true, "__experimentalDefaultControls": { "padding": true } - } + }, + "__experimentalLayout": true } } diff --git a/wp-includes/blocks/columns/block.json b/wp-includes/blocks/columns/block.json index 38dc5db74e..77d5f7d745 100644 --- a/wp-includes/blocks/columns/block.json +++ b/wp-includes/blocks/columns/block.json @@ -1,4 +1,5 @@ { + "$schema": "https://schemas.wp.org/trunk/block.json", "apiVersion": 2, "name": "core/columns", "title": "Columns", @@ -20,14 +21,40 @@ "html": false, "color": { "gradients": true, - "link": true + "link": true, + "__experimentalDefaultControls": { + "background": true, + "text": true + } }, "spacing": { + "blockGap": true, "margin": [ "top", "bottom" ], "padding": true, "__experimentalDefaultControls": { "padding": true } + }, + "__experimentalLayout": { + "allowSwitching": false, + "allowInheriting": false, + "allowEditing": false, + "default": { + "type": "flex", + "flexWrap": "nowrap" + } + }, + "__experimentalBorder": { + "color": true, + "radius": true, + "style": true, + "width": true, + "__experimentalDefaultControls": { + "color": true, + "radius": true, + "style": true, + "width": true + } } }, "editorStyle": "wp-block-columns-editor", diff --git a/wp-includes/blocks/columns/editor-rtl.css b/wp-includes/blocks/columns/editor-rtl.css index e4529a3755..b17dd2d959 100644 --- a/wp-includes/blocks/columns/editor-rtl.css +++ b/wp-includes/blocks/columns/editor-rtl.css @@ -80,16 +80,6 @@ margin-left: 0; } -@media (min-width: 600px) { - .editor-styles-wrapper .block-editor-block-list__block.wp-block-column:nth-child(even) { - margin-right: var(--wp--style--block-gap, 2em); - } -} -@media (min-width: 782px) { - .editor-styles-wrapper .block-editor-block-list__block.wp-block-column:not(:first-child) { - margin-right: var(--wp--style--block-gap, 2em); - } -} html :where(.wp-block-column) { margin-top: 0; margin-bottom: 0; diff --git a/wp-includes/blocks/columns/editor-rtl.min.css b/wp-includes/blocks/columns/editor-rtl.min.css index 718c1952b0..81c11fbe27 100644 --- a/wp-includes/blocks/columns/editor-rtl.min.css +++ b/wp-includes/blocks/columns/editor-rtl.min.css @@ -1 +1 @@ -.wp-block-columns :where(.wp-block){max-width:none;margin-right:0;margin-left:0}@media (min-width:600px){.editor-styles-wrapper .block-editor-block-list__block.wp-block-column:nth-child(2n){margin-right:var(--wp--style--block-gap,2em)}}@media (min-width:782px){.editor-styles-wrapper .block-editor-block-list__block.wp-block-column:not(:first-child){margin-right:var(--wp--style--block-gap,2em)}}html :where(.wp-block-column){margin-top:0;margin-bottom:0} \ No newline at end of file +.wp-block-columns :where(.wp-block){max-width:none;margin-right:0;margin-left:0}html :where(.wp-block-column){margin-top:0;margin-bottom:0} \ No newline at end of file diff --git a/wp-includes/blocks/columns/editor.css b/wp-includes/blocks/columns/editor.css index 502f22ca61..33521af8e8 100644 --- a/wp-includes/blocks/columns/editor.css +++ b/wp-includes/blocks/columns/editor.css @@ -80,16 +80,6 @@ margin-right: 0; } -@media (min-width: 600px) { - .editor-styles-wrapper .block-editor-block-list__block.wp-block-column:nth-child(even) { - margin-left: var(--wp--style--block-gap, 2em); - } -} -@media (min-width: 782px) { - .editor-styles-wrapper .block-editor-block-list__block.wp-block-column:not(:first-child) { - margin-left: var(--wp--style--block-gap, 2em); - } -} html :where(.wp-block-column) { margin-top: 0; margin-bottom: 0; diff --git a/wp-includes/blocks/columns/editor.min.css b/wp-includes/blocks/columns/editor.min.css index 9ddccc90aa..1a51507a7d 100644 --- a/wp-includes/blocks/columns/editor.min.css +++ b/wp-includes/blocks/columns/editor.min.css @@ -1 +1 @@ -.wp-block-columns :where(.wp-block){max-width:none;margin-left:0;margin-right:0}@media (min-width:600px){.editor-styles-wrapper .block-editor-block-list__block.wp-block-column:nth-child(2n){margin-left:var(--wp--style--block-gap,2em)}}@media (min-width:782px){.editor-styles-wrapper .block-editor-block-list__block.wp-block-column:not(:first-child){margin-left:var(--wp--style--block-gap,2em)}}html :where(.wp-block-column){margin-top:0;margin-bottom:0} \ No newline at end of file +.wp-block-columns :where(.wp-block){max-width:none;margin-left:0;margin-right:0}html :where(.wp-block-column){margin-top:0;margin-bottom:0} \ No newline at end of file diff --git a/wp-includes/blocks/columns/style-rtl.css b/wp-includes/blocks/columns/style-rtl.css index 822772ae58..13864a74d1 100644 --- a/wp-includes/blocks/columns/style-rtl.css +++ b/wp-includes/blocks/columns/style-rtl.css @@ -78,19 +78,17 @@ display: flex; margin-bottom: 1.75em; box-sizing: border-box; - flex-wrap: wrap; + flex-wrap: wrap !important; + align-items: initial !important; /** * All Columns Alignment */ } @media (min-width: 782px) { .wp-block-columns { - flex-wrap: nowrap; + flex-wrap: nowrap !important; } } -.wp-block-columns:where(.has-background) { - padding: 1.25em 2.375em; -} .wp-block-columns.are-vertically-aligned-top { align-items: flex-start; } @@ -100,20 +98,11 @@ .wp-block-columns.are-vertically-aligned-bottom { align-items: flex-end; } -@media (max-width: 599px) { +@media (max-width: 781px) { .wp-block-columns:not(.is-not-stacked-on-mobile) > .wp-block-column { flex-basis: 100% !important; } } -@media (min-width: 600px) and (max-width: 781px) { - .wp-block-columns:not(.is-not-stacked-on-mobile) > .wp-block-column:not(:only-child) { - flex-basis: calc(50% - calc(var(--wp--style--block-gap, 2em) / 2)) !important; - flex-grow: 0; - } - .wp-block-columns:not(.is-not-stacked-on-mobile) > .wp-block-column:nth-child(even) { - margin-right: var(--wp--style--block-gap, 2em); - } -} @media (min-width: 782px) { .wp-block-columns:not(.is-not-stacked-on-mobile) > .wp-block-column { flex-basis: 0; @@ -122,12 +111,9 @@ .wp-block-columns:not(.is-not-stacked-on-mobile) > .wp-block-column[style*=flex-basis] { flex-grow: 0; } - .wp-block-columns:not(.is-not-stacked-on-mobile) > .wp-block-column:not(:first-child) { - margin-right: var(--wp--style--block-gap, 2em); - } } .wp-block-columns.is-not-stacked-on-mobile { - flex-wrap: nowrap; + flex-wrap: nowrap !important; } .wp-block-columns.is-not-stacked-on-mobile > .wp-block-column { flex-basis: 0; @@ -136,8 +122,9 @@ .wp-block-columns.is-not-stacked-on-mobile > .wp-block-column[style*=flex-basis] { flex-grow: 0; } -.wp-block-columns.is-not-stacked-on-mobile > .wp-block-column:not(:first-child) { - margin-right: var(--wp--style--block-gap, 2em); + +:where(.wp-block-columns.has-background) { + padding: 1.25em 2.375em; } .wp-block-column { diff --git a/wp-includes/blocks/columns/style-rtl.min.css b/wp-includes/blocks/columns/style-rtl.min.css index 6d6c84e054..e45647c75d 100644 --- a/wp-includes/blocks/columns/style-rtl.min.css +++ b/wp-includes/blocks/columns/style-rtl.min.css @@ -1 +1 @@ -.wp-block-columns{display:flex;margin-bottom:1.75em;box-sizing:border-box;flex-wrap:wrap}@media (min-width:782px){.wp-block-columns{flex-wrap:nowrap}}.wp-block-columns:where(.has-background){padding:1.25em 2.375em}.wp-block-columns.are-vertically-aligned-top{align-items:flex-start}.wp-block-columns.are-vertically-aligned-center{align-items:center}.wp-block-columns.are-vertically-aligned-bottom{align-items:flex-end}@media (max-width:599px){.wp-block-columns:not(.is-not-stacked-on-mobile)>.wp-block-column{flex-basis:100%!important}}@media (min-width:600px) and (max-width:781px){.wp-block-columns:not(.is-not-stacked-on-mobile)>.wp-block-column:not(:only-child){flex-basis:calc(50% - var(--wp--style--block-gap, 2em)/2)!important;flex-grow:0}.wp-block-columns:not(.is-not-stacked-on-mobile)>.wp-block-column:nth-child(2n){margin-right:var(--wp--style--block-gap,2em)}}@media (min-width:782px){.wp-block-columns:not(.is-not-stacked-on-mobile)>.wp-block-column{flex-basis:0;flex-grow:1}.wp-block-columns:not(.is-not-stacked-on-mobile)>.wp-block-column[style*=flex-basis]{flex-grow:0}.wp-block-columns:not(.is-not-stacked-on-mobile)>.wp-block-column:not(:first-child){margin-right:var(--wp--style--block-gap,2em)}}.wp-block-columns.is-not-stacked-on-mobile{flex-wrap:nowrap}.wp-block-columns.is-not-stacked-on-mobile>.wp-block-column{flex-basis:0;flex-grow:1}.wp-block-columns.is-not-stacked-on-mobile>.wp-block-column[style*=flex-basis]{flex-grow:0}.wp-block-columns.is-not-stacked-on-mobile>.wp-block-column:not(:first-child){margin-right:var(--wp--style--block-gap,2em)}.wp-block-column{flex-grow:1;min-width:0;word-break:break-word;overflow-wrap:break-word}.wp-block-column.is-vertically-aligned-top{align-self:flex-start}.wp-block-column.is-vertically-aligned-center{align-self:center}.wp-block-column.is-vertically-aligned-bottom{align-self:flex-end}.wp-block-column.is-vertically-aligned-bottom,.wp-block-column.is-vertically-aligned-center,.wp-block-column.is-vertically-aligned-top{width:100%} \ No newline at end of file +.wp-block-columns{display:flex;margin-bottom:1.75em;box-sizing:border-box;flex-wrap:wrap!important;align-items:normal!important}@media (min-width:782px){.wp-block-columns{flex-wrap:nowrap!important}}.wp-block-columns.are-vertically-aligned-top{align-items:flex-start}.wp-block-columns.are-vertically-aligned-center{align-items:center}.wp-block-columns.are-vertically-aligned-bottom{align-items:flex-end}@media (max-width:781px){.wp-block-columns:not(.is-not-stacked-on-mobile)>.wp-block-column{flex-basis:100%!important}}@media (min-width:782px){.wp-block-columns:not(.is-not-stacked-on-mobile)>.wp-block-column{flex-basis:0;flex-grow:1}.wp-block-columns:not(.is-not-stacked-on-mobile)>.wp-block-column[style*=flex-basis]{flex-grow:0}}.wp-block-columns.is-not-stacked-on-mobile{flex-wrap:nowrap!important}.wp-block-columns.is-not-stacked-on-mobile>.wp-block-column{flex-basis:0;flex-grow:1}.wp-block-columns.is-not-stacked-on-mobile>.wp-block-column[style*=flex-basis]{flex-grow:0}:where(.wp-block-columns.has-background){padding:1.25em 2.375em}.wp-block-column{flex-grow:1;min-width:0;word-break:break-word;overflow-wrap:break-word}.wp-block-column.is-vertically-aligned-top{align-self:flex-start}.wp-block-column.is-vertically-aligned-center{align-self:center}.wp-block-column.is-vertically-aligned-bottom{align-self:flex-end}.wp-block-column.is-vertically-aligned-bottom,.wp-block-column.is-vertically-aligned-center,.wp-block-column.is-vertically-aligned-top{width:100%} \ No newline at end of file diff --git a/wp-includes/blocks/columns/style.css b/wp-includes/blocks/columns/style.css index ed8bc5f0db..13864a74d1 100644 --- a/wp-includes/blocks/columns/style.css +++ b/wp-includes/blocks/columns/style.css @@ -78,19 +78,17 @@ display: flex; margin-bottom: 1.75em; box-sizing: border-box; - flex-wrap: wrap; + flex-wrap: wrap !important; + align-items: initial !important; /** * All Columns Alignment */ } @media (min-width: 782px) { .wp-block-columns { - flex-wrap: nowrap; + flex-wrap: nowrap !important; } } -.wp-block-columns:where(.has-background) { - padding: 1.25em 2.375em; -} .wp-block-columns.are-vertically-aligned-top { align-items: flex-start; } @@ -100,20 +98,11 @@ .wp-block-columns.are-vertically-aligned-bottom { align-items: flex-end; } -@media (max-width: 599px) { +@media (max-width: 781px) { .wp-block-columns:not(.is-not-stacked-on-mobile) > .wp-block-column { flex-basis: 100% !important; } } -@media (min-width: 600px) and (max-width: 781px) { - .wp-block-columns:not(.is-not-stacked-on-mobile) > .wp-block-column:not(:only-child) { - flex-basis: calc(50% - calc(var(--wp--style--block-gap, 2em) / 2)) !important; - flex-grow: 0; - } - .wp-block-columns:not(.is-not-stacked-on-mobile) > .wp-block-column:nth-child(even) { - margin-left: var(--wp--style--block-gap, 2em); - } -} @media (min-width: 782px) { .wp-block-columns:not(.is-not-stacked-on-mobile) > .wp-block-column { flex-basis: 0; @@ -122,12 +111,9 @@ .wp-block-columns:not(.is-not-stacked-on-mobile) > .wp-block-column[style*=flex-basis] { flex-grow: 0; } - .wp-block-columns:not(.is-not-stacked-on-mobile) > .wp-block-column:not(:first-child) { - margin-left: var(--wp--style--block-gap, 2em); - } } .wp-block-columns.is-not-stacked-on-mobile { - flex-wrap: nowrap; + flex-wrap: nowrap !important; } .wp-block-columns.is-not-stacked-on-mobile > .wp-block-column { flex-basis: 0; @@ -136,8 +122,9 @@ .wp-block-columns.is-not-stacked-on-mobile > .wp-block-column[style*=flex-basis] { flex-grow: 0; } -.wp-block-columns.is-not-stacked-on-mobile > .wp-block-column:not(:first-child) { - margin-left: var(--wp--style--block-gap, 2em); + +:where(.wp-block-columns.has-background) { + padding: 1.25em 2.375em; } .wp-block-column { diff --git a/wp-includes/blocks/columns/style.min.css b/wp-includes/blocks/columns/style.min.css index 45a1952a49..e45647c75d 100644 --- a/wp-includes/blocks/columns/style.min.css +++ b/wp-includes/blocks/columns/style.min.css @@ -1 +1 @@ -.wp-block-columns{display:flex;margin-bottom:1.75em;box-sizing:border-box;flex-wrap:wrap}@media (min-width:782px){.wp-block-columns{flex-wrap:nowrap}}.wp-block-columns:where(.has-background){padding:1.25em 2.375em}.wp-block-columns.are-vertically-aligned-top{align-items:flex-start}.wp-block-columns.are-vertically-aligned-center{align-items:center}.wp-block-columns.are-vertically-aligned-bottom{align-items:flex-end}@media (max-width:599px){.wp-block-columns:not(.is-not-stacked-on-mobile)>.wp-block-column{flex-basis:100%!important}}@media (min-width:600px) and (max-width:781px){.wp-block-columns:not(.is-not-stacked-on-mobile)>.wp-block-column:not(:only-child){flex-basis:calc(50% - var(--wp--style--block-gap, 2em)/2)!important;flex-grow:0}.wp-block-columns:not(.is-not-stacked-on-mobile)>.wp-block-column:nth-child(2n){margin-left:var(--wp--style--block-gap,2em)}}@media (min-width:782px){.wp-block-columns:not(.is-not-stacked-on-mobile)>.wp-block-column{flex-basis:0;flex-grow:1}.wp-block-columns:not(.is-not-stacked-on-mobile)>.wp-block-column[style*=flex-basis]{flex-grow:0}.wp-block-columns:not(.is-not-stacked-on-mobile)>.wp-block-column:not(:first-child){margin-left:var(--wp--style--block-gap,2em)}}.wp-block-columns.is-not-stacked-on-mobile{flex-wrap:nowrap}.wp-block-columns.is-not-stacked-on-mobile>.wp-block-column{flex-basis:0;flex-grow:1}.wp-block-columns.is-not-stacked-on-mobile>.wp-block-column[style*=flex-basis]{flex-grow:0}.wp-block-columns.is-not-stacked-on-mobile>.wp-block-column:not(:first-child){margin-left:var(--wp--style--block-gap,2em)}.wp-block-column{flex-grow:1;min-width:0;word-break:break-word;overflow-wrap:break-word}.wp-block-column.is-vertically-aligned-top{align-self:flex-start}.wp-block-column.is-vertically-aligned-center{align-self:center}.wp-block-column.is-vertically-aligned-bottom{align-self:flex-end}.wp-block-column.is-vertically-aligned-bottom,.wp-block-column.is-vertically-aligned-center,.wp-block-column.is-vertically-aligned-top{width:100%} \ No newline at end of file +.wp-block-columns{display:flex;margin-bottom:1.75em;box-sizing:border-box;flex-wrap:wrap!important;align-items:normal!important}@media (min-width:782px){.wp-block-columns{flex-wrap:nowrap!important}}.wp-block-columns.are-vertically-aligned-top{align-items:flex-start}.wp-block-columns.are-vertically-aligned-center{align-items:center}.wp-block-columns.are-vertically-aligned-bottom{align-items:flex-end}@media (max-width:781px){.wp-block-columns:not(.is-not-stacked-on-mobile)>.wp-block-column{flex-basis:100%!important}}@media (min-width:782px){.wp-block-columns:not(.is-not-stacked-on-mobile)>.wp-block-column{flex-basis:0;flex-grow:1}.wp-block-columns:not(.is-not-stacked-on-mobile)>.wp-block-column[style*=flex-basis]{flex-grow:0}}.wp-block-columns.is-not-stacked-on-mobile{flex-wrap:nowrap!important}.wp-block-columns.is-not-stacked-on-mobile>.wp-block-column{flex-basis:0;flex-grow:1}.wp-block-columns.is-not-stacked-on-mobile>.wp-block-column[style*=flex-basis]{flex-grow:0}:where(.wp-block-columns.has-background){padding:1.25em 2.375em}.wp-block-column{flex-grow:1;min-width:0;word-break:break-word;overflow-wrap:break-word}.wp-block-column.is-vertically-aligned-top{align-self:flex-start}.wp-block-column.is-vertically-aligned-center{align-self:center}.wp-block-column.is-vertically-aligned-bottom{align-self:flex-end}.wp-block-column.is-vertically-aligned-bottom,.wp-block-column.is-vertically-aligned-center,.wp-block-column.is-vertically-aligned-top{width:100%} \ No newline at end of file diff --git a/wp-includes/blocks/comment-author-name.php b/wp-includes/blocks/comment-author-name.php new file mode 100644 index 0000000000..0bf3a475ba --- /dev/null +++ b/wp-includes/blocks/comment-author-name.php @@ -0,0 +1,60 @@ +context['commentId'] ) ) { + return ''; + } + + $comment = get_comment( $block->context['commentId'] ); + if ( empty( $comment ) ) { + return ''; + } + + $classes = ''; + if ( isset( $attributes['textAlign'] ) ) { + $classes .= 'has-text-align-' . esc_attr( $attributes['textAlign'] ); + } + if ( isset( $attributes['fontSize'] ) ) { + $classes .= 'has-' . esc_attr( $attributes['fontSize'] ) . '-font-size'; + } + + $wrapper_attributes = get_block_wrapper_attributes( array( 'class' => $classes ) ); + $comment_author = get_comment_author( $comment ); + $link = get_comment_author_url( $comment ); + + if ( ! empty( $attributes['isLink'] ) && ! empty( $attributes['linkTarget'] ) ) { + $comment_author = sprintf( '%3s', esc_url( $link ), esc_attr( $attributes['linkTarget'] ), $comment_author ); + } + + return sprintf( + '
%2$s
', + $wrapper_attributes, + $comment_author + ); +} + +/** + * Registers the `core/comment-author-name` block on the server. + */ +function register_block_core_comment_author_name() { + register_block_type_from_metadata( + __DIR__ . '/comment-author-name', + array( + 'render_callback' => 'render_block_core_comment_author_name', + ) + ); +} +add_action( 'init', 'register_block_core_comment_author_name' ); diff --git a/wp-includes/blocks/comment-author-name/block.json b/wp-includes/blocks/comment-author-name/block.json new file mode 100644 index 0000000000..e7a07e5ddb --- /dev/null +++ b/wp-includes/blocks/comment-author-name/block.json @@ -0,0 +1,53 @@ +{ + "$schema": "https://schemas.wp.org/trunk/block.json", + "apiVersion": 2, + "name": "core/comment-author-name", + "title": "Comment Author Name", + "category": "theme", + "ancestor": [ "core/comment-template" ], + "description": "Displays the name of the author of the comment.", + "textdomain": "default", + "attributes": { + "isLink": { + "type": "boolean", + "default": true + }, + "linkTarget": { + "type": "string", + "default": "_self" + }, + "textAlign": { + "type": "string" + }, + "fontSize": { + "type": "string", + "default": "small" + } + }, + "usesContext": [ "commentId" ], + "supports": { + "html": false, + "spacing": { + "margin": true, + "padding": true + }, + "color": { + "gradients": true, + "link": true, + "__experimentalDefaultControls": { + "background": true, + "text": true, + "link": true + } + }, + "typography": { + "fontSize": true, + "lineHeight": true, + "__experimentalFontFamily": true, + "__experimentalFontWeight": true, + "__experimentalFontStyle": true, + "__experimentalTextTransform": true, + "__experimentalLetterSpacing": true + } + } +} diff --git a/wp-includes/blocks/comment-content.php b/wp-includes/blocks/comment-content.php new file mode 100644 index 0000000000..c0b524be8c --- /dev/null +++ b/wp-includes/blocks/comment-content.php @@ -0,0 +1,56 @@ +context['commentId'] ) ) { + return ''; + } + + $comment = get_comment( $block->context['commentId'] ); + if ( empty( $comment ) ) { + return ''; + } + + $comment_text = get_comment_text( $comment ); + if ( ! $comment_text ) { + return ''; + } + + $classes = ''; + if ( isset( $attributes['textAlign'] ) ) { + $classes .= 'has-text-align-' . $attributes['textAlign']; + } + + $wrapper_attributes = get_block_wrapper_attributes( array( 'class' => $classes ) ); + + return sprintf( + '
%2$s
', + $wrapper_attributes, + $comment_text + ); +} + +/** + * Registers the `core/comment-content` block on the server. + */ +function register_block_core_comment_content() { + register_block_type_from_metadata( + __DIR__ . '/comment-content', + array( + 'render_callback' => 'render_block_core_comment_content', + ) + ); +} +add_action( 'init', 'register_block_core_comment_content' ); diff --git a/wp-includes/blocks/comment-content/block.json b/wp-includes/blocks/comment-content/block.json new file mode 100644 index 0000000000..5979511eba --- /dev/null +++ b/wp-includes/blocks/comment-content/block.json @@ -0,0 +1,42 @@ +{ + "$schema": "https://schemas.wp.org/trunk/block.json", + "apiVersion": 2, + "name": "core/comment-content", + "title": "Comment Content", + "category": "theme", + "ancestor": [ "core/comment-template" ], + "description": "Displays the contents of a comment.", + "textdomain": "default", + "usesContext": [ "commentId" ], + "attributes": { + "textAlign": { + "type": "string" + } + }, + "supports": { + "color": { + "gradients": true, + "link": true, + "__experimentalDefaultControls": { + "background": true, + "text": true + } + }, + "typography": { + "fontSize": true, + "lineHeight": true, + "__experimentalFontFamily": true, + "__experimentalFontWeight": true, + "__experimentalFontStyle": true, + "__experimentalTextTransform": true, + "__experimentalLetterSpacing": true + }, + "spacing": { + "padding": [ "horizontal", "vertical" ], + "__experimentalDefaultControls": { + "padding": true + } + }, + "html": false + } +} diff --git a/wp-includes/blocks/comment-date.php b/wp-includes/blocks/comment-date.php new file mode 100644 index 0000000000..ddddd57f81 --- /dev/null +++ b/wp-includes/blocks/comment-date.php @@ -0,0 +1,61 @@ +context['commentId'] ) ) { + return ''; + } + + $comment = get_comment( $block->context['commentId'] ); + if ( empty( $comment ) ) { + return ''; + } + + $classes = ''; + if ( isset( $attributes['fontSize'] ) ) { + $classes .= 'has-' . esc_attr( $attributes['fontSize'] ) . '-font-size'; + } + + $wrapper_attributes = get_block_wrapper_attributes( array( 'class' => $classes ) ); + $formatted_date = get_comment_date( + isset( $attributes['format'] ) ? $attributes['format'] : '', + $comment + ); + $link = get_comment_link( $comment ); + + if ( ! empty( $attributes['isLink'] ) ) { + $formatted_date = sprintf( '%2s', esc_url( $link ), $formatted_date ); + } + + return sprintf( + '
', + $wrapper_attributes, + esc_attr( get_comment_date( 'c', $comment ) ), + $formatted_date + ); +} + +/** + * Registers the `core/comment-date` block on the server. + */ +function register_block_core_comment_date() { + register_block_type_from_metadata( + __DIR__ . '/comment-date', + array( + 'render_callback' => 'render_block_core_comment_date', + ) + ); +} +add_action( 'init', 'register_block_core_comment_date' ); diff --git a/wp-includes/blocks/comment-date/block.json b/wp-includes/blocks/comment-date/block.json new file mode 100644 index 0000000000..9af63f281a --- /dev/null +++ b/wp-includes/blocks/comment-date/block.json @@ -0,0 +1,48 @@ +{ + "$schema": "https://schemas.wp.org/trunk/block.json", + "apiVersion": 2, + "name": "core/comment-date", + "title": "Comment Date", + "category": "theme", + "ancestor": [ "core/comment-template" ], + "description": "Displays the date on which the comment was posted.", + "textdomain": "default", + "attributes": { + "format": { + "type": "string" + }, + "isLink": { + "type": "boolean", + "default": true + }, + "fontSize": { + "type": "string", + "default": "small" + } + }, + "usesContext": [ "commentId" ], + "supports": { + "html": false, + "color": { + "gradients": true, + "link": true, + "__experimentalDefaultControls": { + "background": true, + "text": true, + "link": true + } + }, + "typography": { + "fontSize": true, + "lineHeight": true, + "__experimentalFontFamily": true, + "__experimentalFontWeight": true, + "__experimentalFontStyle": true, + "__experimentalTextTransform": true, + "__experimentalLetterSpacing": true, + "__experimentalDefaultControls": { + "fontSize": true + } + } + } +} diff --git a/wp-includes/blocks/comment-edit-link.php b/wp-includes/blocks/comment-edit-link.php new file mode 100644 index 0000000000..43e5d2482f --- /dev/null +++ b/wp-includes/blocks/comment-edit-link.php @@ -0,0 +1,61 @@ +context['commentId'] ) || ! current_user_can( 'edit_comment', $block->context['commentId'] ) ) { + return ''; + } + + $edit_comment_link = get_edit_comment_link( $block->context['commentId'] ); + + $link_atts = ''; + + if ( ! empty( $attributes['linkTarget'] ) ) { + $link_atts .= sprintf( 'target="%s"', esc_attr( $attributes['linkTarget'] ) ); + } + + $classes = ''; + if ( isset( $attributes['textAlign'] ) ) { + $classes .= 'has-text-align-' . esc_attr( $attributes['textAlign'] ); + } + if ( isset( $attributes['fontSize'] ) ) { + $classes .= 'has-' . esc_attr( $attributes['fontSize'] ) . '-font-size'; + } + + $wrapper_attributes = get_block_wrapper_attributes( array( 'class' => $classes ) ); + + return sprintf( + '
%4$s
', + $wrapper_attributes, + esc_url( $edit_comment_link ), + $link_atts, + esc_html__( 'Edit' ) + ); +} + +/** + * Registers the `core/comment-edit-link` block on the server. + */ +function register_block_core_comment_edit_link() { + register_block_type_from_metadata( + __DIR__ . '/comment-edit-link', + array( + 'render_callback' => 'render_block_core_comment_edit_link', + ) + ); +} + +add_action( 'init', 'register_block_core_comment_edit_link' ); diff --git a/wp-includes/blocks/comment-edit-link/block.json b/wp-includes/blocks/comment-edit-link/block.json new file mode 100644 index 0000000000..16fe2ca109 --- /dev/null +++ b/wp-includes/blocks/comment-edit-link/block.json @@ -0,0 +1,45 @@ +{ + "$schema": "https://schemas.wp.org/trunk/block.json", + "apiVersion": 2, + "name": "core/comment-edit-link", + "title": "Comment Edit Link", + "category": "theme", + "ancestor": [ "core/comment-template" ], + "description": "Displays a link to edit the comment in the WordPress Dashboard. This link is only visible to users with the edit comment capability.", + "textdomain": "default", + "usesContext": [ "commentId" ], + "attributes": { + "linkTarget": { + "type": "string", + "default": "_self" + }, + "textAlign": { + "type": "string" + }, + "fontSize": { + "type": "string", + "default": "small" + } + }, + "supports": { + "html": false, + "color": { + "link": true, + "gradients": true, + "text": false, + "__experimentalDefaultControls": { + "background": true, + "link": true + } + }, + "typography": { + "fontSize": true, + "lineHeight": true, + "__experimentalFontFamily": true, + "__experimentalFontWeight": true, + "__experimentalFontStyle": true, + "__experimentalTextTransform": true, + "__experimentalLetterSpacing": true + } + } +} diff --git a/wp-includes/blocks/comment-reply-link.php b/wp-includes/blocks/comment-reply-link.php new file mode 100644 index 0000000000..7ffb97af1b --- /dev/null +++ b/wp-includes/blocks/comment-reply-link.php @@ -0,0 +1,83 @@ +context['commentId'] ) ) { + return ''; + } + + $thread_comments = get_option( 'thread_comments' ); + if ( ! $thread_comments ) { + return ''; + } + + $comment = get_comment( $block->context['commentId'] ); + if ( empty( $comment ) ) { + return ''; + } + + $depth = 1; + $max_depth = get_option( 'thread_comments_depth' ); + $parent_id = $comment->comment_parent; + + // Compute comment's depth iterating over its ancestors. + while ( ! empty( $parent_id ) ) { + $depth++; + $parent_id = get_comment( $parent_id )->comment_parent; + } + + $comment_reply_link = get_comment_reply_link( + array( + 'depth' => $depth, + 'max_depth' => $max_depth, + ), + $comment + ); + + // Render nothing if the generated reply link is empty. + if ( empty( $comment_reply_link ) ) { + return; + } + + $classes = ''; + if ( isset( $attributes['textAlign'] ) ) { + $classes .= 'has-text-align-' . esc_attr( $attributes['textAlign'] ); + } + if ( isset( $attributes['fontSize'] ) ) { + $classes .= 'has-' . esc_attr( $attributes['fontSize'] ) . '-font-size'; + } + + $wrapper_attributes = get_block_wrapper_attributes( array( 'class' => $classes ) ); + + return sprintf( + '
%2$s
', + $wrapper_attributes, + $comment_reply_link + ); +} + +/** + * Registers the `core/comment-reply-link` block on the server. + */ +function register_block_core_comment_reply_link() { + register_block_type_from_metadata( + __DIR__ . '/comment-reply-link', + array( + 'render_callback' => 'render_block_core_comment_reply_link', + ) + ); +} + +add_action( 'init', 'register_block_core_comment_reply_link' ); diff --git a/wp-includes/blocks/comment-reply-link/block.json b/wp-includes/blocks/comment-reply-link/block.json new file mode 100644 index 0000000000..a217511da5 --- /dev/null +++ b/wp-includes/blocks/comment-reply-link/block.json @@ -0,0 +1,41 @@ +{ + "$schema": "https://schemas.wp.org/trunk/block.json", + "apiVersion": 2, + "name": "core/comment-reply-link", + "title": "Comment Reply Link", + "category": "theme", + "ancestor": [ "core/comment-template" ], + "description": "Displays a link to reply to a comment.", + "textdomain": "default", + "usesContext": [ "commentId" ], + "attributes": { + "textAlign": { + "type": "string" + }, + "fontSize": { + "type": "string", + "default": "small" + } + }, + "supports": { + "color": { + "gradients": true, + "link": true, + "text": false, + "__experimentalDefaultControls": { + "background": true, + "link": true + } + }, + "typography": { + "fontSize": true, + "lineHeight": true, + "__experimentalFontFamily": true, + "__experimentalFontWeight": true, + "__experimentalFontStyle": true, + "__experimentalTextTransform": true, + "__experimentalLetterSpacing": true + }, + "html": false + } +} diff --git a/wp-includes/blocks/comment-template.php b/wp-includes/blocks/comment-template.php new file mode 100644 index 0000000000..250eee6c43 --- /dev/null +++ b/wp-includes/blocks/comment-template.php @@ -0,0 +1,98 @@ +parsed_block, + array( + 'commentId' => $comment->comment_ID, + ) + ) )->render( array( 'dynamic' => false ) ); + + $children = $comment->get_children(); + + // If the comment has children, recurse to create the HTML for the nested + // comments. + if ( ! empty( $children ) ) { + $inner_content = block_core_comment_template_render_comments( + $children, + $block + ); + $block_content .= sprintf( '
    %1$s
', $inner_content ); + } + + $content .= '
  • ' . $block_content . '
    • '; + } + + return $content; + +} + +/** + * Renders the `core/comment-template` block on the server. + * + * @param array $attributes Block attributes. + * @param string $content Block default content. + * @param WP_Block $block Block instance. + * + * @return string Returns the HTML representing the comments using the layout + * defined by the block's inner blocks. + */ +function render_block_core_comment_template( $attributes, $content, $block ) { + // Bail out early if the post ID is not set for some reason. + if ( empty( $block->context['postId'] ) ) { + return ''; + } + + $comment_query = new WP_Comment_Query( + build_comment_query_vars_from_block( $block ) + ); + + // Get an array of comments for the current post. + $comments = $comment_query->get_comments(); + if ( count( $comments ) === 0 ) { + return ''; + } + + $comment_order = get_option( 'comment_order' ); + + if ( 'desc' === $comment_order ) { + $comments = array_reverse( $comments ); + } + + $wrapper_attributes = get_block_wrapper_attributes(); + + return sprintf( + '
      %2$s
    ', + $wrapper_attributes, + block_core_comment_template_render_comments( $comments, $block ) + ); +} + +/** + * Registers the `core/comment-template` block on the server. + */ +function register_block_core_comment_template() { + register_block_type_from_metadata( + __DIR__ . '/comment-template', + array( + 'render_callback' => 'render_block_core_comment_template', + 'skip_inner_blocks' => true, + ) + ); +} +add_action( 'init', 'register_block_core_comment_template' ); diff --git a/wp-includes/blocks/comment-template/block.json b/wp-includes/blocks/comment-template/block.json new file mode 100644 index 0000000000..03b2990968 --- /dev/null +++ b/wp-includes/blocks/comment-template/block.json @@ -0,0 +1,17 @@ +{ + "$schema": "https://schemas.wp.org/trunk/block.json", + "apiVersion": 2, + "name": "core/comment-template", + "title": "Comment Template", + "category": "design", + "parent": [ "core/comments-query-loop" ], + "description": "Contains the block elements used to display a comment, like the title, date, author, avatar and more.", + "textdomain": "default", + "usesContext": [ "postId" ], + "supports": { + "reusable": false, + "html": false, + "align": true + }, + "style": "wp-block-comment-template" +} diff --git a/wp-includes/blocks/comment-template/style-rtl.css b/wp-includes/blocks/comment-template/style-rtl.css new file mode 100644 index 0000000000..e3110703e6 --- /dev/null +++ b/wp-includes/blocks/comment-template/style-rtl.css @@ -0,0 +1,91 @@ +/** + * Colors + */ +/** + * Breakpoints & Media Queries + */ +/** + * SCSS Variables. + * + * Please use variables from this sheet to ensure consistency across the UI. + * Don't add to this sheet unless you're pretty sure the value will be reused in many places. + * For example, don't add rules to this sheet that affect block visuals. It's purely for UI. + */ +/** + * Colors + */ +/** + * Fonts & basic variables. + */ +/** + * Grid System. + * https://make.wordpress.org/design/2019/10/31/proposal-a-consistent-spacing-system-for-wordpress/ + */ +/** + * Dimensions. + */ +/** + * Shadows. + */ +/** + * Editor widths. + */ +/** + * Block & Editor UI. + */ +/** + * Block paddings. + */ +/** + * React Native specific. + * These variables do not appear to be used anywhere else. + */ +/** +* Converts a hex value into the rgb equivalent. +* +* @param {string} hex - the hexadecimal value to convert +* @return {string} comma separated rgb values +*/ +/** + * Breakpoint mixins + */ +/** + * Long content fade mixin + * + * Creates a fading overlay to signify that the content is longer + * than the space allows. + */ +/** + * Focus styles. + */ +/** + * Applies editor left position to the selector passed as argument + */ +/** + * Styles that are reused verbatim in a few places + */ +/** + * Allows users to opt-out of animations via OS-level preferences. + */ +/** + * Reset default styles for JavaScript UI based pages. + * This is a WP-admin agnostic reset + */ +/** + * Reset the WP Admin page styles for Gutenberg-like pages. + */ +.wp-block-comment-template { + margin-bottom: 0; + max-width: 100%; + list-style: none; + padding: 0; +} +.wp-block-comment-template li { + clear: both; +} +.wp-block-comment-template ol { + margin-bottom: 0; + max-width: 100%; + list-style: none; + padding-right: 2rem; +} \ No newline at end of file diff --git a/wp-includes/blocks/comment-template/style-rtl.min.css b/wp-includes/blocks/comment-template/style-rtl.min.css new file mode 100644 index 0000000000..a228c992b9 --- /dev/null +++ b/wp-includes/blocks/comment-template/style-rtl.min.css @@ -0,0 +1 @@ +.wp-block-comment-template{margin-bottom:0;max-width:100%;list-style:none;padding:0}.wp-block-comment-template li{clear:both}.wp-block-comment-template ol{margin-bottom:0;max-width:100%;list-style:none;padding-right:2rem} \ No newline at end of file diff --git a/wp-includes/blocks/comment-template/style.css b/wp-includes/blocks/comment-template/style.css new file mode 100644 index 0000000000..5375489677 --- /dev/null +++ b/wp-includes/blocks/comment-template/style.css @@ -0,0 +1,91 @@ +/** + * Colors + */ +/** + * Breakpoints & Media Queries + */ +/** + * SCSS Variables. + * + * Please use variables from this sheet to ensure consistency across the UI. + * Don't add to this sheet unless you're pretty sure the value will be reused in many places. + * For example, don't add rules to this sheet that affect block visuals. It's purely for UI. + */ +/** + * Colors + */ +/** + * Fonts & basic variables. + */ +/** + * Grid System. + * https://make.wordpress.org/design/2019/10/31/proposal-a-consistent-spacing-system-for-wordpress/ + */ +/** + * Dimensions. + */ +/** + * Shadows. + */ +/** + * Editor widths. + */ +/** + * Block & Editor UI. + */ +/** + * Block paddings. + */ +/** + * React Native specific. + * These variables do not appear to be used anywhere else. + */ +/** +* Converts a hex value into the rgb equivalent. +* +* @param {string} hex - the hexadecimal value to convert +* @return {string} comma separated rgb values +*/ +/** + * Breakpoint mixins + */ +/** + * Long content fade mixin + * + * Creates a fading overlay to signify that the content is longer + * than the space allows. + */ +/** + * Focus styles. + */ +/** + * Applies editor left position to the selector passed as argument + */ +/** + * Styles that are reused verbatim in a few places + */ +/** + * Allows users to opt-out of animations via OS-level preferences. + */ +/** + * Reset default styles for JavaScript UI based pages. + * This is a WP-admin agnostic reset + */ +/** + * Reset the WP Admin page styles for Gutenberg-like pages. + */ +.wp-block-comment-template { + margin-bottom: 0; + max-width: 100%; + list-style: none; + padding: 0; +} +.wp-block-comment-template li { + clear: both; +} +.wp-block-comment-template ol { + margin-bottom: 0; + max-width: 100%; + list-style: none; + padding-left: 2rem; +} \ No newline at end of file diff --git a/wp-includes/blocks/comment-template/style.min.css b/wp-includes/blocks/comment-template/style.min.css new file mode 100644 index 0000000000..5da3177ceb --- /dev/null +++ b/wp-includes/blocks/comment-template/style.min.css @@ -0,0 +1 @@ +.wp-block-comment-template{margin-bottom:0;max-width:100%;list-style:none;padding:0}.wp-block-comment-template li{clear:both}.wp-block-comment-template ol{margin-bottom:0;max-width:100%;list-style:none;padding-left:2rem} \ No newline at end of file diff --git a/wp-includes/blocks/comments-pagination-next.php b/wp-includes/blocks/comments-pagination-next.php new file mode 100644 index 0000000000..a535b7c40d --- /dev/null +++ b/wp-includes/blocks/comments-pagination-next.php @@ -0,0 +1,60 @@ +context['postId'] ) ) { + return ''; + } + + $comment_vars = build_comment_query_vars_from_block( $block ); + $max_page = ( new WP_Comment_Query( $comment_vars ) )->max_num_pages; + $default_label = __( 'Newer Comments' ); + $label = isset( $attributes['label'] ) && ! empty( $attributes['label'] ) ? $attributes['label'] : $default_label; + $pagination_arrow = get_comments_pagination_arrow( $block, 'next' ); + + $filter_link_attributes = function() { + return get_block_wrapper_attributes(); + }; + add_filter( 'next_comments_link_attributes', $filter_link_attributes ); + + if ( $pagination_arrow ) { + $label .= $pagination_arrow; + } + + $next_comments_link = get_next_comments_link( $label, $max_page ); + + remove_filter( 'next_posts_link_attributes', $filter_link_attributes ); + + if ( ! isset( $next_comments_link ) ) { + return ''; + } + return $next_comments_link; +} + + +/** + * Registers the `core/comments-pagination-next` block on the server. + */ +function register_block_core_comments_pagination_next() { + register_block_type_from_metadata( + __DIR__ . '/comments-pagination-next', + array( + 'render_callback' => 'render_block_core_comments_pagination_next', + ) + ); +} +add_action( 'init', 'register_block_core_comments_pagination_next' ); diff --git a/wp-includes/blocks/comments-pagination-next/block.json b/wp-includes/blocks/comments-pagination-next/block.json new file mode 100644 index 0000000000..55fc3b6e1f --- /dev/null +++ b/wp-includes/blocks/comments-pagination-next/block.json @@ -0,0 +1,38 @@ +{ + "$schema": "https://schemas.wp.org/trunk/block.json", + "apiVersion": 2, + "name": "core/comments-pagination-next", + "title": "Next Page", + "category": "theme", + "parent": [ "core/comments-pagination" ], + "description": "Displays the next comment's page link.", + "textdomain": "default", + "attributes": { + "label": { + "type": "string" + } + }, + "usesContext": [ "postId", "comments/paginationArrow" ], + "supports": { + "reusable": false, + "html": false, + "color": { + "gradients": true, + "text": false, + "__experimentalDefaultControls": { + "background": true + } + }, + "typography": { + "fontSize": true, + "lineHeight": true, + "__experimentalFontStyle": true, + "__experimentalFontWeight": true, + "__experimentalLetterSpacing": true, + "__experimentalTextTransform": true, + "__experimentalDefaultControls": { + "fontSize": true + } + } + } +} diff --git a/wp-includes/blocks/comments-pagination-numbers.php b/wp-includes/blocks/comments-pagination-numbers.php new file mode 100644 index 0000000000..b172e0c8d4 --- /dev/null +++ b/wp-includes/blocks/comments-pagination-numbers.php @@ -0,0 +1,62 @@ +context['postId'] ) ) { + return ''; + } + + $comment_vars = build_comment_query_vars_from_block( $block ); + + $total = ( new WP_Comment_Query( $comment_vars ) )->max_num_pages; + $current = ! empty( $comment_vars['paged'] ) ? $comment_vars['paged'] : null; + + // Render links. + $content = paginate_comments_links( + array( + 'total' => $total, + 'current' => $current, + 'prev_next' => false, + 'echo' => false, + ) + ); + + if ( empty( $content ) ) { + return ''; + } + + $wrapper_attributes = get_block_wrapper_attributes(); + + return sprintf( + '
    %2$s
    ', + $wrapper_attributes, + $content + ); +} + +/** + * Registers the `core/comments-pagination-numbers` block on the server. + */ +function register_block_core_comments_pagination_numbers() { + register_block_type_from_metadata( + __DIR__ . '/comments-pagination-numbers', + array( + 'render_callback' => 'render_block_core_comments_pagination_numbers', + ) + ); +} +add_action( 'init', 'register_block_core_comments_pagination_numbers' ); diff --git a/wp-includes/blocks/comments-pagination-numbers/block.json b/wp-includes/blocks/comments-pagination-numbers/block.json new file mode 100644 index 0000000000..020d838dd7 --- /dev/null +++ b/wp-includes/blocks/comments-pagination-numbers/block.json @@ -0,0 +1,15 @@ +{ + "$schema": "https://schemas.wp.org/trunk/block.json", + "apiVersion": 2, + "name": "core/comments-pagination-numbers", + "title": "Page Numbers", + "category": "theme", + "parent": [ "core/comments-pagination" ], + "description": "Displays a list of page numbers for comments pagination.", + "textdomain": "default", + "usesContext": [ "postId" ], + "supports": { + "reusable": false, + "html": false + } +} diff --git a/wp-includes/blocks/comments-pagination-numbers/editor-rtl.css b/wp-includes/blocks/comments-pagination-numbers/editor-rtl.css new file mode 100644 index 0000000000..17381d0ed3 --- /dev/null +++ b/wp-includes/blocks/comments-pagination-numbers/editor-rtl.css @@ -0,0 +1,85 @@ +/** + * Colors + */ +/** + * Breakpoints & Media Queries + */ +/** + * SCSS Variables. + * + * Please use variables from this sheet to ensure consistency across the UI. + * Don't add to this sheet unless you're pretty sure the value will be reused in many places. + * For example, don't add rules to this sheet that affect block visuals. It's purely for UI. + */ +/** + * Colors + */ +/** + * Fonts & basic variables. + */ +/** + * Grid System. + * https://make.wordpress.org/design/2019/10/31/proposal-a-consistent-spacing-system-for-wordpress/ + */ +/** + * Dimensions. + */ +/** + * Shadows. + */ +/** + * Editor widths. + */ +/** + * Block & Editor UI. + */ +/** + * Block paddings. + */ +/** + * React Native specific. + * These variables do not appear to be used anywhere else. + */ +/** +* Converts a hex value into the rgb equivalent. +* +* @param {string} hex - the hexadecimal value to convert +* @return {string} comma separated rgb values +*/ +/** + * Breakpoint mixins + */ +/** + * Long content fade mixin + * + * Creates a fading overlay to signify that the content is longer + * than the space allows. + */ +/** + * Focus styles. + */ +/** + * Applies editor left position to the selector passed as argument + */ +/** + * Styles that are reused verbatim in a few places + */ +/** + * Allows users to opt-out of animations via OS-level preferences. + */ +/** + * Reset default styles for JavaScript UI based pages. + * This is a WP-admin agnostic reset + */ +/** + * Reset the WP Admin page styles for Gutenberg-like pages. + */ +.wp-block-comments-pagination-numbers a { + text-decoration: underline; +} +.wp-block-comments-pagination-numbers .page-numbers { + margin-left: 2px; +} +.wp-block-comments-pagination-numbers .page-numbers:last-child { + margin-right: 0; +} \ No newline at end of file diff --git a/wp-includes/blocks/comments-pagination-numbers/editor-rtl.min.css b/wp-includes/blocks/comments-pagination-numbers/editor-rtl.min.css new file mode 100644 index 0000000000..24ac42491a --- /dev/null +++ b/wp-includes/blocks/comments-pagination-numbers/editor-rtl.min.css @@ -0,0 +1 @@ +.wp-block-comments-pagination-numbers a{text-decoration:underline}.wp-block-comments-pagination-numbers .page-numbers{margin-left:2px}.wp-block-comments-pagination-numbers .page-numbers:last-child{margin-right:0} \ No newline at end of file diff --git a/wp-includes/blocks/comments-pagination-numbers/editor.css b/wp-includes/blocks/comments-pagination-numbers/editor.css new file mode 100644 index 0000000000..47be0a1eb1 --- /dev/null +++ b/wp-includes/blocks/comments-pagination-numbers/editor.css @@ -0,0 +1,86 @@ +/** + * Colors + */ +/** + * Breakpoints & Media Queries + */ +/** + * SCSS Variables. + * + * Please use variables from this sheet to ensure consistency across the UI. + * Don't add to this sheet unless you're pretty sure the value will be reused in many places. + * For example, don't add rules to this sheet that affect block visuals. It's purely for UI. + */ +/** + * Colors + */ +/** + * Fonts & basic variables. + */ +/** + * Grid System. + * https://make.wordpress.org/design/2019/10/31/proposal-a-consistent-spacing-system-for-wordpress/ + */ +/** + * Dimensions. + */ +/** + * Shadows. + */ +/** + * Editor widths. + */ +/** + * Block & Editor UI. + */ +/** + * Block paddings. + */ +/** + * React Native specific. + * These variables do not appear to be used anywhere else. + */ +/** +* Converts a hex value into the rgb equivalent. +* +* @param {string} hex - the hexadecimal value to convert +* @return {string} comma separated rgb values +*/ +/** + * Breakpoint mixins + */ +/** + * Long content fade mixin + * + * Creates a fading overlay to signify that the content is longer + * than the space allows. + */ +/** + * Focus styles. + */ +/** + * Applies editor left position to the selector passed as argument + */ +/** + * Styles that are reused verbatim in a few places + */ +/** + * Allows users to opt-out of animations via OS-level preferences. + */ +/** + * Reset default styles for JavaScript UI based pages. + * This is a WP-admin agnostic reset + */ +/** + * Reset the WP Admin page styles for Gutenberg-like pages. + */ +.wp-block-comments-pagination-numbers a { + text-decoration: underline; +} +.wp-block-comments-pagination-numbers .page-numbers { + margin-right: 2px; +} +.wp-block-comments-pagination-numbers .page-numbers:last-child { + /*rtl:ignore*/ + margin-right: 0; +} \ No newline at end of file diff --git a/wp-includes/blocks/comments-pagination-numbers/editor.min.css b/wp-includes/blocks/comments-pagination-numbers/editor.min.css new file mode 100644 index 0000000000..b825f636eb --- /dev/null +++ b/wp-includes/blocks/comments-pagination-numbers/editor.min.css @@ -0,0 +1 @@ +.wp-block-comments-pagination-numbers a{text-decoration:underline}.wp-block-comments-pagination-numbers .page-numbers{margin-right:2px}.wp-block-comments-pagination-numbers .page-numbers:last-child{margin-right:0} \ No newline at end of file diff --git a/wp-includes/blocks/comments-pagination-previous.php b/wp-includes/blocks/comments-pagination-previous.php new file mode 100644 index 0000000000..951dc8dd78 --- /dev/null +++ b/wp-includes/blocks/comments-pagination-previous.php @@ -0,0 +1,52 @@ + 'render_block_core_comments_pagination_previous', + ) + ); +} +add_action( 'init', 'register_block_core_comments_pagination_previous' ); diff --git a/wp-includes/blocks/comments-pagination-previous/block.json b/wp-includes/blocks/comments-pagination-previous/block.json new file mode 100644 index 0000000000..3edd33c3c4 --- /dev/null +++ b/wp-includes/blocks/comments-pagination-previous/block.json @@ -0,0 +1,38 @@ +{ + "$schema": "https://schemas.wp.org/trunk/block.json", + "apiVersion": 2, + "name": "core/comments-pagination-previous", + "title": "Previous Page", + "category": "theme", + "parent": [ "core/comments-pagination" ], + "description": "Displays the previous comment's page link.", + "textdomain": "default", + "attributes": { + "label": { + "type": "string" + } + }, + "usesContext": [ "postId", "comments/paginationArrow" ], + "supports": { + "reusable": false, + "html": false, + "color": { + "gradients": true, + "text": false, + "__experimentalDefaultControls": { + "background": true + } + }, + "typography": { + "fontSize": true, + "lineHeight": true, + "__experimentalFontStyle": true, + "__experimentalFontWeight": true, + "__experimentalLetterSpacing": true, + "__experimentalTextTransform": true, + "__experimentalDefaultControls": { + "fontSize": true + } + } + } +} diff --git a/wp-includes/blocks/comments-pagination.php b/wp-includes/blocks/comments-pagination.php new file mode 100644 index 0000000000..d7248d03b7 --- /dev/null +++ b/wp-includes/blocks/comments-pagination.php @@ -0,0 +1,39 @@ +%2$s', + get_block_wrapper_attributes(), + $content + ); +} + +/** + * Registers the `core/comments-pagination` block on the server. + */ +function register_block_core_comments_pagination() { + register_block_type_from_metadata( + __DIR__ . '/comments-pagination', + array( + 'render_callback' => 'render_block_core_comments_pagination', + ) + ); +} +add_action( 'init', 'register_block_core_comments_pagination' ); diff --git a/wp-includes/blocks/comments-pagination/block.json b/wp-includes/blocks/comments-pagination/block.json new file mode 100644 index 0000000000..dcaa428856 --- /dev/null +++ b/wp-includes/blocks/comments-pagination/block.json @@ -0,0 +1,42 @@ +{ + "$schema": "https://schemas.wp.org/trunk/block.json", + "apiVersion": 2, + "name": "core/comments-pagination", + "title": "Comments Pagination", + "category": "theme", + "parent": [ "core/comments-query-loop" ], + "description": "Displays a paginated navigation to next/previous set of comments, when applicable.", + "textdomain": "default", + "attributes": { + "paginationArrow": { + "type": "string", + "default": "none" + } + }, + "providesContext": { + "comments/paginationArrow": "paginationArrow" + }, + "supports": { + "align": true, + "reusable": false, + "html": false, + "color": { + "gradients": true, + "link": true, + "__experimentalDefaultControls": { + "background": true, + "text": true, + "link": true + } + }, + "__experimentalLayout": { + "allowSwitching": false, + "allowInheriting": false, + "default": { + "type": "flex" + } + } + }, + "editorStyle": "wp-block-comments-pagination-editor", + "style": "wp-block-comments-pagination" +} diff --git a/wp-includes/blocks/comments-pagination/editor-rtl.css b/wp-includes/blocks/comments-pagination/editor-rtl.css new file mode 100644 index 0000000000..0d003dc200 --- /dev/null +++ b/wp-includes/blocks/comments-pagination/editor-rtl.css @@ -0,0 +1,100 @@ +/** + * Colors + */ +/** + * Breakpoints & Media Queries + */ +/** + * SCSS Variables. + * + * Please use variables from this sheet to ensure consistency across the UI. + * Don't add to this sheet unless you're pretty sure the value will be reused in many places. + * For example, don't add rules to this sheet that affect block visuals. It's purely for UI. + */ +/** + * Colors + */ +/** + * Fonts & basic variables. + */ +/** + * Grid System. + * https://make.wordpress.org/design/2019/10/31/proposal-a-consistent-spacing-system-for-wordpress/ + */ +/** + * Dimensions. + */ +/** + * Shadows. + */ +/** + * Editor widths. + */ +/** + * Block & Editor UI. + */ +/** + * Block paddings. + */ +/** + * React Native specific. + * These variables do not appear to be used anywhere else. + */ +/** +* Converts a hex value into the rgb equivalent. +* +* @param {string} hex - the hexadecimal value to convert +* @return {string} comma separated rgb values +*/ +/** + * Breakpoint mixins + */ +/** + * Long content fade mixin + * + * Creates a fading overlay to signify that the content is longer + * than the space allows. + */ +/** + * Focus styles. + */ +/** + * Applies editor left position to the selector passed as argument + */ +/** + * Styles that are reused verbatim in a few places + */ +/** + * Allows users to opt-out of animations via OS-level preferences. + */ +/** + * Reset default styles for JavaScript UI based pages. + * This is a WP-admin agnostic reset + */ +/** + * Reset the WP Admin page styles for Gutenberg-like pages. + */ +.wp-block[data-align=center] > .wp-block-comments-pagination { + justify-content: center; +} + +.editor-styles-wrapper .wp-block-comments-pagination { + max-width: 100%; +} +.editor-styles-wrapper .wp-block-comments-pagination.block-editor-block-list__layout { + margin: 0; +} + +.wp-block-comments-pagination > .wp-block-comments-pagination-next, +.wp-block-comments-pagination > .wp-block-comments-pagination-previous, +.wp-block-comments-pagination > .wp-block-comments-pagination-numbers { + margin-right: 0; + margin-top: 0.5em; + margin-right: 0.5em; + margin-bottom: 0.5em; +} +.wp-block-comments-pagination > .wp-block-comments-pagination-next:last-child, +.wp-block-comments-pagination > .wp-block-comments-pagination-previous:last-child, +.wp-block-comments-pagination > .wp-block-comments-pagination-numbers:last-child { + margin-right: 0; +} \ No newline at end of file diff --git a/wp-includes/blocks/comments-pagination/editor-rtl.min.css b/wp-includes/blocks/comments-pagination/editor-rtl.min.css new file mode 100644 index 0000000000..4dd13dd6a2 --- /dev/null +++ b/wp-includes/blocks/comments-pagination/editor-rtl.min.css @@ -0,0 +1 @@ +.wp-block[data-align=center]>.wp-block-comments-pagination{justify-content:center}.editor-styles-wrapper .wp-block-comments-pagination{max-width:100%}.editor-styles-wrapper .wp-block-comments-pagination.block-editor-block-list__layout{margin:0}.wp-block-comments-pagination>.wp-block-comments-pagination-next,.wp-block-comments-pagination>.wp-block-comments-pagination-numbers,.wp-block-comments-pagination>.wp-block-comments-pagination-previous{margin-top:.5em;margin-right:.5em;margin-bottom:.5em}.wp-block-comments-pagination>.wp-block-comments-pagination-next:last-child,.wp-block-comments-pagination>.wp-block-comments-pagination-numbers:last-child,.wp-block-comments-pagination>.wp-block-comments-pagination-previous:last-child{margin-right:0} \ No newline at end of file diff --git a/wp-includes/blocks/comments-pagination/editor.css b/wp-includes/blocks/comments-pagination/editor.css new file mode 100644 index 0000000000..52ddbf7aaf --- /dev/null +++ b/wp-includes/blocks/comments-pagination/editor.css @@ -0,0 +1,102 @@ +/** + * Colors + */ +/** + * Breakpoints & Media Queries + */ +/** + * SCSS Variables. + * + * Please use variables from this sheet to ensure consistency across the UI. + * Don't add to this sheet unless you're pretty sure the value will be reused in many places. + * For example, don't add rules to this sheet that affect block visuals. It's purely for UI. + */ +/** + * Colors + */ +/** + * Fonts & basic variables. + */ +/** + * Grid System. + * https://make.wordpress.org/design/2019/10/31/proposal-a-consistent-spacing-system-for-wordpress/ + */ +/** + * Dimensions. + */ +/** + * Shadows. + */ +/** + * Editor widths. + */ +/** + * Block & Editor UI. + */ +/** + * Block paddings. + */ +/** + * React Native specific. + * These variables do not appear to be used anywhere else. + */ +/** +* Converts a hex value into the rgb equivalent. +* +* @param {string} hex - the hexadecimal value to convert +* @return {string} comma separated rgb values +*/ +/** + * Breakpoint mixins + */ +/** + * Long content fade mixin + * + * Creates a fading overlay to signify that the content is longer + * than the space allows. + */ +/** + * Focus styles. + */ +/** + * Applies editor left position to the selector passed as argument + */ +/** + * Styles that are reused verbatim in a few places + */ +/** + * Allows users to opt-out of animations via OS-level preferences. + */ +/** + * Reset default styles for JavaScript UI based pages. + * This is a WP-admin agnostic reset + */ +/** + * Reset the WP Admin page styles for Gutenberg-like pages. + */ +.wp-block[data-align=center] > .wp-block-comments-pagination { + justify-content: center; +} + +.editor-styles-wrapper .wp-block-comments-pagination { + max-width: 100%; +} +.editor-styles-wrapper .wp-block-comments-pagination.block-editor-block-list__layout { + margin: 0; +} + +.wp-block-comments-pagination > .wp-block-comments-pagination-next, +.wp-block-comments-pagination > .wp-block-comments-pagination-previous, +.wp-block-comments-pagination > .wp-block-comments-pagination-numbers { + margin-left: 0; + margin-top: 0.5em; + /*rtl:ignore*/ + margin-right: 0.5em; + margin-bottom: 0.5em; +} +.wp-block-comments-pagination > .wp-block-comments-pagination-next:last-child, +.wp-block-comments-pagination > .wp-block-comments-pagination-previous:last-child, +.wp-block-comments-pagination > .wp-block-comments-pagination-numbers:last-child { + /*rtl:ignore*/ + margin-right: 0; +} \ No newline at end of file diff --git a/wp-includes/blocks/comments-pagination/editor.min.css b/wp-includes/blocks/comments-pagination/editor.min.css new file mode 100644 index 0000000000..79860b1a3e --- /dev/null +++ b/wp-includes/blocks/comments-pagination/editor.min.css @@ -0,0 +1 @@ +.wp-block[data-align=center]>.wp-block-comments-pagination{justify-content:center}.editor-styles-wrapper .wp-block-comments-pagination{max-width:100%}.editor-styles-wrapper .wp-block-comments-pagination.block-editor-block-list__layout{margin:0}.wp-block-comments-pagination>.wp-block-comments-pagination-next,.wp-block-comments-pagination>.wp-block-comments-pagination-numbers,.wp-block-comments-pagination>.wp-block-comments-pagination-previous{margin:.5em .5em .5em 0}.wp-block-comments-pagination>.wp-block-comments-pagination-next:last-child,.wp-block-comments-pagination>.wp-block-comments-pagination-numbers:last-child,.wp-block-comments-pagination>.wp-block-comments-pagination-previous:last-child{margin-right:0} \ No newline at end of file diff --git a/wp-includes/blocks/comments-pagination/style-rtl.css b/wp-includes/blocks/comments-pagination/style-rtl.css new file mode 100644 index 0000000000..5563fa2ed7 --- /dev/null +++ b/wp-includes/blocks/comments-pagination/style-rtl.css @@ -0,0 +1,104 @@ +/** + * Colors + */ +/** + * Breakpoints & Media Queries + */ +/** + * SCSS Variables. + * + * Please use variables from this sheet to ensure consistency across the UI. + * Don't add to this sheet unless you're pretty sure the value will be reused in many places. + * For example, don't add rules to this sheet that affect block visuals. It's purely for UI. + */ +/** + * Colors + */ +/** + * Fonts & basic variables. + */ +/** + * Grid System. + * https://make.wordpress.org/design/2019/10/31/proposal-a-consistent-spacing-system-for-wordpress/ + */ +/** + * Dimensions. + */ +/** + * Shadows. + */ +/** + * Editor widths. + */ +/** + * Block & Editor UI. + */ +/** + * Block paddings. + */ +/** + * React Native specific. + * These variables do not appear to be used anywhere else. + */ +/** +* Converts a hex value into the rgb equivalent. +* +* @param {string} hex - the hexadecimal value to convert +* @return {string} comma separated rgb values +*/ +/** + * Breakpoint mixins + */ +/** + * Long content fade mixin + * + * Creates a fading overlay to signify that the content is longer + * than the space allows. + */ +/** + * Focus styles. + */ +/** + * Applies editor left position to the selector passed as argument + */ +/** + * Styles that are reused verbatim in a few places + */ +/** + * Allows users to opt-out of animations via OS-level preferences. + */ +/** + * Reset default styles for JavaScript UI based pages. + * This is a WP-admin agnostic reset + */ +/** + * Reset the WP Admin page styles for Gutenberg-like pages. + */ +.wp-block-comments-pagination > .wp-block-comments-pagination-next, +.wp-block-comments-pagination > .wp-block-comments-pagination-previous, +.wp-block-comments-pagination > .wp-block-comments-pagination-numbers { + margin-right: 0.5em; + margin-bottom: 0.5em; +} +.wp-block-comments-pagination > .wp-block-comments-pagination-next:last-child, +.wp-block-comments-pagination > .wp-block-comments-pagination-previous:last-child, +.wp-block-comments-pagination > .wp-block-comments-pagination-numbers:last-child { + margin-right: 0; +} +.wp-block-comments-pagination .wp-block-comments-pagination-previous-arrow { + margin-left: 1ch; + display: inline-block; +} +.wp-block-comments-pagination .wp-block-comments-pagination-previous-arrow:not(.is-arrow-chevron) { + transform: scaleX(-1);; +} +.wp-block-comments-pagination .wp-block-comments-pagination-next-arrow { + margin-right: 1ch; + display: inline-block; +} +.wp-block-comments-pagination .wp-block-comments-pagination-next-arrow:not(.is-arrow-chevron) { + transform: scaleX(-1);; +} +.wp-block-comments-pagination.aligncenter { + justify-content: center; +} \ No newline at end of file diff --git a/wp-includes/blocks/comments-pagination/style-rtl.min.css b/wp-includes/blocks/comments-pagination/style-rtl.min.css new file mode 100644 index 0000000000..0df0b5c9dc --- /dev/null +++ b/wp-includes/blocks/comments-pagination/style-rtl.min.css @@ -0,0 +1 @@ +.wp-block-comments-pagination>.wp-block-comments-pagination-next,.wp-block-comments-pagination>.wp-block-comments-pagination-numbers,.wp-block-comments-pagination>.wp-block-comments-pagination-previous{margin-right:.5em;margin-bottom:.5em}.wp-block-comments-pagination>.wp-block-comments-pagination-next:last-child,.wp-block-comments-pagination>.wp-block-comments-pagination-numbers:last-child,.wp-block-comments-pagination>.wp-block-comments-pagination-previous:last-child{margin-right:0}.wp-block-comments-pagination .wp-block-comments-pagination-previous-arrow{margin-left:1ch;display:inline-block}.wp-block-comments-pagination .wp-block-comments-pagination-previous-arrow:not(.is-arrow-chevron){transform:scaleX(-1)}.wp-block-comments-pagination .wp-block-comments-pagination-next-arrow{margin-right:1ch;display:inline-block}.wp-block-comments-pagination .wp-block-comments-pagination-next-arrow:not(.is-arrow-chevron){transform:scaleX(-1)}.wp-block-comments-pagination.aligncenter{justify-content:center} \ No newline at end of file diff --git a/wp-includes/blocks/comments-pagination/style.css b/wp-includes/blocks/comments-pagination/style.css new file mode 100644 index 0000000000..9db8d9368d --- /dev/null +++ b/wp-includes/blocks/comments-pagination/style.css @@ -0,0 +1,106 @@ +/** + * Colors + */ +/** + * Breakpoints & Media Queries + */ +/** + * SCSS Variables. + * + * Please use variables from this sheet to ensure consistency across the UI. + * Don't add to this sheet unless you're pretty sure the value will be reused in many places. + * For example, don't add rules to this sheet that affect block visuals. It's purely for UI. + */ +/** + * Colors + */ +/** + * Fonts & basic variables. + */ +/** + * Grid System. + * https://make.wordpress.org/design/2019/10/31/proposal-a-consistent-spacing-system-for-wordpress/ + */ +/** + * Dimensions. + */ +/** + * Shadows. + */ +/** + * Editor widths. + */ +/** + * Block & Editor UI. + */ +/** + * Block paddings. + */ +/** + * React Native specific. + * These variables do not appear to be used anywhere else. + */ +/** +* Converts a hex value into the rgb equivalent. +* +* @param {string} hex - the hexadecimal value to convert +* @return {string} comma separated rgb values +*/ +/** + * Breakpoint mixins + */ +/** + * Long content fade mixin + * + * Creates a fading overlay to signify that the content is longer + * than the space allows. + */ +/** + * Focus styles. + */ +/** + * Applies editor left position to the selector passed as argument + */ +/** + * Styles that are reused verbatim in a few places + */ +/** + * Allows users to opt-out of animations via OS-level preferences. + */ +/** + * Reset default styles for JavaScript UI based pages. + * This is a WP-admin agnostic reset + */ +/** + * Reset the WP Admin page styles for Gutenberg-like pages. + */ +.wp-block-comments-pagination > .wp-block-comments-pagination-next, +.wp-block-comments-pagination > .wp-block-comments-pagination-previous, +.wp-block-comments-pagination > .wp-block-comments-pagination-numbers { + /*rtl:ignore*/ + margin-right: 0.5em; + margin-bottom: 0.5em; +} +.wp-block-comments-pagination > .wp-block-comments-pagination-next:last-child, +.wp-block-comments-pagination > .wp-block-comments-pagination-previous:last-child, +.wp-block-comments-pagination > .wp-block-comments-pagination-numbers:last-child { + /*rtl:ignore*/ + margin-right: 0; +} +.wp-block-comments-pagination .wp-block-comments-pagination-previous-arrow { + margin-right: 1ch; + display: inline-block; +} +.wp-block-comments-pagination .wp-block-comments-pagination-previous-arrow:not(.is-arrow-chevron) { + transform: scaleX(1) /*rtl:scaleX(-1);*/; +} +.wp-block-comments-pagination .wp-block-comments-pagination-next-arrow { + margin-left: 1ch; + display: inline-block; +} +.wp-block-comments-pagination .wp-block-comments-pagination-next-arrow:not(.is-arrow-chevron) { + transform: scaleX(1) /*rtl:scaleX(-1);*/; +} +.wp-block-comments-pagination.aligncenter { + justify-content: center; +} \ No newline at end of file diff --git a/wp-includes/blocks/comments-pagination/style.min.css b/wp-includes/blocks/comments-pagination/style.min.css new file mode 100644 index 0000000000..caae7b6fe6 --- /dev/null +++ b/wp-includes/blocks/comments-pagination/style.min.css @@ -0,0 +1 @@ +.wp-block-comments-pagination>.wp-block-comments-pagination-next,.wp-block-comments-pagination>.wp-block-comments-pagination-numbers,.wp-block-comments-pagination>.wp-block-comments-pagination-previous{margin-right:.5em;margin-bottom:.5em}.wp-block-comments-pagination>.wp-block-comments-pagination-next:last-child,.wp-block-comments-pagination>.wp-block-comments-pagination-numbers:last-child,.wp-block-comments-pagination>.wp-block-comments-pagination-previous:last-child{margin-right:0}.wp-block-comments-pagination .wp-block-comments-pagination-previous-arrow{margin-right:1ch;display:inline-block}.wp-block-comments-pagination .wp-block-comments-pagination-previous-arrow:not(.is-arrow-chevron){transform:scaleX(1)}.wp-block-comments-pagination .wp-block-comments-pagination-next-arrow{margin-left:1ch;display:inline-block}.wp-block-comments-pagination .wp-block-comments-pagination-next-arrow:not(.is-arrow-chevron){transform:scaleX(1)}.wp-block-comments-pagination.aligncenter{justify-content:center} \ No newline at end of file diff --git a/wp-includes/blocks/comments-query-loop/block.json b/wp-includes/blocks/comments-query-loop/block.json new file mode 100644 index 0000000000..fecbd7c92f --- /dev/null +++ b/wp-includes/blocks/comments-query-loop/block.json @@ -0,0 +1,29 @@ +{ + "$schema": "https://schemas.wp.org/trunk/block.json", + "apiVersion": 2, + "name": "core/comments-query-loop", + "title": "Comments Query Loop", + "category": "theme", + "description": "An advanced block that allows displaying post comments using different visual configurations.", + "textdomain": "default", + "attributes": { + "tagName": { + "type": "string", + "default": "div" + } + }, + "supports": { + "align": [ "wide", "full" ], + "html": false, + "color": { + "gradients": true, + "link": true, + "__experimentalDefaultControls": { + "background": true, + "text": true, + "link": true + } + } + }, + "editorStyle": "wp-block-comments-editor" +} diff --git a/wp-includes/blocks/comments-query-loop/editor-rtl.css b/wp-includes/blocks/comments-query-loop/editor-rtl.css new file mode 100644 index 0000000000..573e140ec4 --- /dev/null +++ b/wp-includes/blocks/comments-query-loop/editor-rtl.css @@ -0,0 +1,79 @@ +/** + * Colors + */ +/** + * Breakpoints & Media Queries + */ +/** + * SCSS Variables. + * + * Please use variables from this sheet to ensure consistency across the UI. + * Don't add to this sheet unless you're pretty sure the value will be reused in many places. + * For example, don't add rules to this sheet that affect block visuals. It's purely for UI. + */ +/** + * Colors + */ +/** + * Fonts & basic variables. + */ +/** + * Grid System. + * https://make.wordpress.org/design/2019/10/31/proposal-a-consistent-spacing-system-for-wordpress/ + */ +/** + * Dimensions. + */ +/** + * Shadows. + */ +/** + * Editor widths. + */ +/** + * Block & Editor UI. + */ +/** + * Block paddings. + */ +/** + * React Native specific. + * These variables do not appear to be used anywhere else. + */ +/** +* Converts a hex value into the rgb equivalent. +* +* @param {string} hex - the hexadecimal value to convert +* @return {string} comma separated rgb values +*/ +/** + * Breakpoint mixins + */ +/** + * Long content fade mixin + * + * Creates a fading overlay to signify that the content is longer + * than the space allows. + */ +/** + * Focus styles. + */ +/** + * Applies editor left position to the selector passed as argument + */ +/** + * Styles that are reused verbatim in a few places + */ +/** + * Allows users to opt-out of animations via OS-level preferences. + */ +/** + * Reset default styles for JavaScript UI based pages. + * This is a WP-admin agnostic reset + */ +/** + * Reset the WP Admin page styles for Gutenberg-like pages. + */ +.block-library-comments-toolbar__popover .components-popover__content { + min-width: 230px; +} \ No newline at end of file diff --git a/wp-includes/blocks/comments-query-loop/editor-rtl.min.css b/wp-includes/blocks/comments-query-loop/editor-rtl.min.css new file mode 100644 index 0000000000..e37f36edec --- /dev/null +++ b/wp-includes/blocks/comments-query-loop/editor-rtl.min.css @@ -0,0 +1 @@ +.block-library-comments-toolbar__popover .components-popover__content{min-width:230px} \ No newline at end of file diff --git a/wp-includes/blocks/comments-query-loop/editor.css b/wp-includes/blocks/comments-query-loop/editor.css new file mode 100644 index 0000000000..573e140ec4 --- /dev/null +++ b/wp-includes/blocks/comments-query-loop/editor.css @@ -0,0 +1,79 @@ +/** + * Colors + */ +/** + * Breakpoints & Media Queries + */ +/** + * SCSS Variables. + * + * Please use variables from this sheet to ensure consistency across the UI. + * Don't add to this sheet unless you're pretty sure the value will be reused in many places. + * For example, don't add rules to this sheet that affect block visuals. It's purely for UI. + */ +/** + * Colors + */ +/** + * Fonts & basic variables. + */ +/** + * Grid System. + * https://make.wordpress.org/design/2019/10/31/proposal-a-consistent-spacing-system-for-wordpress/ + */ +/** + * Dimensions. + */ +/** + * Shadows. + */ +/** + * Editor widths. + */ +/** + * Block & Editor UI. + */ +/** + * Block paddings. + */ +/** + * React Native specific. + * These variables do not appear to be used anywhere else. + */ +/** +* Converts a hex value into the rgb equivalent. +* +* @param {string} hex - the hexadecimal value to convert +* @return {string} comma separated rgb values +*/ +/** + * Breakpoint mixins + */ +/** + * Long content fade mixin + * + * Creates a fading overlay to signify that the content is longer + * than the space allows. + */ +/** + * Focus styles. + */ +/** + * Applies editor left position to the selector passed as argument + */ +/** + * Styles that are reused verbatim in a few places + */ +/** + * Allows users to opt-out of animations via OS-level preferences. + */ +/** + * Reset default styles for JavaScript UI based pages. + * This is a WP-admin agnostic reset + */ +/** + * Reset the WP Admin page styles for Gutenberg-like pages. + */ +.block-library-comments-toolbar__popover .components-popover__content { + min-width: 230px; +} \ No newline at end of file diff --git a/wp-includes/blocks/comments-query-loop/editor.min.css b/wp-includes/blocks/comments-query-loop/editor.min.css new file mode 100644 index 0000000000..e37f36edec --- /dev/null +++ b/wp-includes/blocks/comments-query-loop/editor.min.css @@ -0,0 +1 @@ +.block-library-comments-toolbar__popover .components-popover__content{min-width:230px} \ No newline at end of file diff --git a/wp-includes/blocks/cover/block.json b/wp-includes/blocks/cover/block.json index aa00d40341..f908f544fb 100644 --- a/wp-includes/blocks/cover/block.json +++ b/wp-includes/blocks/cover/block.json @@ -1,4 +1,5 @@ { + "$schema": "https://schemas.wp.org/trunk/block.json", "apiVersion": 2, "name": "core/cover", "title": "Cover", @@ -9,6 +10,10 @@ "url": { "type": "string" }, + "useFeaturedImage": { + "type": "boolean", + "default": false + }, "id": { "type": "number" }, @@ -71,6 +76,7 @@ "enum": [ "all", "insert", false ] } }, + "usesContext": [ "postId", "postType" ], "supports": { "anchor": true, "align": true, diff --git a/wp-includes/blocks/cover/style-rtl.css b/wp-includes/blocks/cover/style-rtl.css index d853890ec3..4139870eff 100644 --- a/wp-includes/blocks/cover/style-rtl.css +++ b/wp-includes/blocks/cover/style-rtl.css @@ -124,18 +124,20 @@ .wp-block-cover .has-background-dim:not([class*=-background-color]) { background-color: #000; } +.wp-block-cover-image .has-background-dim.has-background-gradient, +.wp-block-cover .has-background-dim.has-background-gradient { + background-color: transparent; +} .wp-block-cover-image.has-background-dim::before, -.wp-block-cover-image .has-background-dim::before, -.wp-block-cover.has-background-dim::before, -.wp-block-cover .has-background-dim::before { +.wp-block-cover.has-background-dim::before { content: ""; background-color: inherit; } .wp-block-cover-image.has-background-dim:not(.has-background-gradient)::before, -.wp-block-cover-image .has-background-dim:not(.has-background-gradient)::before, +.wp-block-cover-image .wp-block-cover__background, .wp-block-cover-image .wp-block-cover__gradient-background, .wp-block-cover.has-background-dim:not(.has-background-gradient)::before, -.wp-block-cover .has-background-dim:not(.has-background-gradient)::before, +.wp-block-cover .wp-block-cover__background, .wp-block-cover .wp-block-cover__gradient-background { position: absolute; top: 0; @@ -146,109 +148,155 @@ opacity: 0.5; } .wp-block-cover-image.has-background-dim.has-background-dim-10:not(.has-background-gradient)::before, +.wp-block-cover-image.has-background-dim.has-background-dim-10 .wp-block-cover__background, .wp-block-cover-image.has-background-dim.has-background-dim-10 .wp-block-cover__gradient-background, .wp-block-cover.has-background-dim.has-background-dim-10:not(.has-background-gradient)::before, +.wp-block-cover.has-background-dim.has-background-dim-10 .wp-block-cover__background, .wp-block-cover.has-background-dim.has-background-dim-10 .wp-block-cover__gradient-background { opacity: 0.1; } .wp-block-cover-image.has-background-dim.has-background-dim-20:not(.has-background-gradient)::before, +.wp-block-cover-image.has-background-dim.has-background-dim-20 .wp-block-cover__background, .wp-block-cover-image.has-background-dim.has-background-dim-20 .wp-block-cover__gradient-background, .wp-block-cover.has-background-dim.has-background-dim-20:not(.has-background-gradient)::before, +.wp-block-cover.has-background-dim.has-background-dim-20 .wp-block-cover__background, .wp-block-cover.has-background-dim.has-background-dim-20 .wp-block-cover__gradient-background { opacity: 0.2; } .wp-block-cover-image.has-background-dim.has-background-dim-30:not(.has-background-gradient)::before, +.wp-block-cover-image.has-background-dim.has-background-dim-30 .wp-block-cover__background, .wp-block-cover-image.has-background-dim.has-background-dim-30 .wp-block-cover__gradient-background, .wp-block-cover.has-background-dim.has-background-dim-30:not(.has-background-gradient)::before, +.wp-block-cover.has-background-dim.has-background-dim-30 .wp-block-cover__background, .wp-block-cover.has-background-dim.has-background-dim-30 .wp-block-cover__gradient-background { opacity: 0.3; } .wp-block-cover-image.has-background-dim.has-background-dim-40:not(.has-background-gradient)::before, +.wp-block-cover-image.has-background-dim.has-background-dim-40 .wp-block-cover__background, .wp-block-cover-image.has-background-dim.has-background-dim-40 .wp-block-cover__gradient-background, .wp-block-cover.has-background-dim.has-background-dim-40:not(.has-background-gradient)::before, +.wp-block-cover.has-background-dim.has-background-dim-40 .wp-block-cover__background, .wp-block-cover.has-background-dim.has-background-dim-40 .wp-block-cover__gradient-background { opacity: 0.4; } .wp-block-cover-image.has-background-dim.has-background-dim-50:not(.has-background-gradient)::before, +.wp-block-cover-image.has-background-dim.has-background-dim-50 .wp-block-cover__background, .wp-block-cover-image.has-background-dim.has-background-dim-50 .wp-block-cover__gradient-background, .wp-block-cover.has-background-dim.has-background-dim-50:not(.has-background-gradient)::before, +.wp-block-cover.has-background-dim.has-background-dim-50 .wp-block-cover__background, .wp-block-cover.has-background-dim.has-background-dim-50 .wp-block-cover__gradient-background { opacity: 0.5; } .wp-block-cover-image.has-background-dim.has-background-dim-60:not(.has-background-gradient)::before, +.wp-block-cover-image.has-background-dim.has-background-dim-60 .wp-block-cover__background, .wp-block-cover-image.has-background-dim.has-background-dim-60 .wp-block-cover__gradient-background, .wp-block-cover.has-background-dim.has-background-dim-60:not(.has-background-gradient)::before, +.wp-block-cover.has-background-dim.has-background-dim-60 .wp-block-cover__background, .wp-block-cover.has-background-dim.has-background-dim-60 .wp-block-cover__gradient-background { opacity: 0.6; } .wp-block-cover-image.has-background-dim.has-background-dim-70:not(.has-background-gradient)::before, +.wp-block-cover-image.has-background-dim.has-background-dim-70 .wp-block-cover__background, .wp-block-cover-image.has-background-dim.has-background-dim-70 .wp-block-cover__gradient-background, .wp-block-cover.has-background-dim.has-background-dim-70:not(.has-background-gradient)::before, +.wp-block-cover.has-background-dim.has-background-dim-70 .wp-block-cover__background, .wp-block-cover.has-background-dim.has-background-dim-70 .wp-block-cover__gradient-background { opacity: 0.7; } .wp-block-cover-image.has-background-dim.has-background-dim-80:not(.has-background-gradient)::before, +.wp-block-cover-image.has-background-dim.has-background-dim-80 .wp-block-cover__background, .wp-block-cover-image.has-background-dim.has-background-dim-80 .wp-block-cover__gradient-background, .wp-block-cover.has-background-dim.has-background-dim-80:not(.has-background-gradient)::before, +.wp-block-cover.has-background-dim.has-background-dim-80 .wp-block-cover__background, .wp-block-cover.has-background-dim.has-background-dim-80 .wp-block-cover__gradient-background { opacity: 0.8; } .wp-block-cover-image.has-background-dim.has-background-dim-90:not(.has-background-gradient)::before, +.wp-block-cover-image.has-background-dim.has-background-dim-90 .wp-block-cover__background, .wp-block-cover-image.has-background-dim.has-background-dim-90 .wp-block-cover__gradient-background, .wp-block-cover.has-background-dim.has-background-dim-90:not(.has-background-gradient)::before, +.wp-block-cover.has-background-dim.has-background-dim-90 .wp-block-cover__background, .wp-block-cover.has-background-dim.has-background-dim-90 .wp-block-cover__gradient-background { opacity: 0.9; } .wp-block-cover-image.has-background-dim.has-background-dim-100:not(.has-background-gradient)::before, +.wp-block-cover-image.has-background-dim.has-background-dim-100 .wp-block-cover__background, .wp-block-cover-image.has-background-dim.has-background-dim-100 .wp-block-cover__gradient-background, .wp-block-cover.has-background-dim.has-background-dim-100:not(.has-background-gradient)::before, +.wp-block-cover.has-background-dim.has-background-dim-100 .wp-block-cover__background, .wp-block-cover.has-background-dim.has-background-dim-100 .wp-block-cover__gradient-background { opacity: 1; } .wp-block-cover-image .wp-block-cover__gradient-background.has-background-dim.has-background-dim-0, -.wp-block-cover .wp-block-cover__gradient-background.has-background-dim.has-background-dim-0 { +.wp-block-cover-image .wp-block-cover__background.has-background-dim.has-background-dim-0, +.wp-block-cover .wp-block-cover__gradient-background.has-background-dim.has-background-dim-0, +.wp-block-cover .wp-block-cover__background.has-background-dim.has-background-dim-0 { opacity: 0; } .wp-block-cover-image .wp-block-cover__gradient-background.has-background-dim.has-background-dim-10, -.wp-block-cover .wp-block-cover__gradient-background.has-background-dim.has-background-dim-10 { +.wp-block-cover-image .wp-block-cover__background.has-background-dim.has-background-dim-10, +.wp-block-cover .wp-block-cover__gradient-background.has-background-dim.has-background-dim-10, +.wp-block-cover .wp-block-cover__background.has-background-dim.has-background-dim-10 { opacity: 0.1; } .wp-block-cover-image .wp-block-cover__gradient-background.has-background-dim.has-background-dim-20, -.wp-block-cover .wp-block-cover__gradient-background.has-background-dim.has-background-dim-20 { +.wp-block-cover-image .wp-block-cover__background.has-background-dim.has-background-dim-20, +.wp-block-cover .wp-block-cover__gradient-background.has-background-dim.has-background-dim-20, +.wp-block-cover .wp-block-cover__background.has-background-dim.has-background-dim-20 { opacity: 0.2; } .wp-block-cover-image .wp-block-cover__gradient-background.has-background-dim.has-background-dim-30, -.wp-block-cover .wp-block-cover__gradient-background.has-background-dim.has-background-dim-30 { +.wp-block-cover-image .wp-block-cover__background.has-background-dim.has-background-dim-30, +.wp-block-cover .wp-block-cover__gradient-background.has-background-dim.has-background-dim-30, +.wp-block-cover .wp-block-cover__background.has-background-dim.has-background-dim-30 { opacity: 0.3; } .wp-block-cover-image .wp-block-cover__gradient-background.has-background-dim.has-background-dim-40, -.wp-block-cover .wp-block-cover__gradient-background.has-background-dim.has-background-dim-40 { +.wp-block-cover-image .wp-block-cover__background.has-background-dim.has-background-dim-40, +.wp-block-cover .wp-block-cover__gradient-background.has-background-dim.has-background-dim-40, +.wp-block-cover .wp-block-cover__background.has-background-dim.has-background-dim-40 { opacity: 0.4; } .wp-block-cover-image .wp-block-cover__gradient-background.has-background-dim.has-background-dim-50, -.wp-block-cover .wp-block-cover__gradient-background.has-background-dim.has-background-dim-50 { +.wp-block-cover-image .wp-block-cover__background.has-background-dim.has-background-dim-50, +.wp-block-cover .wp-block-cover__gradient-background.has-background-dim.has-background-dim-50, +.wp-block-cover .wp-block-cover__background.has-background-dim.has-background-dim-50 { opacity: 0.5; } .wp-block-cover-image .wp-block-cover__gradient-background.has-background-dim.has-background-dim-60, -.wp-block-cover .wp-block-cover__gradient-background.has-background-dim.has-background-dim-60 { +.wp-block-cover-image .wp-block-cover__background.has-background-dim.has-background-dim-60, +.wp-block-cover .wp-block-cover__gradient-background.has-background-dim.has-background-dim-60, +.wp-block-cover .wp-block-cover__background.has-background-dim.has-background-dim-60 { opacity: 0.6; } .wp-block-cover-image .wp-block-cover__gradient-background.has-background-dim.has-background-dim-70, -.wp-block-cover .wp-block-cover__gradient-background.has-background-dim.has-background-dim-70 { +.wp-block-cover-image .wp-block-cover__background.has-background-dim.has-background-dim-70, +.wp-block-cover .wp-block-cover__gradient-background.has-background-dim.has-background-dim-70, +.wp-block-cover .wp-block-cover__background.has-background-dim.has-background-dim-70 { opacity: 0.7; } .wp-block-cover-image .wp-block-cover__gradient-background.has-background-dim.has-background-dim-80, -.wp-block-cover .wp-block-cover__gradient-background.has-background-dim.has-background-dim-80 { +.wp-block-cover-image .wp-block-cover__background.has-background-dim.has-background-dim-80, +.wp-block-cover .wp-block-cover__gradient-background.has-background-dim.has-background-dim-80, +.wp-block-cover .wp-block-cover__background.has-background-dim.has-background-dim-80 { opacity: 0.8; } .wp-block-cover-image .wp-block-cover__gradient-background.has-background-dim.has-background-dim-90, -.wp-block-cover .wp-block-cover__gradient-background.has-background-dim.has-background-dim-90 { +.wp-block-cover-image .wp-block-cover__background.has-background-dim.has-background-dim-90, +.wp-block-cover .wp-block-cover__gradient-background.has-background-dim.has-background-dim-90, +.wp-block-cover .wp-block-cover__background.has-background-dim.has-background-dim-90 { opacity: 0.9; } .wp-block-cover-image .wp-block-cover__gradient-background.has-background-dim.has-background-dim-100, -.wp-block-cover .wp-block-cover__gradient-background.has-background-dim.has-background-dim-100 { +.wp-block-cover-image .wp-block-cover__background.has-background-dim.has-background-dim-100, +.wp-block-cover .wp-block-cover__gradient-background.has-background-dim.has-background-dim-100, +.wp-block-cover .wp-block-cover__background.has-background-dim.has-background-dim-100 { opacity: 1; } +.wp-block-cover-image .block-library-cover__padding-visualizer, +.wp-block-cover .block-library-cover__padding-visualizer { + z-index: 2; +} .wp-block-cover-image.alignleft, .wp-block-cover-image.alignright, .wp-block-cover.alignleft, .wp-block-cover.alignright { diff --git a/wp-includes/blocks/cover/style-rtl.min.css b/wp-includes/blocks/cover/style-rtl.min.css index 25e47d0c9a..04c685a1b9 100644 --- a/wp-includes/blocks/cover/style-rtl.min.css +++ b/wp-includes/blocks/cover/style-rtl.min.css @@ -1 +1 @@ -.wp-block-cover,.wp-block-cover-image{position:relative;background-size:cover;background-position:50%;min-height:430px;width:100%;display:flex;justify-content:center;align-items:center;padding:1em;box-sizing:border-box}.wp-block-cover-image.has-parallax,.wp-block-cover.has-parallax{background-attachment:fixed}@supports (-webkit-overflow-scrolling:touch){.wp-block-cover-image.has-parallax,.wp-block-cover.has-parallax{background-attachment:scroll}}@media (prefers-reduced-motion:reduce){.wp-block-cover-image.has-parallax,.wp-block-cover.has-parallax{background-attachment:scroll}}.wp-block-cover-image.is-repeated,.wp-block-cover.is-repeated{background-repeat:repeat;background-size:auto}.wp-block-cover-image.has-background-dim:not([class*=-background-color]),.wp-block-cover-image .has-background-dim:not([class*=-background-color]),.wp-block-cover.has-background-dim:not([class*=-background-color]),.wp-block-cover .has-background-dim:not([class*=-background-color]){background-color:#000}.wp-block-cover-image.has-background-dim:before,.wp-block-cover-image .has-background-dim:before,.wp-block-cover.has-background-dim:before,.wp-block-cover .has-background-dim:before{content:"";background-color:inherit}.wp-block-cover-image.has-background-dim:not(.has-background-gradient):before,.wp-block-cover-image .has-background-dim:not(.has-background-gradient):before,.wp-block-cover-image .wp-block-cover__gradient-background,.wp-block-cover.has-background-dim:not(.has-background-gradient):before,.wp-block-cover .has-background-dim:not(.has-background-gradient):before,.wp-block-cover .wp-block-cover__gradient-background{position:absolute;top:0;right:0;bottom:0;left:0;z-index:1;opacity:.5}.wp-block-cover-image.has-background-dim.has-background-dim-10 .wp-block-cover__gradient-background,.wp-block-cover-image.has-background-dim.has-background-dim-10:not(.has-background-gradient):before,.wp-block-cover.has-background-dim.has-background-dim-10 .wp-block-cover__gradient-background,.wp-block-cover.has-background-dim.has-background-dim-10:not(.has-background-gradient):before{opacity:.1}.wp-block-cover-image.has-background-dim.has-background-dim-20 .wp-block-cover__gradient-background,.wp-block-cover-image.has-background-dim.has-background-dim-20:not(.has-background-gradient):before,.wp-block-cover.has-background-dim.has-background-dim-20 .wp-block-cover__gradient-background,.wp-block-cover.has-background-dim.has-background-dim-20:not(.has-background-gradient):before{opacity:.2}.wp-block-cover-image.has-background-dim.has-background-dim-30 .wp-block-cover__gradient-background,.wp-block-cover-image.has-background-dim.has-background-dim-30:not(.has-background-gradient):before,.wp-block-cover.has-background-dim.has-background-dim-30 .wp-block-cover__gradient-background,.wp-block-cover.has-background-dim.has-background-dim-30:not(.has-background-gradient):before{opacity:.3}.wp-block-cover-image.has-background-dim.has-background-dim-40 .wp-block-cover__gradient-background,.wp-block-cover-image.has-background-dim.has-background-dim-40:not(.has-background-gradient):before,.wp-block-cover.has-background-dim.has-background-dim-40 .wp-block-cover__gradient-background,.wp-block-cover.has-background-dim.has-background-dim-40:not(.has-background-gradient):before{opacity:.4}.wp-block-cover-image.has-background-dim.has-background-dim-50 .wp-block-cover__gradient-background,.wp-block-cover-image.has-background-dim.has-background-dim-50:not(.has-background-gradient):before,.wp-block-cover.has-background-dim.has-background-dim-50 .wp-block-cover__gradient-background,.wp-block-cover.has-background-dim.has-background-dim-50:not(.has-background-gradient):before{opacity:.5}.wp-block-cover-image.has-background-dim.has-background-dim-60 .wp-block-cover__gradient-background,.wp-block-cover-image.has-background-dim.has-background-dim-60:not(.has-background-gradient):before,.wp-block-cover.has-background-dim.has-background-dim-60 .wp-block-cover__gradient-background,.wp-block-cover.has-background-dim.has-background-dim-60:not(.has-background-gradient):before{opacity:.6}.wp-block-cover-image.has-background-dim.has-background-dim-70 .wp-block-cover__gradient-background,.wp-block-cover-image.has-background-dim.has-background-dim-70:not(.has-background-gradient):before,.wp-block-cover.has-background-dim.has-background-dim-70 .wp-block-cover__gradient-background,.wp-block-cover.has-background-dim.has-background-dim-70:not(.has-background-gradient):before{opacity:.7}.wp-block-cover-image.has-background-dim.has-background-dim-80 .wp-block-cover__gradient-background,.wp-block-cover-image.has-background-dim.has-background-dim-80:not(.has-background-gradient):before,.wp-block-cover.has-background-dim.has-background-dim-80 .wp-block-cover__gradient-background,.wp-block-cover.has-background-dim.has-background-dim-80:not(.has-background-gradient):before{opacity:.8}.wp-block-cover-image.has-background-dim.has-background-dim-90 .wp-block-cover__gradient-background,.wp-block-cover-image.has-background-dim.has-background-dim-90:not(.has-background-gradient):before,.wp-block-cover.has-background-dim.has-background-dim-90 .wp-block-cover__gradient-background,.wp-block-cover.has-background-dim.has-background-dim-90:not(.has-background-gradient):before{opacity:.9}.wp-block-cover-image.has-background-dim.has-background-dim-100 .wp-block-cover__gradient-background,.wp-block-cover-image.has-background-dim.has-background-dim-100:not(.has-background-gradient):before,.wp-block-cover.has-background-dim.has-background-dim-100 .wp-block-cover__gradient-background,.wp-block-cover.has-background-dim.has-background-dim-100:not(.has-background-gradient):before{opacity:1}.wp-block-cover-image .wp-block-cover__gradient-background.has-background-dim.has-background-dim-0,.wp-block-cover .wp-block-cover__gradient-background.has-background-dim.has-background-dim-0{opacity:0}.wp-block-cover-image .wp-block-cover__gradient-background.has-background-dim.has-background-dim-10,.wp-block-cover .wp-block-cover__gradient-background.has-background-dim.has-background-dim-10{opacity:.1}.wp-block-cover-image .wp-block-cover__gradient-background.has-background-dim.has-background-dim-20,.wp-block-cover .wp-block-cover__gradient-background.has-background-dim.has-background-dim-20{opacity:.2}.wp-block-cover-image .wp-block-cover__gradient-background.has-background-dim.has-background-dim-30,.wp-block-cover .wp-block-cover__gradient-background.has-background-dim.has-background-dim-30{opacity:.3}.wp-block-cover-image .wp-block-cover__gradient-background.has-background-dim.has-background-dim-40,.wp-block-cover .wp-block-cover__gradient-background.has-background-dim.has-background-dim-40{opacity:.4}.wp-block-cover-image .wp-block-cover__gradient-background.has-background-dim.has-background-dim-50,.wp-block-cover .wp-block-cover__gradient-background.has-background-dim.has-background-dim-50{opacity:.5}.wp-block-cover-image .wp-block-cover__gradient-background.has-background-dim.has-background-dim-60,.wp-block-cover .wp-block-cover__gradient-background.has-background-dim.has-background-dim-60{opacity:.6}.wp-block-cover-image .wp-block-cover__gradient-background.has-background-dim.has-background-dim-70,.wp-block-cover .wp-block-cover__gradient-background.has-background-dim.has-background-dim-70{opacity:.7}.wp-block-cover-image .wp-block-cover__gradient-background.has-background-dim.has-background-dim-80,.wp-block-cover .wp-block-cover__gradient-background.has-background-dim.has-background-dim-80{opacity:.8}.wp-block-cover-image .wp-block-cover__gradient-background.has-background-dim.has-background-dim-90,.wp-block-cover .wp-block-cover__gradient-background.has-background-dim.has-background-dim-90{opacity:.9}.wp-block-cover-image .wp-block-cover__gradient-background.has-background-dim.has-background-dim-100,.wp-block-cover .wp-block-cover__gradient-background.has-background-dim.has-background-dim-100{opacity:1}.wp-block-cover-image.alignleft,.wp-block-cover-image.alignright,.wp-block-cover.alignleft,.wp-block-cover.alignright{max-width:420px;width:100%}.wp-block-cover-image:after,.wp-block-cover:after{display:block;content:"";font-size:0;min-height:inherit}@supports (position:sticky){.wp-block-cover-image:after,.wp-block-cover:after{content:none}}.wp-block-cover-image.aligncenter,.wp-block-cover-image.alignleft,.wp-block-cover-image.alignright,.wp-block-cover.aligncenter,.wp-block-cover.alignleft,.wp-block-cover.alignright{display:flex}.wp-block-cover-image .wp-block-cover__inner-container,.wp-block-cover .wp-block-cover__inner-container{width:100%;z-index:1;color:#fff}.wp-block-cover-image.is-light .wp-block-cover__inner-container,.wp-block-cover.is-light .wp-block-cover__inner-container{color:#000}.wp-block-cover-image h1:not(.has-text-color),.wp-block-cover-image h2:not(.has-text-color),.wp-block-cover-image h3:not(.has-text-color),.wp-block-cover-image h4:not(.has-text-color),.wp-block-cover-image h5:not(.has-text-color),.wp-block-cover-image h6:not(.has-text-color),.wp-block-cover-image p:not(.has-text-color),.wp-block-cover h1:not(.has-text-color),.wp-block-cover h2:not(.has-text-color),.wp-block-cover h3:not(.has-text-color),.wp-block-cover h4:not(.has-text-color),.wp-block-cover h5:not(.has-text-color),.wp-block-cover h6:not(.has-text-color),.wp-block-cover p:not(.has-text-color){color:inherit}.wp-block-cover-image.is-position-top-left,.wp-block-cover.is-position-top-left{align-items:flex-start;justify-content:flex-start}.wp-block-cover-image.is-position-top-center,.wp-block-cover.is-position-top-center{align-items:flex-start;justify-content:center}.wp-block-cover-image.is-position-top-right,.wp-block-cover.is-position-top-right{align-items:flex-start;justify-content:flex-end}.wp-block-cover-image.is-position-center-left,.wp-block-cover.is-position-center-left{align-items:center;justify-content:flex-start}.wp-block-cover-image.is-position-center-center,.wp-block-cover.is-position-center-center{align-items:center;justify-content:center}.wp-block-cover-image.is-position-center-right,.wp-block-cover.is-position-center-right{align-items:center;justify-content:flex-end}.wp-block-cover-image.is-position-bottom-left,.wp-block-cover.is-position-bottom-left{align-items:flex-end;justify-content:flex-start}.wp-block-cover-image.is-position-bottom-center,.wp-block-cover.is-position-bottom-center{align-items:flex-end;justify-content:center}.wp-block-cover-image.is-position-bottom-right,.wp-block-cover.is-position-bottom-right{align-items:flex-end;justify-content:flex-end}.wp-block-cover-image.has-custom-content-position.has-custom-content-position .wp-block-cover__inner-container,.wp-block-cover.has-custom-content-position.has-custom-content-position .wp-block-cover__inner-container{margin:0;width:auto}.wp-block-cover-image img.wp-block-cover__image-background,.wp-block-cover-image video.wp-block-cover__video-background,.wp-block-cover img.wp-block-cover__image-background,.wp-block-cover video.wp-block-cover__video-background{position:absolute;top:0;right:0;left:0;bottom:0;margin:0;padding:0;width:100%;height:100%;max-width:none;max-height:none;-o-object-fit:cover;object-fit:cover;outline:none;border:none;box-shadow:none}.wp-block-cover__image-background,.wp-block-cover__video-background{z-index:0}.wp-block-cover-image-text,.wp-block-cover-image-text a,.wp-block-cover-image-text a:active,.wp-block-cover-image-text a:focus,.wp-block-cover-image-text a:hover,.wp-block-cover-text,.wp-block-cover-text a,.wp-block-cover-text a:active,.wp-block-cover-text a:focus,.wp-block-cover-text a:hover,section.wp-block-cover-image h2,section.wp-block-cover-image h2 a,section.wp-block-cover-image h2 a:active,section.wp-block-cover-image h2 a:focus,section.wp-block-cover-image h2 a:hover{color:#fff}.wp-block-cover-image .wp-block-cover.has-left-content{justify-content:flex-start}.wp-block-cover-image .wp-block-cover.has-right-content{justify-content:flex-end}.wp-block-cover-image.has-left-content .wp-block-cover-image-text,.wp-block-cover.has-left-content .wp-block-cover-text,section.wp-block-cover-image.has-left-content>h2{margin-right:0;text-align:right}.wp-block-cover-image.has-right-content .wp-block-cover-image-text,.wp-block-cover.has-right-content .wp-block-cover-text,section.wp-block-cover-image.has-right-content>h2{margin-left:0;text-align:left}.wp-block-cover-image .wp-block-cover-image-text,.wp-block-cover .wp-block-cover-text,section.wp-block-cover-image>h2{font-size:2em;line-height:1.25;z-index:1;margin-bottom:0;max-width:840px;padding:.44em;text-align:center} \ No newline at end of file +.wp-block-cover,.wp-block-cover-image{position:relative;background-size:cover;background-position:50%;min-height:430px;width:100%;display:flex;justify-content:center;align-items:center;padding:1em;box-sizing:border-box}.wp-block-cover-image.has-parallax,.wp-block-cover.has-parallax{background-attachment:fixed}@supports (-webkit-overflow-scrolling:touch){.wp-block-cover-image.has-parallax,.wp-block-cover.has-parallax{background-attachment:scroll}}@media (prefers-reduced-motion:reduce){.wp-block-cover-image.has-parallax,.wp-block-cover.has-parallax{background-attachment:scroll}}.wp-block-cover-image.is-repeated,.wp-block-cover.is-repeated{background-repeat:repeat;background-size:auto}.wp-block-cover-image.has-background-dim:not([class*=-background-color]),.wp-block-cover-image .has-background-dim:not([class*=-background-color]),.wp-block-cover.has-background-dim:not([class*=-background-color]),.wp-block-cover .has-background-dim:not([class*=-background-color]){background-color:#000}.wp-block-cover-image .has-background-dim.has-background-gradient,.wp-block-cover .has-background-dim.has-background-gradient{background-color:transparent}.wp-block-cover-image.has-background-dim:before,.wp-block-cover.has-background-dim:before{content:"";background-color:inherit}.wp-block-cover-image.has-background-dim:not(.has-background-gradient):before,.wp-block-cover-image .wp-block-cover__background,.wp-block-cover-image .wp-block-cover__gradient-background,.wp-block-cover.has-background-dim:not(.has-background-gradient):before,.wp-block-cover .wp-block-cover__background,.wp-block-cover .wp-block-cover__gradient-background{position:absolute;top:0;right:0;bottom:0;left:0;z-index:1;opacity:.5}.wp-block-cover-image.has-background-dim.has-background-dim-10 .wp-block-cover__background,.wp-block-cover-image.has-background-dim.has-background-dim-10 .wp-block-cover__gradient-background,.wp-block-cover-image.has-background-dim.has-background-dim-10:not(.has-background-gradient):before,.wp-block-cover.has-background-dim.has-background-dim-10 .wp-block-cover__background,.wp-block-cover.has-background-dim.has-background-dim-10 .wp-block-cover__gradient-background,.wp-block-cover.has-background-dim.has-background-dim-10:not(.has-background-gradient):before{opacity:.1}.wp-block-cover-image.has-background-dim.has-background-dim-20 .wp-block-cover__background,.wp-block-cover-image.has-background-dim.has-background-dim-20 .wp-block-cover__gradient-background,.wp-block-cover-image.has-background-dim.has-background-dim-20:not(.has-background-gradient):before,.wp-block-cover.has-background-dim.has-background-dim-20 .wp-block-cover__background,.wp-block-cover.has-background-dim.has-background-dim-20 .wp-block-cover__gradient-background,.wp-block-cover.has-background-dim.has-background-dim-20:not(.has-background-gradient):before{opacity:.2}.wp-block-cover-image.has-background-dim.has-background-dim-30 .wp-block-cover__background,.wp-block-cover-image.has-background-dim.has-background-dim-30 .wp-block-cover__gradient-background,.wp-block-cover-image.has-background-dim.has-background-dim-30:not(.has-background-gradient):before,.wp-block-cover.has-background-dim.has-background-dim-30 .wp-block-cover__background,.wp-block-cover.has-background-dim.has-background-dim-30 .wp-block-cover__gradient-background,.wp-block-cover.has-background-dim.has-background-dim-30:not(.has-background-gradient):before{opacity:.3}.wp-block-cover-image.has-background-dim.has-background-dim-40 .wp-block-cover__background,.wp-block-cover-image.has-background-dim.has-background-dim-40 .wp-block-cover__gradient-background,.wp-block-cover-image.has-background-dim.has-background-dim-40:not(.has-background-gradient):before,.wp-block-cover.has-background-dim.has-background-dim-40 .wp-block-cover__background,.wp-block-cover.has-background-dim.has-background-dim-40 .wp-block-cover__gradient-background,.wp-block-cover.has-background-dim.has-background-dim-40:not(.has-background-gradient):before{opacity:.4}.wp-block-cover-image.has-background-dim.has-background-dim-50 .wp-block-cover__background,.wp-block-cover-image.has-background-dim.has-background-dim-50 .wp-block-cover__gradient-background,.wp-block-cover-image.has-background-dim.has-background-dim-50:not(.has-background-gradient):before,.wp-block-cover.has-background-dim.has-background-dim-50 .wp-block-cover__background,.wp-block-cover.has-background-dim.has-background-dim-50 .wp-block-cover__gradient-background,.wp-block-cover.has-background-dim.has-background-dim-50:not(.has-background-gradient):before{opacity:.5}.wp-block-cover-image.has-background-dim.has-background-dim-60 .wp-block-cover__background,.wp-block-cover-image.has-background-dim.has-background-dim-60 .wp-block-cover__gradient-background,.wp-block-cover-image.has-background-dim.has-background-dim-60:not(.has-background-gradient):before,.wp-block-cover.has-background-dim.has-background-dim-60 .wp-block-cover__background,.wp-block-cover.has-background-dim.has-background-dim-60 .wp-block-cover__gradient-background,.wp-block-cover.has-background-dim.has-background-dim-60:not(.has-background-gradient):before{opacity:.6}.wp-block-cover-image.has-background-dim.has-background-dim-70 .wp-block-cover__background,.wp-block-cover-image.has-background-dim.has-background-dim-70 .wp-block-cover__gradient-background,.wp-block-cover-image.has-background-dim.has-background-dim-70:not(.has-background-gradient):before,.wp-block-cover.has-background-dim.has-background-dim-70 .wp-block-cover__background,.wp-block-cover.has-background-dim.has-background-dim-70 .wp-block-cover__gradient-background,.wp-block-cover.has-background-dim.has-background-dim-70:not(.has-background-gradient):before{opacity:.7}.wp-block-cover-image.has-background-dim.has-background-dim-80 .wp-block-cover__background,.wp-block-cover-image.has-background-dim.has-background-dim-80 .wp-block-cover__gradient-background,.wp-block-cover-image.has-background-dim.has-background-dim-80:not(.has-background-gradient):before,.wp-block-cover.has-background-dim.has-background-dim-80 .wp-block-cover__background,.wp-block-cover.has-background-dim.has-background-dim-80 .wp-block-cover__gradient-background,.wp-block-cover.has-background-dim.has-background-dim-80:not(.has-background-gradient):before{opacity:.8}.wp-block-cover-image.has-background-dim.has-background-dim-90 .wp-block-cover__background,.wp-block-cover-image.has-background-dim.has-background-dim-90 .wp-block-cover__gradient-background,.wp-block-cover-image.has-background-dim.has-background-dim-90:not(.has-background-gradient):before,.wp-block-cover.has-background-dim.has-background-dim-90 .wp-block-cover__background,.wp-block-cover.has-background-dim.has-background-dim-90 .wp-block-cover__gradient-background,.wp-block-cover.has-background-dim.has-background-dim-90:not(.has-background-gradient):before{opacity:.9}.wp-block-cover-image.has-background-dim.has-background-dim-100 .wp-block-cover__background,.wp-block-cover-image.has-background-dim.has-background-dim-100 .wp-block-cover__gradient-background,.wp-block-cover-image.has-background-dim.has-background-dim-100:not(.has-background-gradient):before,.wp-block-cover.has-background-dim.has-background-dim-100 .wp-block-cover__background,.wp-block-cover.has-background-dim.has-background-dim-100 .wp-block-cover__gradient-background,.wp-block-cover.has-background-dim.has-background-dim-100:not(.has-background-gradient):before{opacity:1}.wp-block-cover-image .wp-block-cover__background.has-background-dim.has-background-dim-0,.wp-block-cover-image .wp-block-cover__gradient-background.has-background-dim.has-background-dim-0,.wp-block-cover .wp-block-cover__background.has-background-dim.has-background-dim-0,.wp-block-cover .wp-block-cover__gradient-background.has-background-dim.has-background-dim-0{opacity:0}.wp-block-cover-image .wp-block-cover__background.has-background-dim.has-background-dim-10,.wp-block-cover-image .wp-block-cover__gradient-background.has-background-dim.has-background-dim-10,.wp-block-cover .wp-block-cover__background.has-background-dim.has-background-dim-10,.wp-block-cover .wp-block-cover__gradient-background.has-background-dim.has-background-dim-10{opacity:.1}.wp-block-cover-image .wp-block-cover__background.has-background-dim.has-background-dim-20,.wp-block-cover-image .wp-block-cover__gradient-background.has-background-dim.has-background-dim-20,.wp-block-cover .wp-block-cover__background.has-background-dim.has-background-dim-20,.wp-block-cover .wp-block-cover__gradient-background.has-background-dim.has-background-dim-20{opacity:.2}.wp-block-cover-image .wp-block-cover__background.has-background-dim.has-background-dim-30,.wp-block-cover-image .wp-block-cover__gradient-background.has-background-dim.has-background-dim-30,.wp-block-cover .wp-block-cover__background.has-background-dim.has-background-dim-30,.wp-block-cover .wp-block-cover__gradient-background.has-background-dim.has-background-dim-30{opacity:.3}.wp-block-cover-image .wp-block-cover__background.has-background-dim.has-background-dim-40,.wp-block-cover-image .wp-block-cover__gradient-background.has-background-dim.has-background-dim-40,.wp-block-cover .wp-block-cover__background.has-background-dim.has-background-dim-40,.wp-block-cover .wp-block-cover__gradient-background.has-background-dim.has-background-dim-40{opacity:.4}.wp-block-cover-image .wp-block-cover__background.has-background-dim.has-background-dim-50,.wp-block-cover-image .wp-block-cover__gradient-background.has-background-dim.has-background-dim-50,.wp-block-cover .wp-block-cover__background.has-background-dim.has-background-dim-50,.wp-block-cover .wp-block-cover__gradient-background.has-background-dim.has-background-dim-50{opacity:.5}.wp-block-cover-image .wp-block-cover__background.has-background-dim.has-background-dim-60,.wp-block-cover-image .wp-block-cover__gradient-background.has-background-dim.has-background-dim-60,.wp-block-cover .wp-block-cover__background.has-background-dim.has-background-dim-60,.wp-block-cover .wp-block-cover__gradient-background.has-background-dim.has-background-dim-60{opacity:.6}.wp-block-cover-image .wp-block-cover__background.has-background-dim.has-background-dim-70,.wp-block-cover-image .wp-block-cover__gradient-background.has-background-dim.has-background-dim-70,.wp-block-cover .wp-block-cover__background.has-background-dim.has-background-dim-70,.wp-block-cover .wp-block-cover__gradient-background.has-background-dim.has-background-dim-70{opacity:.7}.wp-block-cover-image .wp-block-cover__background.has-background-dim.has-background-dim-80,.wp-block-cover-image .wp-block-cover__gradient-background.has-background-dim.has-background-dim-80,.wp-block-cover .wp-block-cover__background.has-background-dim.has-background-dim-80,.wp-block-cover .wp-block-cover__gradient-background.has-background-dim.has-background-dim-80{opacity:.8}.wp-block-cover-image .wp-block-cover__background.has-background-dim.has-background-dim-90,.wp-block-cover-image .wp-block-cover__gradient-background.has-background-dim.has-background-dim-90,.wp-block-cover .wp-block-cover__background.has-background-dim.has-background-dim-90,.wp-block-cover .wp-block-cover__gradient-background.has-background-dim.has-background-dim-90{opacity:.9}.wp-block-cover-image .wp-block-cover__background.has-background-dim.has-background-dim-100,.wp-block-cover-image .wp-block-cover__gradient-background.has-background-dim.has-background-dim-100,.wp-block-cover .wp-block-cover__background.has-background-dim.has-background-dim-100,.wp-block-cover .wp-block-cover__gradient-background.has-background-dim.has-background-dim-100{opacity:1}.wp-block-cover-image .block-library-cover__padding-visualizer,.wp-block-cover .block-library-cover__padding-visualizer{z-index:2}.wp-block-cover-image.alignleft,.wp-block-cover-image.alignright,.wp-block-cover.alignleft,.wp-block-cover.alignright{max-width:420px;width:100%}.wp-block-cover-image:after,.wp-block-cover:after{display:block;content:"";font-size:0;min-height:inherit}@supports (position:sticky){.wp-block-cover-image:after,.wp-block-cover:after{content:none}}.wp-block-cover-image.aligncenter,.wp-block-cover-image.alignleft,.wp-block-cover-image.alignright,.wp-block-cover.aligncenter,.wp-block-cover.alignleft,.wp-block-cover.alignright{display:flex}.wp-block-cover-image .wp-block-cover__inner-container,.wp-block-cover .wp-block-cover__inner-container{width:100%;z-index:1;color:#fff}.wp-block-cover-image.is-light .wp-block-cover__inner-container,.wp-block-cover.is-light .wp-block-cover__inner-container{color:#000}.wp-block-cover-image h1:not(.has-text-color),.wp-block-cover-image h2:not(.has-text-color),.wp-block-cover-image h3:not(.has-text-color),.wp-block-cover-image h4:not(.has-text-color),.wp-block-cover-image h5:not(.has-text-color),.wp-block-cover-image h6:not(.has-text-color),.wp-block-cover-image p:not(.has-text-color),.wp-block-cover h1:not(.has-text-color),.wp-block-cover h2:not(.has-text-color),.wp-block-cover h3:not(.has-text-color),.wp-block-cover h4:not(.has-text-color),.wp-block-cover h5:not(.has-text-color),.wp-block-cover h6:not(.has-text-color),.wp-block-cover p:not(.has-text-color){color:inherit}.wp-block-cover-image.is-position-top-left,.wp-block-cover.is-position-top-left{align-items:flex-start;justify-content:flex-start}.wp-block-cover-image.is-position-top-center,.wp-block-cover.is-position-top-center{align-items:flex-start;justify-content:center}.wp-block-cover-image.is-position-top-right,.wp-block-cover.is-position-top-right{align-items:flex-start;justify-content:flex-end}.wp-block-cover-image.is-position-center-left,.wp-block-cover.is-position-center-left{align-items:center;justify-content:flex-start}.wp-block-cover-image.is-position-center-center,.wp-block-cover.is-position-center-center{align-items:center;justify-content:center}.wp-block-cover-image.is-position-center-right,.wp-block-cover.is-position-center-right{align-items:center;justify-content:flex-end}.wp-block-cover-image.is-position-bottom-left,.wp-block-cover.is-position-bottom-left{align-items:flex-end;justify-content:flex-start}.wp-block-cover-image.is-position-bottom-center,.wp-block-cover.is-position-bottom-center{align-items:flex-end;justify-content:center}.wp-block-cover-image.is-position-bottom-right,.wp-block-cover.is-position-bottom-right{align-items:flex-end;justify-content:flex-end}.wp-block-cover-image.has-custom-content-position.has-custom-content-position .wp-block-cover__inner-container,.wp-block-cover.has-custom-content-position.has-custom-content-position .wp-block-cover__inner-container{margin:0;width:auto}.wp-block-cover-image img.wp-block-cover__image-background,.wp-block-cover-image video.wp-block-cover__video-background,.wp-block-cover img.wp-block-cover__image-background,.wp-block-cover video.wp-block-cover__video-background{position:absolute;top:0;right:0;left:0;bottom:0;margin:0;padding:0;width:100%;height:100%;max-width:none;max-height:none;-o-object-fit:cover;object-fit:cover;outline:none;border:none;box-shadow:none}.wp-block-cover__image-background,.wp-block-cover__video-background{z-index:0}.wp-block-cover-image-text,.wp-block-cover-image-text a,.wp-block-cover-image-text a:active,.wp-block-cover-image-text a:focus,.wp-block-cover-image-text a:hover,.wp-block-cover-text,.wp-block-cover-text a,.wp-block-cover-text a:active,.wp-block-cover-text a:focus,.wp-block-cover-text a:hover,section.wp-block-cover-image h2,section.wp-block-cover-image h2 a,section.wp-block-cover-image h2 a:active,section.wp-block-cover-image h2 a:focus,section.wp-block-cover-image h2 a:hover{color:#fff}.wp-block-cover-image .wp-block-cover.has-left-content{justify-content:flex-start}.wp-block-cover-image .wp-block-cover.has-right-content{justify-content:flex-end}.wp-block-cover-image.has-left-content .wp-block-cover-image-text,.wp-block-cover.has-left-content .wp-block-cover-text,section.wp-block-cover-image.has-left-content>h2{margin-right:0;text-align:right}.wp-block-cover-image.has-right-content .wp-block-cover-image-text,.wp-block-cover.has-right-content .wp-block-cover-text,section.wp-block-cover-image.has-right-content>h2{margin-left:0;text-align:left}.wp-block-cover-image .wp-block-cover-image-text,.wp-block-cover .wp-block-cover-text,section.wp-block-cover-image>h2{font-size:2em;line-height:1.25;z-index:1;margin-bottom:0;max-width:840px;padding:.44em;text-align:center} \ No newline at end of file diff --git a/wp-includes/blocks/cover/style.css b/wp-includes/blocks/cover/style.css index f237595fdc..bcde76dea1 100644 --- a/wp-includes/blocks/cover/style.css +++ b/wp-includes/blocks/cover/style.css @@ -124,18 +124,20 @@ .wp-block-cover .has-background-dim:not([class*=-background-color]) { background-color: #000; } +.wp-block-cover-image .has-background-dim.has-background-gradient, +.wp-block-cover .has-background-dim.has-background-gradient { + background-color: transparent; +} .wp-block-cover-image.has-background-dim::before, -.wp-block-cover-image .has-background-dim::before, -.wp-block-cover.has-background-dim::before, -.wp-block-cover .has-background-dim::before { +.wp-block-cover.has-background-dim::before { content: ""; background-color: inherit; } .wp-block-cover-image.has-background-dim:not(.has-background-gradient)::before, -.wp-block-cover-image .has-background-dim:not(.has-background-gradient)::before, +.wp-block-cover-image .wp-block-cover__background, .wp-block-cover-image .wp-block-cover__gradient-background, .wp-block-cover.has-background-dim:not(.has-background-gradient)::before, -.wp-block-cover .has-background-dim:not(.has-background-gradient)::before, +.wp-block-cover .wp-block-cover__background, .wp-block-cover .wp-block-cover__gradient-background { position: absolute; top: 0; @@ -146,109 +148,155 @@ opacity: 0.5; } .wp-block-cover-image.has-background-dim.has-background-dim-10:not(.has-background-gradient)::before, +.wp-block-cover-image.has-background-dim.has-background-dim-10 .wp-block-cover__background, .wp-block-cover-image.has-background-dim.has-background-dim-10 .wp-block-cover__gradient-background, .wp-block-cover.has-background-dim.has-background-dim-10:not(.has-background-gradient)::before, +.wp-block-cover.has-background-dim.has-background-dim-10 .wp-block-cover__background, .wp-block-cover.has-background-dim.has-background-dim-10 .wp-block-cover__gradient-background { opacity: 0.1; } .wp-block-cover-image.has-background-dim.has-background-dim-20:not(.has-background-gradient)::before, +.wp-block-cover-image.has-background-dim.has-background-dim-20 .wp-block-cover__background, .wp-block-cover-image.has-background-dim.has-background-dim-20 .wp-block-cover__gradient-background, .wp-block-cover.has-background-dim.has-background-dim-20:not(.has-background-gradient)::before, +.wp-block-cover.has-background-dim.has-background-dim-20 .wp-block-cover__background, .wp-block-cover.has-background-dim.has-background-dim-20 .wp-block-cover__gradient-background { opacity: 0.2; } .wp-block-cover-image.has-background-dim.has-background-dim-30:not(.has-background-gradient)::before, +.wp-block-cover-image.has-background-dim.has-background-dim-30 .wp-block-cover__background, .wp-block-cover-image.has-background-dim.has-background-dim-30 .wp-block-cover__gradient-background, .wp-block-cover.has-background-dim.has-background-dim-30:not(.has-background-gradient)::before, +.wp-block-cover.has-background-dim.has-background-dim-30 .wp-block-cover__background, .wp-block-cover.has-background-dim.has-background-dim-30 .wp-block-cover__gradient-background { opacity: 0.3; } .wp-block-cover-image.has-background-dim.has-background-dim-40:not(.has-background-gradient)::before, +.wp-block-cover-image.has-background-dim.has-background-dim-40 .wp-block-cover__background, .wp-block-cover-image.has-background-dim.has-background-dim-40 .wp-block-cover__gradient-background, .wp-block-cover.has-background-dim.has-background-dim-40:not(.has-background-gradient)::before, +.wp-block-cover.has-background-dim.has-background-dim-40 .wp-block-cover__background, .wp-block-cover.has-background-dim.has-background-dim-40 .wp-block-cover__gradient-background { opacity: 0.4; } .wp-block-cover-image.has-background-dim.has-background-dim-50:not(.has-background-gradient)::before, +.wp-block-cover-image.has-background-dim.has-background-dim-50 .wp-block-cover__background, .wp-block-cover-image.has-background-dim.has-background-dim-50 .wp-block-cover__gradient-background, .wp-block-cover.has-background-dim.has-background-dim-50:not(.has-background-gradient)::before, +.wp-block-cover.has-background-dim.has-background-dim-50 .wp-block-cover__background, .wp-block-cover.has-background-dim.has-background-dim-50 .wp-block-cover__gradient-background { opacity: 0.5; } .wp-block-cover-image.has-background-dim.has-background-dim-60:not(.has-background-gradient)::before, +.wp-block-cover-image.has-background-dim.has-background-dim-60 .wp-block-cover__background, .wp-block-cover-image.has-background-dim.has-background-dim-60 .wp-block-cover__gradient-background, .wp-block-cover.has-background-dim.has-background-dim-60:not(.has-background-gradient)::before, +.wp-block-cover.has-background-dim.has-background-dim-60 .wp-block-cover__background, .wp-block-cover.has-background-dim.has-background-dim-60 .wp-block-cover__gradient-background { opacity: 0.6; } .wp-block-cover-image.has-background-dim.has-background-dim-70:not(.has-background-gradient)::before, +.wp-block-cover-image.has-background-dim.has-background-dim-70 .wp-block-cover__background, .wp-block-cover-image.has-background-dim.has-background-dim-70 .wp-block-cover__gradient-background, .wp-block-cover.has-background-dim.has-background-dim-70:not(.has-background-gradient)::before, +.wp-block-cover.has-background-dim.has-background-dim-70 .wp-block-cover__background, .wp-block-cover.has-background-dim.has-background-dim-70 .wp-block-cover__gradient-background { opacity: 0.7; } .wp-block-cover-image.has-background-dim.has-background-dim-80:not(.has-background-gradient)::before, +.wp-block-cover-image.has-background-dim.has-background-dim-80 .wp-block-cover__background, .wp-block-cover-image.has-background-dim.has-background-dim-80 .wp-block-cover__gradient-background, .wp-block-cover.has-background-dim.has-background-dim-80:not(.has-background-gradient)::before, +.wp-block-cover.has-background-dim.has-background-dim-80 .wp-block-cover__background, .wp-block-cover.has-background-dim.has-background-dim-80 .wp-block-cover__gradient-background { opacity: 0.8; } .wp-block-cover-image.has-background-dim.has-background-dim-90:not(.has-background-gradient)::before, +.wp-block-cover-image.has-background-dim.has-background-dim-90 .wp-block-cover__background, .wp-block-cover-image.has-background-dim.has-background-dim-90 .wp-block-cover__gradient-background, .wp-block-cover.has-background-dim.has-background-dim-90:not(.has-background-gradient)::before, +.wp-block-cover.has-background-dim.has-background-dim-90 .wp-block-cover__background, .wp-block-cover.has-background-dim.has-background-dim-90 .wp-block-cover__gradient-background { opacity: 0.9; } .wp-block-cover-image.has-background-dim.has-background-dim-100:not(.has-background-gradient)::before, +.wp-block-cover-image.has-background-dim.has-background-dim-100 .wp-block-cover__background, .wp-block-cover-image.has-background-dim.has-background-dim-100 .wp-block-cover__gradient-background, .wp-block-cover.has-background-dim.has-background-dim-100:not(.has-background-gradient)::before, +.wp-block-cover.has-background-dim.has-background-dim-100 .wp-block-cover__background, .wp-block-cover.has-background-dim.has-background-dim-100 .wp-block-cover__gradient-background { opacity: 1; } .wp-block-cover-image .wp-block-cover__gradient-background.has-background-dim.has-background-dim-0, -.wp-block-cover .wp-block-cover__gradient-background.has-background-dim.has-background-dim-0 { +.wp-block-cover-image .wp-block-cover__background.has-background-dim.has-background-dim-0, +.wp-block-cover .wp-block-cover__gradient-background.has-background-dim.has-background-dim-0, +.wp-block-cover .wp-block-cover__background.has-background-dim.has-background-dim-0 { opacity: 0; } .wp-block-cover-image .wp-block-cover__gradient-background.has-background-dim.has-background-dim-10, -.wp-block-cover .wp-block-cover__gradient-background.has-background-dim.has-background-dim-10 { +.wp-block-cover-image .wp-block-cover__background.has-background-dim.has-background-dim-10, +.wp-block-cover .wp-block-cover__gradient-background.has-background-dim.has-background-dim-10, +.wp-block-cover .wp-block-cover__background.has-background-dim.has-background-dim-10 { opacity: 0.1; } .wp-block-cover-image .wp-block-cover__gradient-background.has-background-dim.has-background-dim-20, -.wp-block-cover .wp-block-cover__gradient-background.has-background-dim.has-background-dim-20 { +.wp-block-cover-image .wp-block-cover__background.has-background-dim.has-background-dim-20, +.wp-block-cover .wp-block-cover__gradient-background.has-background-dim.has-background-dim-20, +.wp-block-cover .wp-block-cover__background.has-background-dim.has-background-dim-20 { opacity: 0.2; } .wp-block-cover-image .wp-block-cover__gradient-background.has-background-dim.has-background-dim-30, -.wp-block-cover .wp-block-cover__gradient-background.has-background-dim.has-background-dim-30 { +.wp-block-cover-image .wp-block-cover__background.has-background-dim.has-background-dim-30, +.wp-block-cover .wp-block-cover__gradient-background.has-background-dim.has-background-dim-30, +.wp-block-cover .wp-block-cover__background.has-background-dim.has-background-dim-30 { opacity: 0.3; } .wp-block-cover-image .wp-block-cover__gradient-background.has-background-dim.has-background-dim-40, -.wp-block-cover .wp-block-cover__gradient-background.has-background-dim.has-background-dim-40 { +.wp-block-cover-image .wp-block-cover__background.has-background-dim.has-background-dim-40, +.wp-block-cover .wp-block-cover__gradient-background.has-background-dim.has-background-dim-40, +.wp-block-cover .wp-block-cover__background.has-background-dim.has-background-dim-40 { opacity: 0.4; } .wp-block-cover-image .wp-block-cover__gradient-background.has-background-dim.has-background-dim-50, -.wp-block-cover .wp-block-cover__gradient-background.has-background-dim.has-background-dim-50 { +.wp-block-cover-image .wp-block-cover__background.has-background-dim.has-background-dim-50, +.wp-block-cover .wp-block-cover__gradient-background.has-background-dim.has-background-dim-50, +.wp-block-cover .wp-block-cover__background.has-background-dim.has-background-dim-50 { opacity: 0.5; } .wp-block-cover-image .wp-block-cover__gradient-background.has-background-dim.has-background-dim-60, -.wp-block-cover .wp-block-cover__gradient-background.has-background-dim.has-background-dim-60 { +.wp-block-cover-image .wp-block-cover__background.has-background-dim.has-background-dim-60, +.wp-block-cover .wp-block-cover__gradient-background.has-background-dim.has-background-dim-60, +.wp-block-cover .wp-block-cover__background.has-background-dim.has-background-dim-60 { opacity: 0.6; } .wp-block-cover-image .wp-block-cover__gradient-background.has-background-dim.has-background-dim-70, -.wp-block-cover .wp-block-cover__gradient-background.has-background-dim.has-background-dim-70 { +.wp-block-cover-image .wp-block-cover__background.has-background-dim.has-background-dim-70, +.wp-block-cover .wp-block-cover__gradient-background.has-background-dim.has-background-dim-70, +.wp-block-cover .wp-block-cover__background.has-background-dim.has-background-dim-70 { opacity: 0.7; } .wp-block-cover-image .wp-block-cover__gradient-background.has-background-dim.has-background-dim-80, -.wp-block-cover .wp-block-cover__gradient-background.has-background-dim.has-background-dim-80 { +.wp-block-cover-image .wp-block-cover__background.has-background-dim.has-background-dim-80, +.wp-block-cover .wp-block-cover__gradient-background.has-background-dim.has-background-dim-80, +.wp-block-cover .wp-block-cover__background.has-background-dim.has-background-dim-80 { opacity: 0.8; } .wp-block-cover-image .wp-block-cover__gradient-background.has-background-dim.has-background-dim-90, -.wp-block-cover .wp-block-cover__gradient-background.has-background-dim.has-background-dim-90 { +.wp-block-cover-image .wp-block-cover__background.has-background-dim.has-background-dim-90, +.wp-block-cover .wp-block-cover__gradient-background.has-background-dim.has-background-dim-90, +.wp-block-cover .wp-block-cover__background.has-background-dim.has-background-dim-90 { opacity: 0.9; } .wp-block-cover-image .wp-block-cover__gradient-background.has-background-dim.has-background-dim-100, -.wp-block-cover .wp-block-cover__gradient-background.has-background-dim.has-background-dim-100 { +.wp-block-cover-image .wp-block-cover__background.has-background-dim.has-background-dim-100, +.wp-block-cover .wp-block-cover__gradient-background.has-background-dim.has-background-dim-100, +.wp-block-cover .wp-block-cover__background.has-background-dim.has-background-dim-100 { opacity: 1; } +.wp-block-cover-image .block-library-cover__padding-visualizer, +.wp-block-cover .block-library-cover__padding-visualizer { + z-index: 2; +} .wp-block-cover-image.alignleft, .wp-block-cover-image.alignright, .wp-block-cover.alignleft, .wp-block-cover.alignright { diff --git a/wp-includes/blocks/cover/style.min.css b/wp-includes/blocks/cover/style.min.css index b3aaaad2c8..516957e03c 100644 --- a/wp-includes/blocks/cover/style.min.css +++ b/wp-includes/blocks/cover/style.min.css @@ -1 +1 @@ -.wp-block-cover,.wp-block-cover-image{position:relative;background-size:cover;background-position:50%;min-height:430px;width:100%;display:flex;justify-content:center;align-items:center;padding:1em;box-sizing:border-box}.wp-block-cover-image.has-parallax,.wp-block-cover.has-parallax{background-attachment:fixed}@supports (-webkit-overflow-scrolling:touch){.wp-block-cover-image.has-parallax,.wp-block-cover.has-parallax{background-attachment:scroll}}@media (prefers-reduced-motion:reduce){.wp-block-cover-image.has-parallax,.wp-block-cover.has-parallax{background-attachment:scroll}}.wp-block-cover-image.is-repeated,.wp-block-cover.is-repeated{background-repeat:repeat;background-size:auto}.wp-block-cover-image.has-background-dim:not([class*=-background-color]),.wp-block-cover-image .has-background-dim:not([class*=-background-color]),.wp-block-cover.has-background-dim:not([class*=-background-color]),.wp-block-cover .has-background-dim:not([class*=-background-color]){background-color:#000}.wp-block-cover-image.has-background-dim:before,.wp-block-cover-image .has-background-dim:before,.wp-block-cover.has-background-dim:before,.wp-block-cover .has-background-dim:before{content:"";background-color:inherit}.wp-block-cover-image.has-background-dim:not(.has-background-gradient):before,.wp-block-cover-image .has-background-dim:not(.has-background-gradient):before,.wp-block-cover-image .wp-block-cover__gradient-background,.wp-block-cover.has-background-dim:not(.has-background-gradient):before,.wp-block-cover .has-background-dim:not(.has-background-gradient):before,.wp-block-cover .wp-block-cover__gradient-background{position:absolute;top:0;left:0;bottom:0;right:0;z-index:1;opacity:.5}.wp-block-cover-image.has-background-dim.has-background-dim-10 .wp-block-cover__gradient-background,.wp-block-cover-image.has-background-dim.has-background-dim-10:not(.has-background-gradient):before,.wp-block-cover.has-background-dim.has-background-dim-10 .wp-block-cover__gradient-background,.wp-block-cover.has-background-dim.has-background-dim-10:not(.has-background-gradient):before{opacity:.1}.wp-block-cover-image.has-background-dim.has-background-dim-20 .wp-block-cover__gradient-background,.wp-block-cover-image.has-background-dim.has-background-dim-20:not(.has-background-gradient):before,.wp-block-cover.has-background-dim.has-background-dim-20 .wp-block-cover__gradient-background,.wp-block-cover.has-background-dim.has-background-dim-20:not(.has-background-gradient):before{opacity:.2}.wp-block-cover-image.has-background-dim.has-background-dim-30 .wp-block-cover__gradient-background,.wp-block-cover-image.has-background-dim.has-background-dim-30:not(.has-background-gradient):before,.wp-block-cover.has-background-dim.has-background-dim-30 .wp-block-cover__gradient-background,.wp-block-cover.has-background-dim.has-background-dim-30:not(.has-background-gradient):before{opacity:.3}.wp-block-cover-image.has-background-dim.has-background-dim-40 .wp-block-cover__gradient-background,.wp-block-cover-image.has-background-dim.has-background-dim-40:not(.has-background-gradient):before,.wp-block-cover.has-background-dim.has-background-dim-40 .wp-block-cover__gradient-background,.wp-block-cover.has-background-dim.has-background-dim-40:not(.has-background-gradient):before{opacity:.4}.wp-block-cover-image.has-background-dim.has-background-dim-50 .wp-block-cover__gradient-background,.wp-block-cover-image.has-background-dim.has-background-dim-50:not(.has-background-gradient):before,.wp-block-cover.has-background-dim.has-background-dim-50 .wp-block-cover__gradient-background,.wp-block-cover.has-background-dim.has-background-dim-50:not(.has-background-gradient):before{opacity:.5}.wp-block-cover-image.has-background-dim.has-background-dim-60 .wp-block-cover__gradient-background,.wp-block-cover-image.has-background-dim.has-background-dim-60:not(.has-background-gradient):before,.wp-block-cover.has-background-dim.has-background-dim-60 .wp-block-cover__gradient-background,.wp-block-cover.has-background-dim.has-background-dim-60:not(.has-background-gradient):before{opacity:.6}.wp-block-cover-image.has-background-dim.has-background-dim-70 .wp-block-cover__gradient-background,.wp-block-cover-image.has-background-dim.has-background-dim-70:not(.has-background-gradient):before,.wp-block-cover.has-background-dim.has-background-dim-70 .wp-block-cover__gradient-background,.wp-block-cover.has-background-dim.has-background-dim-70:not(.has-background-gradient):before{opacity:.7}.wp-block-cover-image.has-background-dim.has-background-dim-80 .wp-block-cover__gradient-background,.wp-block-cover-image.has-background-dim.has-background-dim-80:not(.has-background-gradient):before,.wp-block-cover.has-background-dim.has-background-dim-80 .wp-block-cover__gradient-background,.wp-block-cover.has-background-dim.has-background-dim-80:not(.has-background-gradient):before{opacity:.8}.wp-block-cover-image.has-background-dim.has-background-dim-90 .wp-block-cover__gradient-background,.wp-block-cover-image.has-background-dim.has-background-dim-90:not(.has-background-gradient):before,.wp-block-cover.has-background-dim.has-background-dim-90 .wp-block-cover__gradient-background,.wp-block-cover.has-background-dim.has-background-dim-90:not(.has-background-gradient):before{opacity:.9}.wp-block-cover-image.has-background-dim.has-background-dim-100 .wp-block-cover__gradient-background,.wp-block-cover-image.has-background-dim.has-background-dim-100:not(.has-background-gradient):before,.wp-block-cover.has-background-dim.has-background-dim-100 .wp-block-cover__gradient-background,.wp-block-cover.has-background-dim.has-background-dim-100:not(.has-background-gradient):before{opacity:1}.wp-block-cover-image .wp-block-cover__gradient-background.has-background-dim.has-background-dim-0,.wp-block-cover .wp-block-cover__gradient-background.has-background-dim.has-background-dim-0{opacity:0}.wp-block-cover-image .wp-block-cover__gradient-background.has-background-dim.has-background-dim-10,.wp-block-cover .wp-block-cover__gradient-background.has-background-dim.has-background-dim-10{opacity:.1}.wp-block-cover-image .wp-block-cover__gradient-background.has-background-dim.has-background-dim-20,.wp-block-cover .wp-block-cover__gradient-background.has-background-dim.has-background-dim-20{opacity:.2}.wp-block-cover-image .wp-block-cover__gradient-background.has-background-dim.has-background-dim-30,.wp-block-cover .wp-block-cover__gradient-background.has-background-dim.has-background-dim-30{opacity:.3}.wp-block-cover-image .wp-block-cover__gradient-background.has-background-dim.has-background-dim-40,.wp-block-cover .wp-block-cover__gradient-background.has-background-dim.has-background-dim-40{opacity:.4}.wp-block-cover-image .wp-block-cover__gradient-background.has-background-dim.has-background-dim-50,.wp-block-cover .wp-block-cover__gradient-background.has-background-dim.has-background-dim-50{opacity:.5}.wp-block-cover-image .wp-block-cover__gradient-background.has-background-dim.has-background-dim-60,.wp-block-cover .wp-block-cover__gradient-background.has-background-dim.has-background-dim-60{opacity:.6}.wp-block-cover-image .wp-block-cover__gradient-background.has-background-dim.has-background-dim-70,.wp-block-cover .wp-block-cover__gradient-background.has-background-dim.has-background-dim-70{opacity:.7}.wp-block-cover-image .wp-block-cover__gradient-background.has-background-dim.has-background-dim-80,.wp-block-cover .wp-block-cover__gradient-background.has-background-dim.has-background-dim-80{opacity:.8}.wp-block-cover-image .wp-block-cover__gradient-background.has-background-dim.has-background-dim-90,.wp-block-cover .wp-block-cover__gradient-background.has-background-dim.has-background-dim-90{opacity:.9}.wp-block-cover-image .wp-block-cover__gradient-background.has-background-dim.has-background-dim-100,.wp-block-cover .wp-block-cover__gradient-background.has-background-dim.has-background-dim-100{opacity:1}.wp-block-cover-image.alignleft,.wp-block-cover-image.alignright,.wp-block-cover.alignleft,.wp-block-cover.alignright{max-width:420px;width:100%}.wp-block-cover-image:after,.wp-block-cover:after{display:block;content:"";font-size:0;min-height:inherit}@supports (position:sticky){.wp-block-cover-image:after,.wp-block-cover:after{content:none}}.wp-block-cover-image.aligncenter,.wp-block-cover-image.alignleft,.wp-block-cover-image.alignright,.wp-block-cover.aligncenter,.wp-block-cover.alignleft,.wp-block-cover.alignright{display:flex}.wp-block-cover-image .wp-block-cover__inner-container,.wp-block-cover .wp-block-cover__inner-container{width:100%;z-index:1;color:#fff}.wp-block-cover-image.is-light .wp-block-cover__inner-container,.wp-block-cover.is-light .wp-block-cover__inner-container{color:#000}.wp-block-cover-image h1:not(.has-text-color),.wp-block-cover-image h2:not(.has-text-color),.wp-block-cover-image h3:not(.has-text-color),.wp-block-cover-image h4:not(.has-text-color),.wp-block-cover-image h5:not(.has-text-color),.wp-block-cover-image h6:not(.has-text-color),.wp-block-cover-image p:not(.has-text-color),.wp-block-cover h1:not(.has-text-color),.wp-block-cover h2:not(.has-text-color),.wp-block-cover h3:not(.has-text-color),.wp-block-cover h4:not(.has-text-color),.wp-block-cover h5:not(.has-text-color),.wp-block-cover h6:not(.has-text-color),.wp-block-cover p:not(.has-text-color){color:inherit}.wp-block-cover-image.is-position-top-left,.wp-block-cover.is-position-top-left{align-items:flex-start;justify-content:flex-start}.wp-block-cover-image.is-position-top-center,.wp-block-cover.is-position-top-center{align-items:flex-start;justify-content:center}.wp-block-cover-image.is-position-top-right,.wp-block-cover.is-position-top-right{align-items:flex-start;justify-content:flex-end}.wp-block-cover-image.is-position-center-left,.wp-block-cover.is-position-center-left{align-items:center;justify-content:flex-start}.wp-block-cover-image.is-position-center-center,.wp-block-cover.is-position-center-center{align-items:center;justify-content:center}.wp-block-cover-image.is-position-center-right,.wp-block-cover.is-position-center-right{align-items:center;justify-content:flex-end}.wp-block-cover-image.is-position-bottom-left,.wp-block-cover.is-position-bottom-left{align-items:flex-end;justify-content:flex-start}.wp-block-cover-image.is-position-bottom-center,.wp-block-cover.is-position-bottom-center{align-items:flex-end;justify-content:center}.wp-block-cover-image.is-position-bottom-right,.wp-block-cover.is-position-bottom-right{align-items:flex-end;justify-content:flex-end}.wp-block-cover-image.has-custom-content-position.has-custom-content-position .wp-block-cover__inner-container,.wp-block-cover.has-custom-content-position.has-custom-content-position .wp-block-cover__inner-container{margin:0;width:auto}.wp-block-cover-image img.wp-block-cover__image-background,.wp-block-cover-image video.wp-block-cover__video-background,.wp-block-cover img.wp-block-cover__image-background,.wp-block-cover video.wp-block-cover__video-background{position:absolute;top:0;left:0;right:0;bottom:0;margin:0;padding:0;width:100%;height:100%;max-width:none;max-height:none;-o-object-fit:cover;object-fit:cover;outline:none;border:none;box-shadow:none}.wp-block-cover__image-background,.wp-block-cover__video-background{z-index:0}.wp-block-cover-image-text,.wp-block-cover-image-text a,.wp-block-cover-image-text a:active,.wp-block-cover-image-text a:focus,.wp-block-cover-image-text a:hover,.wp-block-cover-text,.wp-block-cover-text a,.wp-block-cover-text a:active,.wp-block-cover-text a:focus,.wp-block-cover-text a:hover,section.wp-block-cover-image h2,section.wp-block-cover-image h2 a,section.wp-block-cover-image h2 a:active,section.wp-block-cover-image h2 a:focus,section.wp-block-cover-image h2 a:hover{color:#fff}.wp-block-cover-image .wp-block-cover.has-left-content{justify-content:flex-start}.wp-block-cover-image .wp-block-cover.has-right-content{justify-content:flex-end}.wp-block-cover-image.has-left-content .wp-block-cover-image-text,.wp-block-cover.has-left-content .wp-block-cover-text,section.wp-block-cover-image.has-left-content>h2{margin-left:0;text-align:left}.wp-block-cover-image.has-right-content .wp-block-cover-image-text,.wp-block-cover.has-right-content .wp-block-cover-text,section.wp-block-cover-image.has-right-content>h2{margin-right:0;text-align:right}.wp-block-cover-image .wp-block-cover-image-text,.wp-block-cover .wp-block-cover-text,section.wp-block-cover-image>h2{font-size:2em;line-height:1.25;z-index:1;margin-bottom:0;max-width:840px;padding:.44em;text-align:center} \ No newline at end of file +.wp-block-cover,.wp-block-cover-image{position:relative;background-size:cover;background-position:50%;min-height:430px;width:100%;display:flex;justify-content:center;align-items:center;padding:1em;box-sizing:border-box}.wp-block-cover-image.has-parallax,.wp-block-cover.has-parallax{background-attachment:fixed}@supports (-webkit-overflow-scrolling:touch){.wp-block-cover-image.has-parallax,.wp-block-cover.has-parallax{background-attachment:scroll}}@media (prefers-reduced-motion:reduce){.wp-block-cover-image.has-parallax,.wp-block-cover.has-parallax{background-attachment:scroll}}.wp-block-cover-image.is-repeated,.wp-block-cover.is-repeated{background-repeat:repeat;background-size:auto}.wp-block-cover-image.has-background-dim:not([class*=-background-color]),.wp-block-cover-image .has-background-dim:not([class*=-background-color]),.wp-block-cover.has-background-dim:not([class*=-background-color]),.wp-block-cover .has-background-dim:not([class*=-background-color]){background-color:#000}.wp-block-cover-image .has-background-dim.has-background-gradient,.wp-block-cover .has-background-dim.has-background-gradient{background-color:transparent}.wp-block-cover-image.has-background-dim:before,.wp-block-cover.has-background-dim:before{content:"";background-color:inherit}.wp-block-cover-image.has-background-dim:not(.has-background-gradient):before,.wp-block-cover-image .wp-block-cover__background,.wp-block-cover-image .wp-block-cover__gradient-background,.wp-block-cover.has-background-dim:not(.has-background-gradient):before,.wp-block-cover .wp-block-cover__background,.wp-block-cover .wp-block-cover__gradient-background{position:absolute;top:0;left:0;bottom:0;right:0;z-index:1;opacity:.5}.wp-block-cover-image.has-background-dim.has-background-dim-10 .wp-block-cover__background,.wp-block-cover-image.has-background-dim.has-background-dim-10 .wp-block-cover__gradient-background,.wp-block-cover-image.has-background-dim.has-background-dim-10:not(.has-background-gradient):before,.wp-block-cover.has-background-dim.has-background-dim-10 .wp-block-cover__background,.wp-block-cover.has-background-dim.has-background-dim-10 .wp-block-cover__gradient-background,.wp-block-cover.has-background-dim.has-background-dim-10:not(.has-background-gradient):before{opacity:.1}.wp-block-cover-image.has-background-dim.has-background-dim-20 .wp-block-cover__background,.wp-block-cover-image.has-background-dim.has-background-dim-20 .wp-block-cover__gradient-background,.wp-block-cover-image.has-background-dim.has-background-dim-20:not(.has-background-gradient):before,.wp-block-cover.has-background-dim.has-background-dim-20 .wp-block-cover__background,.wp-block-cover.has-background-dim.has-background-dim-20 .wp-block-cover__gradient-background,.wp-block-cover.has-background-dim.has-background-dim-20:not(.has-background-gradient):before{opacity:.2}.wp-block-cover-image.has-background-dim.has-background-dim-30 .wp-block-cover__background,.wp-block-cover-image.has-background-dim.has-background-dim-30 .wp-block-cover__gradient-background,.wp-block-cover-image.has-background-dim.has-background-dim-30:not(.has-background-gradient):before,.wp-block-cover.has-background-dim.has-background-dim-30 .wp-block-cover__background,.wp-block-cover.has-background-dim.has-background-dim-30 .wp-block-cover__gradient-background,.wp-block-cover.has-background-dim.has-background-dim-30:not(.has-background-gradient):before{opacity:.3}.wp-block-cover-image.has-background-dim.has-background-dim-40 .wp-block-cover__background,.wp-block-cover-image.has-background-dim.has-background-dim-40 .wp-block-cover__gradient-background,.wp-block-cover-image.has-background-dim.has-background-dim-40:not(.has-background-gradient):before,.wp-block-cover.has-background-dim.has-background-dim-40 .wp-block-cover__background,.wp-block-cover.has-background-dim.has-background-dim-40 .wp-block-cover__gradient-background,.wp-block-cover.has-background-dim.has-background-dim-40:not(.has-background-gradient):before{opacity:.4}.wp-block-cover-image.has-background-dim.has-background-dim-50 .wp-block-cover__background,.wp-block-cover-image.has-background-dim.has-background-dim-50 .wp-block-cover__gradient-background,.wp-block-cover-image.has-background-dim.has-background-dim-50:not(.has-background-gradient):before,.wp-block-cover.has-background-dim.has-background-dim-50 .wp-block-cover__background,.wp-block-cover.has-background-dim.has-background-dim-50 .wp-block-cover__gradient-background,.wp-block-cover.has-background-dim.has-background-dim-50:not(.has-background-gradient):before{opacity:.5}.wp-block-cover-image.has-background-dim.has-background-dim-60 .wp-block-cover__background,.wp-block-cover-image.has-background-dim.has-background-dim-60 .wp-block-cover__gradient-background,.wp-block-cover-image.has-background-dim.has-background-dim-60:not(.has-background-gradient):before,.wp-block-cover.has-background-dim.has-background-dim-60 .wp-block-cover__background,.wp-block-cover.has-background-dim.has-background-dim-60 .wp-block-cover__gradient-background,.wp-block-cover.has-background-dim.has-background-dim-60:not(.has-background-gradient):before{opacity:.6}.wp-block-cover-image.has-background-dim.has-background-dim-70 .wp-block-cover__background,.wp-block-cover-image.has-background-dim.has-background-dim-70 .wp-block-cover__gradient-background,.wp-block-cover-image.has-background-dim.has-background-dim-70:not(.has-background-gradient):before,.wp-block-cover.has-background-dim.has-background-dim-70 .wp-block-cover__background,.wp-block-cover.has-background-dim.has-background-dim-70 .wp-block-cover__gradient-background,.wp-block-cover.has-background-dim.has-background-dim-70:not(.has-background-gradient):before{opacity:.7}.wp-block-cover-image.has-background-dim.has-background-dim-80 .wp-block-cover__background,.wp-block-cover-image.has-background-dim.has-background-dim-80 .wp-block-cover__gradient-background,.wp-block-cover-image.has-background-dim.has-background-dim-80:not(.has-background-gradient):before,.wp-block-cover.has-background-dim.has-background-dim-80 .wp-block-cover__background,.wp-block-cover.has-background-dim.has-background-dim-80 .wp-block-cover__gradient-background,.wp-block-cover.has-background-dim.has-background-dim-80:not(.has-background-gradient):before{opacity:.8}.wp-block-cover-image.has-background-dim.has-background-dim-90 .wp-block-cover__background,.wp-block-cover-image.has-background-dim.has-background-dim-90 .wp-block-cover__gradient-background,.wp-block-cover-image.has-background-dim.has-background-dim-90:not(.has-background-gradient):before,.wp-block-cover.has-background-dim.has-background-dim-90 .wp-block-cover__background,.wp-block-cover.has-background-dim.has-background-dim-90 .wp-block-cover__gradient-background,.wp-block-cover.has-background-dim.has-background-dim-90:not(.has-background-gradient):before{opacity:.9}.wp-block-cover-image.has-background-dim.has-background-dim-100 .wp-block-cover__background,.wp-block-cover-image.has-background-dim.has-background-dim-100 .wp-block-cover__gradient-background,.wp-block-cover-image.has-background-dim.has-background-dim-100:not(.has-background-gradient):before,.wp-block-cover.has-background-dim.has-background-dim-100 .wp-block-cover__background,.wp-block-cover.has-background-dim.has-background-dim-100 .wp-block-cover__gradient-background,.wp-block-cover.has-background-dim.has-background-dim-100:not(.has-background-gradient):before{opacity:1}.wp-block-cover-image .wp-block-cover__background.has-background-dim.has-background-dim-0,.wp-block-cover-image .wp-block-cover__gradient-background.has-background-dim.has-background-dim-0,.wp-block-cover .wp-block-cover__background.has-background-dim.has-background-dim-0,.wp-block-cover .wp-block-cover__gradient-background.has-background-dim.has-background-dim-0{opacity:0}.wp-block-cover-image .wp-block-cover__background.has-background-dim.has-background-dim-10,.wp-block-cover-image .wp-block-cover__gradient-background.has-background-dim.has-background-dim-10,.wp-block-cover .wp-block-cover__background.has-background-dim.has-background-dim-10,.wp-block-cover .wp-block-cover__gradient-background.has-background-dim.has-background-dim-10{opacity:.1}.wp-block-cover-image .wp-block-cover__background.has-background-dim.has-background-dim-20,.wp-block-cover-image .wp-block-cover__gradient-background.has-background-dim.has-background-dim-20,.wp-block-cover .wp-block-cover__background.has-background-dim.has-background-dim-20,.wp-block-cover .wp-block-cover__gradient-background.has-background-dim.has-background-dim-20{opacity:.2}.wp-block-cover-image .wp-block-cover__background.has-background-dim.has-background-dim-30,.wp-block-cover-image .wp-block-cover__gradient-background.has-background-dim.has-background-dim-30,.wp-block-cover .wp-block-cover__background.has-background-dim.has-background-dim-30,.wp-block-cover .wp-block-cover__gradient-background.has-background-dim.has-background-dim-30{opacity:.3}.wp-block-cover-image .wp-block-cover__background.has-background-dim.has-background-dim-40,.wp-block-cover-image .wp-block-cover__gradient-background.has-background-dim.has-background-dim-40,.wp-block-cover .wp-block-cover__background.has-background-dim.has-background-dim-40,.wp-block-cover .wp-block-cover__gradient-background.has-background-dim.has-background-dim-40{opacity:.4}.wp-block-cover-image .wp-block-cover__background.has-background-dim.has-background-dim-50,.wp-block-cover-image .wp-block-cover__gradient-background.has-background-dim.has-background-dim-50,.wp-block-cover .wp-block-cover__background.has-background-dim.has-background-dim-50,.wp-block-cover .wp-block-cover__gradient-background.has-background-dim.has-background-dim-50{opacity:.5}.wp-block-cover-image .wp-block-cover__background.has-background-dim.has-background-dim-60,.wp-block-cover-image .wp-block-cover__gradient-background.has-background-dim.has-background-dim-60,.wp-block-cover .wp-block-cover__background.has-background-dim.has-background-dim-60,.wp-block-cover .wp-block-cover__gradient-background.has-background-dim.has-background-dim-60{opacity:.6}.wp-block-cover-image .wp-block-cover__background.has-background-dim.has-background-dim-70,.wp-block-cover-image .wp-block-cover__gradient-background.has-background-dim.has-background-dim-70,.wp-block-cover .wp-block-cover__background.has-background-dim.has-background-dim-70,.wp-block-cover .wp-block-cover__gradient-background.has-background-dim.has-background-dim-70{opacity:.7}.wp-block-cover-image .wp-block-cover__background.has-background-dim.has-background-dim-80,.wp-block-cover-image .wp-block-cover__gradient-background.has-background-dim.has-background-dim-80,.wp-block-cover .wp-block-cover__background.has-background-dim.has-background-dim-80,.wp-block-cover .wp-block-cover__gradient-background.has-background-dim.has-background-dim-80{opacity:.8}.wp-block-cover-image .wp-block-cover__background.has-background-dim.has-background-dim-90,.wp-block-cover-image .wp-block-cover__gradient-background.has-background-dim.has-background-dim-90,.wp-block-cover .wp-block-cover__background.has-background-dim.has-background-dim-90,.wp-block-cover .wp-block-cover__gradient-background.has-background-dim.has-background-dim-90{opacity:.9}.wp-block-cover-image .wp-block-cover__background.has-background-dim.has-background-dim-100,.wp-block-cover-image .wp-block-cover__gradient-background.has-background-dim.has-background-dim-100,.wp-block-cover .wp-block-cover__background.has-background-dim.has-background-dim-100,.wp-block-cover .wp-block-cover__gradient-background.has-background-dim.has-background-dim-100{opacity:1}.wp-block-cover-image .block-library-cover__padding-visualizer,.wp-block-cover .block-library-cover__padding-visualizer{z-index:2}.wp-block-cover-image.alignleft,.wp-block-cover-image.alignright,.wp-block-cover.alignleft,.wp-block-cover.alignright{max-width:420px;width:100%}.wp-block-cover-image:after,.wp-block-cover:after{display:block;content:"";font-size:0;min-height:inherit}@supports (position:sticky){.wp-block-cover-image:after,.wp-block-cover:after{content:none}}.wp-block-cover-image.aligncenter,.wp-block-cover-image.alignleft,.wp-block-cover-image.alignright,.wp-block-cover.aligncenter,.wp-block-cover.alignleft,.wp-block-cover.alignright{display:flex}.wp-block-cover-image .wp-block-cover__inner-container,.wp-block-cover .wp-block-cover__inner-container{width:100%;z-index:1;color:#fff}.wp-block-cover-image.is-light .wp-block-cover__inner-container,.wp-block-cover.is-light .wp-block-cover__inner-container{color:#000}.wp-block-cover-image h1:not(.has-text-color),.wp-block-cover-image h2:not(.has-text-color),.wp-block-cover-image h3:not(.has-text-color),.wp-block-cover-image h4:not(.has-text-color),.wp-block-cover-image h5:not(.has-text-color),.wp-block-cover-image h6:not(.has-text-color),.wp-block-cover-image p:not(.has-text-color),.wp-block-cover h1:not(.has-text-color),.wp-block-cover h2:not(.has-text-color),.wp-block-cover h3:not(.has-text-color),.wp-block-cover h4:not(.has-text-color),.wp-block-cover h5:not(.has-text-color),.wp-block-cover h6:not(.has-text-color),.wp-block-cover p:not(.has-text-color){color:inherit}.wp-block-cover-image.is-position-top-left,.wp-block-cover.is-position-top-left{align-items:flex-start;justify-content:flex-start}.wp-block-cover-image.is-position-top-center,.wp-block-cover.is-position-top-center{align-items:flex-start;justify-content:center}.wp-block-cover-image.is-position-top-right,.wp-block-cover.is-position-top-right{align-items:flex-start;justify-content:flex-end}.wp-block-cover-image.is-position-center-left,.wp-block-cover.is-position-center-left{align-items:center;justify-content:flex-start}.wp-block-cover-image.is-position-center-center,.wp-block-cover.is-position-center-center{align-items:center;justify-content:center}.wp-block-cover-image.is-position-center-right,.wp-block-cover.is-position-center-right{align-items:center;justify-content:flex-end}.wp-block-cover-image.is-position-bottom-left,.wp-block-cover.is-position-bottom-left{align-items:flex-end;justify-content:flex-start}.wp-block-cover-image.is-position-bottom-center,.wp-block-cover.is-position-bottom-center{align-items:flex-end;justify-content:center}.wp-block-cover-image.is-position-bottom-right,.wp-block-cover.is-position-bottom-right{align-items:flex-end;justify-content:flex-end}.wp-block-cover-image.has-custom-content-position.has-custom-content-position .wp-block-cover__inner-container,.wp-block-cover.has-custom-content-position.has-custom-content-position .wp-block-cover__inner-container{margin:0;width:auto}.wp-block-cover-image img.wp-block-cover__image-background,.wp-block-cover-image video.wp-block-cover__video-background,.wp-block-cover img.wp-block-cover__image-background,.wp-block-cover video.wp-block-cover__video-background{position:absolute;top:0;left:0;right:0;bottom:0;margin:0;padding:0;width:100%;height:100%;max-width:none;max-height:none;-o-object-fit:cover;object-fit:cover;outline:none;border:none;box-shadow:none}.wp-block-cover__image-background,.wp-block-cover__video-background{z-index:0}.wp-block-cover-image-text,.wp-block-cover-image-text a,.wp-block-cover-image-text a:active,.wp-block-cover-image-text a:focus,.wp-block-cover-image-text a:hover,.wp-block-cover-text,.wp-block-cover-text a,.wp-block-cover-text a:active,.wp-block-cover-text a:focus,.wp-block-cover-text a:hover,section.wp-block-cover-image h2,section.wp-block-cover-image h2 a,section.wp-block-cover-image h2 a:active,section.wp-block-cover-image h2 a:focus,section.wp-block-cover-image h2 a:hover{color:#fff}.wp-block-cover-image .wp-block-cover.has-left-content{justify-content:flex-start}.wp-block-cover-image .wp-block-cover.has-right-content{justify-content:flex-end}.wp-block-cover-image.has-left-content .wp-block-cover-image-text,.wp-block-cover.has-left-content .wp-block-cover-text,section.wp-block-cover-image.has-left-content>h2{margin-left:0;text-align:left}.wp-block-cover-image.has-right-content .wp-block-cover-image-text,.wp-block-cover.has-right-content .wp-block-cover-text,section.wp-block-cover-image.has-right-content>h2{margin-right:0;text-align:right}.wp-block-cover-image .wp-block-cover-image-text,.wp-block-cover .wp-block-cover-text,section.wp-block-cover-image>h2{font-size:2em;line-height:1.25;z-index:1;margin-bottom:0;max-width:840px;padding:.44em;text-align:center} \ No newline at end of file diff --git a/wp-includes/blocks/embed/block.json b/wp-includes/blocks/embed/block.json index ae46421963..7257b54cf2 100644 --- a/wp-includes/blocks/embed/block.json +++ b/wp-includes/blocks/embed/block.json @@ -1,4 +1,5 @@ { + "$schema": "https://schemas.wp.org/trunk/block.json", "apiVersion": 2, "name": "core/embed", "title": "Embed", diff --git a/wp-includes/blocks/embed/editor-rtl.css b/wp-includes/blocks/embed/editor-rtl.css index d6c3f9e426..fe66293486 100644 --- a/wp-includes/blocks/embed/editor-rtl.css +++ b/wp-includes/blocks/embed/editor-rtl.css @@ -81,19 +81,7 @@ } .wp-block-embed.is-loading { display: flex; - flex-direction: column; - align-items: center; justify-content: center; - padding: 1em; - min-height: 200px; - text-align: center; - border-radius: 2px; - background-color: #fff; - box-shadow: inset 0 0 0 1px #1e1e1e; -} -.wp-block-embed.is-loading p { - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; - font-size: 13px; } .wp-block-embed .components-placeholder__error { word-break: break-word; diff --git a/wp-includes/blocks/embed/editor-rtl.min.css b/wp-includes/blocks/embed/editor-rtl.min.css index ab53e391a1..c5bc324864 100644 --- a/wp-includes/blocks/embed/editor-rtl.min.css +++ b/wp-includes/blocks/embed/editor-rtl.min.css @@ -1 +1 @@ -.wp-block-embed{margin-right:0;margin-left:0;clear:both}.wp-block-embed.is-loading{display:flex;flex-direction:column;align-items:center;justify-content:center;padding:1em;min-height:200px;text-align:center;border-radius:2px;background-color:#fff;box-shadow:inset 0 0 0 1px #1e1e1e}.wp-block-embed.is-loading p{font-family:-apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Oxygen-Sans,Ubuntu,Cantarell,Helvetica Neue,sans-serif;font-size:13px}.wp-block-embed .components-placeholder__error{word-break:break-word}.wp-block-embed .components-placeholder__learn-more{margin-top:1em}.block-library-embed__interactive-overlay{position:absolute;top:0;right:0;left:0;bottom:0;opacity:0}.wp-block[data-align=left]>.wp-block-embed,.wp-block[data-align=right]>.wp-block-embed{max-width:360px;width:100%}.wp-block[data-align=left]>.wp-block-embed .wp-block-embed__wrapper,.wp-block[data-align=right]>.wp-block-embed .wp-block-embed__wrapper{min-width:280px} \ No newline at end of file +.wp-block-embed{margin-right:0;margin-left:0;clear:both}.wp-block-embed.is-loading{display:flex;justify-content:center}.wp-block-embed .components-placeholder__error{word-break:break-word}.wp-block-embed .components-placeholder__learn-more{margin-top:1em}.block-library-embed__interactive-overlay{position:absolute;top:0;right:0;left:0;bottom:0;opacity:0}.wp-block[data-align=left]>.wp-block-embed,.wp-block[data-align=right]>.wp-block-embed{max-width:360px;width:100%}.wp-block[data-align=left]>.wp-block-embed .wp-block-embed__wrapper,.wp-block[data-align=right]>.wp-block-embed .wp-block-embed__wrapper{min-width:280px} \ No newline at end of file diff --git a/wp-includes/blocks/embed/editor.css b/wp-includes/blocks/embed/editor.css index eff2fd8b2d..87f2f7e422 100644 --- a/wp-includes/blocks/embed/editor.css +++ b/wp-includes/blocks/embed/editor.css @@ -81,19 +81,7 @@ } .wp-block-embed.is-loading { display: flex; - flex-direction: column; - align-items: center; justify-content: center; - padding: 1em; - min-height: 200px; - text-align: center; - border-radius: 2px; - background-color: #fff; - box-shadow: inset 0 0 0 1px #1e1e1e; -} -.wp-block-embed.is-loading p { - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; - font-size: 13px; } .wp-block-embed .components-placeholder__error { word-break: break-word; diff --git a/wp-includes/blocks/embed/editor.min.css b/wp-includes/blocks/embed/editor.min.css index 492c2a36cf..7a66499781 100644 --- a/wp-includes/blocks/embed/editor.min.css +++ b/wp-includes/blocks/embed/editor.min.css @@ -1 +1 @@ -.wp-block-embed{margin-left:0;margin-right:0;clear:both}.wp-block-embed.is-loading{display:flex;flex-direction:column;align-items:center;justify-content:center;padding:1em;min-height:200px;text-align:center;border-radius:2px;background-color:#fff;box-shadow:inset 0 0 0 1px #1e1e1e}.wp-block-embed.is-loading p{font-family:-apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Oxygen-Sans,Ubuntu,Cantarell,Helvetica Neue,sans-serif;font-size:13px}.wp-block-embed .components-placeholder__error{word-break:break-word}.wp-block-embed .components-placeholder__learn-more{margin-top:1em}.block-library-embed__interactive-overlay{position:absolute;top:0;left:0;right:0;bottom:0;opacity:0}.wp-block[data-align=left]>.wp-block-embed,.wp-block[data-align=right]>.wp-block-embed{max-width:360px;width:100%}.wp-block[data-align=left]>.wp-block-embed .wp-block-embed__wrapper,.wp-block[data-align=right]>.wp-block-embed .wp-block-embed__wrapper{min-width:280px} \ No newline at end of file +.wp-block-embed{margin-left:0;margin-right:0;clear:both}.wp-block-embed.is-loading{display:flex;justify-content:center}.wp-block-embed .components-placeholder__error{word-break:break-word}.wp-block-embed .components-placeholder__learn-more{margin-top:1em}.block-library-embed__interactive-overlay{position:absolute;top:0;left:0;right:0;bottom:0;opacity:0}.wp-block[data-align=left]>.wp-block-embed,.wp-block[data-align=right]>.wp-block-embed{max-width:360px;width:100%}.wp-block[data-align=left]>.wp-block-embed .wp-block-embed__wrapper,.wp-block[data-align=right]>.wp-block-embed .wp-block-embed__wrapper{min-width:280px} \ No newline at end of file diff --git a/wp-includes/blocks/file.php b/wp-includes/blocks/file.php index 8209061dbb..7115edc8d7 100644 --- a/wp-includes/blocks/file.php +++ b/wp-includes/blocks/file.php @@ -8,8 +8,8 @@ /** * When the `core/file` block is rendering, check if we need to enqueue the `'wp-block-file-view` script. * - * @param array $attributes The block attributes. - * @param array $content The block content. + * @param array $attributes The block attributes. + * @param string $content The block content. * * @return string Returns the block content. */ diff --git a/wp-includes/blocks/file/block.json b/wp-includes/blocks/file/block.json index 2d01180d82..8e90825a64 100644 --- a/wp-includes/blocks/file/block.json +++ b/wp-includes/blocks/file/block.json @@ -1,4 +1,5 @@ { + "$schema": "https://schemas.wp.org/trunk/block.json", "apiVersion": 2, "name": "core/file", "title": "File", diff --git a/wp-includes/blocks/freeform/block.json b/wp-includes/blocks/freeform/block.json index f3b2d45b00..84b57b7532 100644 --- a/wp-includes/blocks/freeform/block.json +++ b/wp-includes/blocks/freeform/block.json @@ -1,4 +1,5 @@ { + "$schema": "https://schemas.wp.org/trunk/block.json", "apiVersion": 2, "name": "core/freeform", "title": "Classic", diff --git a/wp-includes/blocks/gallery.php b/wp-includes/blocks/gallery.php index ac30d58e22..649a8bf5e7 100644 --- a/wp-includes/blocks/gallery.php +++ b/wp-includes/blocks/gallery.php @@ -32,18 +32,53 @@ function block_core_gallery_data_id_backcompatibility( $parsed_block ) { add_filter( 'render_block_data', 'block_core_gallery_data_id_backcompatibility' ); +/** + * Adds a style tag for the --wp--style--unstable-gallery-gap var. + * + * The Gallery block needs to recalculate Image block width based on + * the current gap setting in order to maintain the number of flex columns + * so a css var is added to allow this. + * + * @param array $attributes Attributes of the block being rendered. + * @param string $content Content of the block being rendered. + * @return string The content of the block being rendered. + */ +function block_core_gallery_render( $attributes, $content ) { + $gap = _wp_array_get( $attributes, array( 'style', 'spacing', 'blockGap' ) ); + // Skip if gap value contains unsupported characters. + // Regex for CSS value borrowed from `safecss_filter_attr`, and used here + // because we only want to match against the value, not the CSS attribute. + $gap = preg_match( '%[\\\(&=}]|/\*%', $gap ) ? null : $gap; + $class = wp_unique_id( 'wp-block-gallery-' ); + $content = preg_replace( + '/' . preg_quote( 'class="', '/' ) . '/', + 'class="' . $class . ' ', + $content, + 1 + ); + // --gallery-block--gutter-size is deprecated. --wp--style--gallery-gap-default should be used by themes that want to set a default + // gap on the gallery. + $gap_value = $gap ? $gap : 'var( --wp--style--gallery-gap-default, var( --gallery-block--gutter-size, var( --wp--style--block-gap, 0.5em ) ) )'; + $style = '.' . $class . '{ --wp--style--unstable-gallery-gap: ' . $gap_value . '; gap: ' . $gap_value . '}'; + // Ideally styles should be loaded in the head, but blocks may be parsed + // after that, so loading in the footer for now. + // See https://core.trac.wordpress.org/ticket/53494. + add_action( + 'wp_footer', + function () use ( $style ) { + echo ''; + } + ); + return $content; +} /** * Registers the `core/gallery` block on server. - * This render callback needs to be here - * so that the gallery styles are loaded in block-based themes. */ function register_block_core_gallery() { register_block_type_from_metadata( __DIR__ . '/gallery', array( - 'render_callback' => function ( $attributes, $content ) { - return $content; - }, + 'render_callback' => 'block_core_gallery_render', ) ); } diff --git a/wp-includes/blocks/gallery/block.json b/wp-includes/blocks/gallery/block.json index f5b3d317ec..4276b81bbe 100644 --- a/wp-includes/blocks/gallery/block.json +++ b/wp-includes/blocks/gallery/block.json @@ -1,4 +1,5 @@ { + "$schema": "https://schemas.wp.org/trunk/block.json", "apiVersion": 2, "name": "core/gallery", "title": "Gallery", @@ -105,7 +106,24 @@ }, "supports": { "anchor": true, - "align": true + "align": true, + "html": false, + "units": [ "px", "em", "rem", "vh", "vw" ], + "spacing": { + "blockGap": true, + "__experimentalSkipSerialization": [ "blockGap" ], + "__experimentalDefaultControls": { + "blockGap": true + } + }, + "__experimentalLayout": { + "allowSwitching": false, + "allowInheriting": false, + "allowEditing": false, + "default": { + "type": "flex" + } + } }, "editorStyle": "wp-block-gallery-editor", "style": "wp-block-gallery" diff --git a/wp-includes/blocks/gallery/editor-rtl.css b/wp-includes/blocks/gallery/editor-rtl.css index 972fd85a7d..67d8126d34 100644 --- a/wp-includes/blocks/gallery/editor-rtl.css +++ b/wp-includes/blocks/gallery/editor-rtl.css @@ -76,7 +76,6 @@ */ figure.wp-block-gallery { display: block; - margin: 0; } figure.wp-block-gallery.has-nested-images .components-drop-zone { display: none; @@ -108,18 +107,6 @@ figure.wp-block-gallery .block-editor-media-placeholder.is-appender .block-edito figure.wp-block-gallery .block-editor-media-placeholder { margin: 0; } -figure.wp-block-gallery .block-editor-media-placeholder::before { - box-shadow: 0 0 0 1px #fff inset, 0 0 0 3px var(--wp-admin-theme-color) inset; - content: ""; - outline: 2px solid transparent; - position: absolute; - top: 0; - left: 0; - bottom: 0; - right: 0; - z-index: 1; - pointer-events: none; -} figure.wp-block-gallery .block-editor-media-placeholder .components-placeholder__label { display: flex; } @@ -237,13 +224,14 @@ figure.wp-block-gallery .components-spinner { margin: 0; } -.wp-block-update-gallery-modal { - max-width: 400px; +@media (min-width: 600px) { + .wp-block-update-gallery-modal { + max-width: 480px; + } } -.wp-block-update-gallery-modal .wp-block-update-gallery-modal-buttons { + +.wp-block-update-gallery-modal-buttons { display: flex; justify-content: flex-end; -} -.wp-block-update-gallery-modal .wp-block-update-gallery-modal-buttons .components-button { - margin-right: 12px; + gap: 12px; } \ No newline at end of file diff --git a/wp-includes/blocks/gallery/editor-rtl.min.css b/wp-includes/blocks/gallery/editor-rtl.min.css index db13ceda66..40d4346e93 100644 --- a/wp-includes/blocks/gallery/editor-rtl.min.css +++ b/wp-includes/blocks/gallery/editor-rtl.min.css @@ -1 +1 @@ -figure.wp-block-gallery{display:block;margin:0}figure.wp-block-gallery.has-nested-images .components-drop-zone{display:none;pointer-events:none}figure.wp-block-gallery>.blocks-gallery-caption{flex:0 0 100%}figure.wp-block-gallery>.blocks-gallery-media-placeholder-wrapper{flex-basis:100%}figure.wp-block-gallery .wp-block-image .components-notice.is-error{display:block}figure.wp-block-gallery .wp-block-image .components-notice__content{margin:4px 0}figure.wp-block-gallery .wp-block-image .components-notice__dismiss{position:absolute;top:0;left:5px}figure.wp-block-gallery .block-editor-media-placeholder.is-appender .components-placeholder__label{display:none}figure.wp-block-gallery .block-editor-media-placeholder.is-appender .block-editor-media-placeholder__button{margin-bottom:0}figure.wp-block-gallery .block-editor-media-placeholder{margin:0}figure.wp-block-gallery .block-editor-media-placeholder:before{box-shadow:0 0 0 1px #fff inset,0 0 0 3px var(--wp-admin-theme-color) inset;content:"";outline:2px solid transparent;position:absolute;top:0;left:0;bottom:0;right:0;z-index:1;pointer-events:none}figure.wp-block-gallery .block-editor-media-placeholder .components-placeholder__label{display:flex}figure.wp-block-gallery .block-editor-media-placeholder figcaption{z-index:2}figure.wp-block-gallery .components-spinner{position:absolute;top:50%;right:50%;margin-top:-9px;margin-right:-9px}.gallery-settings-buttons .components-button:first-child{margin-left:8px}.gallery-image-sizes .components-base-control__label{display:block;margin-bottom:4px}.gallery-image-sizes .gallery-image-sizes__loading{display:flex;align-items:center;color:#757575;font-size:12px}.gallery-image-sizes .components-spinner{margin:0 4px 0 8px}.blocks-gallery-item figure:not(.is-selected):focus,.blocks-gallery-item img:focus{outline:none}.blocks-gallery-item figure.is-selected:before{box-shadow:0 0 0 1px #fff inset,0 0 0 3px var(--wp-admin-theme-color) inset;content:"";outline:2px solid transparent;position:absolute;top:0;left:0;bottom:0;right:0;z-index:1;pointer-events:none}.blocks-gallery-item figure.is-transient img{opacity:.3}.blocks-gallery-item .is-selected .block-library-gallery-item__inline-menu{display:inline-flex}.blocks-gallery-item .block-editor-media-placeholder{margin:0;height:100%}.blocks-gallery-item .block-editor-media-placeholder .components-placeholder__label{display:flex}.block-library-gallery-item__inline-menu{display:none;position:absolute;top:-2px;margin:8px;z-index:20;transition:box-shadow .2s ease-out;border-radius:2px;background:#fff;border:1px solid #1e1e1e}@media (prefers-reduced-motion:reduce){.block-library-gallery-item__inline-menu{transition-duration:0s;transition-delay:0s}}.block-library-gallery-item__inline-menu:hover{box-shadow:0 2px 6px rgba(0,0,0,.05)}@media (min-width:600px){.columns-7 .block-library-gallery-item__inline-menu,.columns-8 .block-library-gallery-item__inline-menu{padding:2px}}.block-library-gallery-item__inline-menu .components-button.has-icon:not(:focus){border:none;box-shadow:none}@media (min-width:600px){.columns-7 .block-library-gallery-item__inline-menu .components-button.has-icon,.columns-8 .block-library-gallery-item__inline-menu .components-button.has-icon{padding:0;width:inherit;height:inherit}}.block-library-gallery-item__inline-menu.is-left{right:-2px}.block-library-gallery-item__inline-menu.is-right{left:-2px}.wp-block-gallery ul.blocks-gallery-grid{padding:0;margin:0}.wp-block-update-gallery-modal{max-width:400px}.wp-block-update-gallery-modal .wp-block-update-gallery-modal-buttons{display:flex;justify-content:flex-end}.wp-block-update-gallery-modal .wp-block-update-gallery-modal-buttons .components-button{margin-right:12px} \ No newline at end of file +figure.wp-block-gallery{display:block}figure.wp-block-gallery.has-nested-images .components-drop-zone{display:none;pointer-events:none}figure.wp-block-gallery>.blocks-gallery-caption{flex:0 0 100%}figure.wp-block-gallery>.blocks-gallery-media-placeholder-wrapper{flex-basis:100%}figure.wp-block-gallery .wp-block-image .components-notice.is-error{display:block}figure.wp-block-gallery .wp-block-image .components-notice__content{margin:4px 0}figure.wp-block-gallery .wp-block-image .components-notice__dismiss{position:absolute;top:0;left:5px}figure.wp-block-gallery .block-editor-media-placeholder.is-appender .components-placeholder__label{display:none}figure.wp-block-gallery .block-editor-media-placeholder.is-appender .block-editor-media-placeholder__button{margin-bottom:0}figure.wp-block-gallery .block-editor-media-placeholder{margin:0}figure.wp-block-gallery .block-editor-media-placeholder .components-placeholder__label{display:flex}figure.wp-block-gallery .block-editor-media-placeholder figcaption{z-index:2}figure.wp-block-gallery .components-spinner{position:absolute;top:50%;right:50%;margin-top:-9px;margin-right:-9px}.gallery-settings-buttons .components-button:first-child{margin-left:8px}.gallery-image-sizes .components-base-control__label{display:block;margin-bottom:4px}.gallery-image-sizes .gallery-image-sizes__loading{display:flex;align-items:center;color:#757575;font-size:12px}.gallery-image-sizes .components-spinner{margin:0 4px 0 8px}.blocks-gallery-item figure:not(.is-selected):focus,.blocks-gallery-item img:focus{outline:none}.blocks-gallery-item figure.is-selected:before{box-shadow:0 0 0 1px #fff inset,0 0 0 3px var(--wp-admin-theme-color) inset;content:"";outline:2px solid transparent;position:absolute;top:0;left:0;bottom:0;right:0;z-index:1;pointer-events:none}.blocks-gallery-item figure.is-transient img{opacity:.3}.blocks-gallery-item .is-selected .block-library-gallery-item__inline-menu{display:inline-flex}.blocks-gallery-item .block-editor-media-placeholder{margin:0;height:100%}.blocks-gallery-item .block-editor-media-placeholder .components-placeholder__label{display:flex}.block-library-gallery-item__inline-menu{display:none;position:absolute;top:-2px;margin:8px;z-index:20;transition:box-shadow .2s ease-out;border-radius:2px;background:#fff;border:1px solid #1e1e1e}@media (prefers-reduced-motion:reduce){.block-library-gallery-item__inline-menu{transition-duration:0s;transition-delay:0s}}.block-library-gallery-item__inline-menu:hover{box-shadow:0 2px 6px rgba(0,0,0,.05)}@media (min-width:600px){.columns-7 .block-library-gallery-item__inline-menu,.columns-8 .block-library-gallery-item__inline-menu{padding:2px}}.block-library-gallery-item__inline-menu .components-button.has-icon:not(:focus){border:none;box-shadow:none}@media (min-width:600px){.columns-7 .block-library-gallery-item__inline-menu .components-button.has-icon,.columns-8 .block-library-gallery-item__inline-menu .components-button.has-icon{padding:0;width:inherit;height:inherit}}.block-library-gallery-item__inline-menu.is-left{right:-2px}.block-library-gallery-item__inline-menu.is-right{left:-2px}.wp-block-gallery ul.blocks-gallery-grid{padding:0;margin:0}@media (min-width:600px){.wp-block-update-gallery-modal{max-width:480px}}.wp-block-update-gallery-modal-buttons{display:flex;justify-content:flex-end;gap:12px} \ No newline at end of file diff --git a/wp-includes/blocks/gallery/editor.css b/wp-includes/blocks/gallery/editor.css index 05598054cb..56aec0a472 100644 --- a/wp-includes/blocks/gallery/editor.css +++ b/wp-includes/blocks/gallery/editor.css @@ -76,7 +76,6 @@ */ figure.wp-block-gallery { display: block; - margin: 0; } figure.wp-block-gallery.has-nested-images .components-drop-zone { display: none; @@ -108,18 +107,6 @@ figure.wp-block-gallery .block-editor-media-placeholder.is-appender .block-edito figure.wp-block-gallery .block-editor-media-placeholder { margin: 0; } -figure.wp-block-gallery .block-editor-media-placeholder::before { - box-shadow: 0 0 0 1px #fff inset, 0 0 0 3px var(--wp-admin-theme-color) inset; - content: ""; - outline: 2px solid transparent; - position: absolute; - top: 0; - right: 0; - bottom: 0; - left: 0; - z-index: 1; - pointer-events: none; -} figure.wp-block-gallery .block-editor-media-placeholder .components-placeholder__label { display: flex; } @@ -237,13 +224,14 @@ figure.wp-block-gallery .components-spinner { margin: 0; } -.wp-block-update-gallery-modal { - max-width: 400px; +@media (min-width: 600px) { + .wp-block-update-gallery-modal { + max-width: 480px; + } } -.wp-block-update-gallery-modal .wp-block-update-gallery-modal-buttons { + +.wp-block-update-gallery-modal-buttons { display: flex; justify-content: flex-end; -} -.wp-block-update-gallery-modal .wp-block-update-gallery-modal-buttons .components-button { - margin-left: 12px; + gap: 12px; } \ No newline at end of file diff --git a/wp-includes/blocks/gallery/editor.min.css b/wp-includes/blocks/gallery/editor.min.css index 7058d9f8d0..28b3067e90 100644 --- a/wp-includes/blocks/gallery/editor.min.css +++ b/wp-includes/blocks/gallery/editor.min.css @@ -1 +1 @@ -figure.wp-block-gallery{display:block;margin:0}figure.wp-block-gallery.has-nested-images .components-drop-zone{display:none;pointer-events:none}figure.wp-block-gallery>.blocks-gallery-caption{flex:0 0 100%}figure.wp-block-gallery>.blocks-gallery-media-placeholder-wrapper{flex-basis:100%}figure.wp-block-gallery .wp-block-image .components-notice.is-error{display:block}figure.wp-block-gallery .wp-block-image .components-notice__content{margin:4px 0}figure.wp-block-gallery .wp-block-image .components-notice__dismiss{position:absolute;top:0;right:5px}figure.wp-block-gallery .block-editor-media-placeholder.is-appender .components-placeholder__label{display:none}figure.wp-block-gallery .block-editor-media-placeholder.is-appender .block-editor-media-placeholder__button{margin-bottom:0}figure.wp-block-gallery .block-editor-media-placeholder{margin:0}figure.wp-block-gallery .block-editor-media-placeholder:before{box-shadow:0 0 0 1px #fff inset,0 0 0 3px var(--wp-admin-theme-color) inset;content:"";outline:2px solid transparent;position:absolute;top:0;right:0;bottom:0;left:0;z-index:1;pointer-events:none}figure.wp-block-gallery .block-editor-media-placeholder .components-placeholder__label{display:flex}figure.wp-block-gallery .block-editor-media-placeholder figcaption{z-index:2}figure.wp-block-gallery .components-spinner{position:absolute;top:50%;left:50%;margin-top:-9px;margin-left:-9px}.gallery-settings-buttons .components-button:first-child{margin-right:8px}.gallery-image-sizes .components-base-control__label{display:block;margin-bottom:4px}.gallery-image-sizes .gallery-image-sizes__loading{display:flex;align-items:center;color:#757575;font-size:12px}.gallery-image-sizes .components-spinner{margin:0 8px 0 4px}.blocks-gallery-item figure:not(.is-selected):focus,.blocks-gallery-item img:focus{outline:none}.blocks-gallery-item figure.is-selected:before{box-shadow:0 0 0 1px #fff inset,0 0 0 3px var(--wp-admin-theme-color) inset;content:"";outline:2px solid transparent;position:absolute;top:0;right:0;bottom:0;left:0;z-index:1;pointer-events:none}.blocks-gallery-item figure.is-transient img{opacity:.3}.blocks-gallery-item .is-selected .block-library-gallery-item__inline-menu{display:inline-flex}.blocks-gallery-item .block-editor-media-placeholder{margin:0;height:100%}.blocks-gallery-item .block-editor-media-placeholder .components-placeholder__label{display:flex}.block-library-gallery-item__inline-menu{display:none;position:absolute;top:-2px;margin:8px;z-index:20;transition:box-shadow .2s ease-out;border-radius:2px;background:#fff;border:1px solid #1e1e1e}@media (prefers-reduced-motion:reduce){.block-library-gallery-item__inline-menu{transition-duration:0s;transition-delay:0s}}.block-library-gallery-item__inline-menu:hover{box-shadow:0 2px 6px rgba(0,0,0,.05)}@media (min-width:600px){.columns-7 .block-library-gallery-item__inline-menu,.columns-8 .block-library-gallery-item__inline-menu{padding:2px}}.block-library-gallery-item__inline-menu .components-button.has-icon:not(:focus){border:none;box-shadow:none}@media (min-width:600px){.columns-7 .block-library-gallery-item__inline-menu .components-button.has-icon,.columns-8 .block-library-gallery-item__inline-menu .components-button.has-icon{padding:0;width:inherit;height:inherit}}.block-library-gallery-item__inline-menu.is-left{left:-2px}.block-library-gallery-item__inline-menu.is-right{right:-2px}.wp-block-gallery ul.blocks-gallery-grid{padding:0;margin:0}.wp-block-update-gallery-modal{max-width:400px}.wp-block-update-gallery-modal .wp-block-update-gallery-modal-buttons{display:flex;justify-content:flex-end}.wp-block-update-gallery-modal .wp-block-update-gallery-modal-buttons .components-button{margin-left:12px} \ No newline at end of file +figure.wp-block-gallery{display:block}figure.wp-block-gallery.has-nested-images .components-drop-zone{display:none;pointer-events:none}figure.wp-block-gallery>.blocks-gallery-caption{flex:0 0 100%}figure.wp-block-gallery>.blocks-gallery-media-placeholder-wrapper{flex-basis:100%}figure.wp-block-gallery .wp-block-image .components-notice.is-error{display:block}figure.wp-block-gallery .wp-block-image .components-notice__content{margin:4px 0}figure.wp-block-gallery .wp-block-image .components-notice__dismiss{position:absolute;top:0;right:5px}figure.wp-block-gallery .block-editor-media-placeholder.is-appender .components-placeholder__label{display:none}figure.wp-block-gallery .block-editor-media-placeholder.is-appender .block-editor-media-placeholder__button{margin-bottom:0}figure.wp-block-gallery .block-editor-media-placeholder{margin:0}figure.wp-block-gallery .block-editor-media-placeholder .components-placeholder__label{display:flex}figure.wp-block-gallery .block-editor-media-placeholder figcaption{z-index:2}figure.wp-block-gallery .components-spinner{position:absolute;top:50%;left:50%;margin-top:-9px;margin-left:-9px}.gallery-settings-buttons .components-button:first-child{margin-right:8px}.gallery-image-sizes .components-base-control__label{display:block;margin-bottom:4px}.gallery-image-sizes .gallery-image-sizes__loading{display:flex;align-items:center;color:#757575;font-size:12px}.gallery-image-sizes .components-spinner{margin:0 8px 0 4px}.blocks-gallery-item figure:not(.is-selected):focus,.blocks-gallery-item img:focus{outline:none}.blocks-gallery-item figure.is-selected:before{box-shadow:0 0 0 1px #fff inset,0 0 0 3px var(--wp-admin-theme-color) inset;content:"";outline:2px solid transparent;position:absolute;top:0;right:0;bottom:0;left:0;z-index:1;pointer-events:none}.blocks-gallery-item figure.is-transient img{opacity:.3}.blocks-gallery-item .is-selected .block-library-gallery-item__inline-menu{display:inline-flex}.blocks-gallery-item .block-editor-media-placeholder{margin:0;height:100%}.blocks-gallery-item .block-editor-media-placeholder .components-placeholder__label{display:flex}.block-library-gallery-item__inline-menu{display:none;position:absolute;top:-2px;margin:8px;z-index:20;transition:box-shadow .2s ease-out;border-radius:2px;background:#fff;border:1px solid #1e1e1e}@media (prefers-reduced-motion:reduce){.block-library-gallery-item__inline-menu{transition-duration:0s;transition-delay:0s}}.block-library-gallery-item__inline-menu:hover{box-shadow:0 2px 6px rgba(0,0,0,.05)}@media (min-width:600px){.columns-7 .block-library-gallery-item__inline-menu,.columns-8 .block-library-gallery-item__inline-menu{padding:2px}}.block-library-gallery-item__inline-menu .components-button.has-icon:not(:focus){border:none;box-shadow:none}@media (min-width:600px){.columns-7 .block-library-gallery-item__inline-menu .components-button.has-icon,.columns-8 .block-library-gallery-item__inline-menu .components-button.has-icon{padding:0;width:inherit;height:inherit}}.block-library-gallery-item__inline-menu.is-left{left:-2px}.block-library-gallery-item__inline-menu.is-right{right:-2px}.wp-block-gallery ul.blocks-gallery-grid{padding:0;margin:0}@media (min-width:600px){.wp-block-update-gallery-modal{max-width:480px}}.wp-block-update-gallery-modal-buttons{display:flex;justify-content:flex-end;gap:12px} \ No newline at end of file diff --git a/wp-includes/blocks/gallery/style-rtl.css b/wp-includes/blocks/gallery/style-rtl.css index e409badd96..f15fd3761a 100644 --- a/wp-includes/blocks/gallery/style-rtl.css +++ b/wp-includes/blocks/gallery/style-rtl.css @@ -74,18 +74,18 @@ /** * Reset the WP Admin page styles for Gutenberg-like pages. */ -.wp-block-gallery, -.blocks-gallery-grid { +.wp-block-gallery:not(.has-nested-images), +.blocks-gallery-grid:not(.has-nested-images) { display: flex; flex-wrap: wrap; list-style-type: none; padding: 0; margin: 0; } -.wp-block-gallery .blocks-gallery-image, -.wp-block-gallery .blocks-gallery-item, -.blocks-gallery-grid .blocks-gallery-image, -.blocks-gallery-grid .blocks-gallery-item { +.wp-block-gallery:not(.has-nested-images) .blocks-gallery-image, +.wp-block-gallery:not(.has-nested-images) .blocks-gallery-item, +.blocks-gallery-grid:not(.has-nested-images) .blocks-gallery-image, +.blocks-gallery-grid:not(.has-nested-images) .blocks-gallery-item { margin: 0 0 1em 1em; display: flex; flex-grow: 1; @@ -94,35 +94,35 @@ position: relative; width: calc(50% - 1em); } -.wp-block-gallery .blocks-gallery-image:nth-of-type(even), -.wp-block-gallery .blocks-gallery-item:nth-of-type(even), -.blocks-gallery-grid .blocks-gallery-image:nth-of-type(even), -.blocks-gallery-grid .blocks-gallery-item:nth-of-type(even) { +.wp-block-gallery:not(.has-nested-images) .blocks-gallery-image:nth-of-type(even), +.wp-block-gallery:not(.has-nested-images) .blocks-gallery-item:nth-of-type(even), +.blocks-gallery-grid:not(.has-nested-images) .blocks-gallery-image:nth-of-type(even), +.blocks-gallery-grid:not(.has-nested-images) .blocks-gallery-item:nth-of-type(even) { margin-left: 0; } -.wp-block-gallery .blocks-gallery-image figure, -.wp-block-gallery .blocks-gallery-item figure, -.blocks-gallery-grid .blocks-gallery-image figure, -.blocks-gallery-grid .blocks-gallery-item figure { +.wp-block-gallery:not(.has-nested-images) .blocks-gallery-image figure, +.wp-block-gallery:not(.has-nested-images) .blocks-gallery-item figure, +.blocks-gallery-grid:not(.has-nested-images) .blocks-gallery-image figure, +.blocks-gallery-grid:not(.has-nested-images) .blocks-gallery-item figure { margin: 0; height: 100%; display: flex; align-items: flex-end; justify-content: flex-start; } -.wp-block-gallery .blocks-gallery-image img, -.wp-block-gallery .blocks-gallery-item img, -.blocks-gallery-grid .blocks-gallery-image img, -.blocks-gallery-grid .blocks-gallery-item img { +.wp-block-gallery:not(.has-nested-images) .blocks-gallery-image img, +.wp-block-gallery:not(.has-nested-images) .blocks-gallery-item img, +.blocks-gallery-grid:not(.has-nested-images) .blocks-gallery-image img, +.blocks-gallery-grid:not(.has-nested-images) .blocks-gallery-item img { display: block; max-width: 100%; height: auto; width: auto; } -.wp-block-gallery .blocks-gallery-image figcaption, -.wp-block-gallery .blocks-gallery-item figcaption, -.blocks-gallery-grid .blocks-gallery-image figcaption, -.blocks-gallery-grid .blocks-gallery-item figcaption { +.wp-block-gallery:not(.has-nested-images) .blocks-gallery-image figcaption, +.wp-block-gallery:not(.has-nested-images) .blocks-gallery-item figcaption, +.blocks-gallery-grid:not(.has-nested-images) .blocks-gallery-image figcaption, +.blocks-gallery-grid:not(.has-nested-images) .blocks-gallery-item figcaption { position: absolute; bottom: 0; width: 100%; @@ -137,127 +137,127 @@ margin: 0; z-index: 2; } -.wp-block-gallery .blocks-gallery-image figcaption img, -.wp-block-gallery .blocks-gallery-item figcaption img, -.blocks-gallery-grid .blocks-gallery-image figcaption img, -.blocks-gallery-grid .blocks-gallery-item figcaption img { +.wp-block-gallery:not(.has-nested-images) .blocks-gallery-image figcaption img, +.wp-block-gallery:not(.has-nested-images) .blocks-gallery-item figcaption img, +.blocks-gallery-grid:not(.has-nested-images) .blocks-gallery-image figcaption img, +.blocks-gallery-grid:not(.has-nested-images) .blocks-gallery-item figcaption img { display: inline; } -.wp-block-gallery figcaption, -.blocks-gallery-grid figcaption { +.wp-block-gallery:not(.has-nested-images) figcaption, +.blocks-gallery-grid:not(.has-nested-images) figcaption { flex-grow: 1; } -.wp-block-gallery.is-cropped .blocks-gallery-image a, -.wp-block-gallery.is-cropped .blocks-gallery-image img, .wp-block-gallery.is-cropped .blocks-gallery-item a, -.wp-block-gallery.is-cropped .blocks-gallery-item img, -.blocks-gallery-grid.is-cropped .blocks-gallery-image a, -.blocks-gallery-grid.is-cropped .blocks-gallery-image img, -.blocks-gallery-grid.is-cropped .blocks-gallery-item a, -.blocks-gallery-grid.is-cropped .blocks-gallery-item img { +.wp-block-gallery:not(.has-nested-images).is-cropped .blocks-gallery-image a, +.wp-block-gallery:not(.has-nested-images).is-cropped .blocks-gallery-image img, .wp-block-gallery:not(.has-nested-images).is-cropped .blocks-gallery-item a, +.wp-block-gallery:not(.has-nested-images).is-cropped .blocks-gallery-item img, +.blocks-gallery-grid:not(.has-nested-images).is-cropped .blocks-gallery-image a, +.blocks-gallery-grid:not(.has-nested-images).is-cropped .blocks-gallery-image img, +.blocks-gallery-grid:not(.has-nested-images).is-cropped .blocks-gallery-item a, +.blocks-gallery-grid:not(.has-nested-images).is-cropped .blocks-gallery-item img { width: 100%; height: 100%; flex: 1; -o-object-fit: cover; object-fit: cover; } -.wp-block-gallery.columns-1 .blocks-gallery-image, .wp-block-gallery.columns-1 .blocks-gallery-item, -.blocks-gallery-grid.columns-1 .blocks-gallery-image, -.blocks-gallery-grid.columns-1 .blocks-gallery-item { +.wp-block-gallery:not(.has-nested-images).columns-1 .blocks-gallery-image, .wp-block-gallery:not(.has-nested-images).columns-1 .blocks-gallery-item, +.blocks-gallery-grid:not(.has-nested-images).columns-1 .blocks-gallery-image, +.blocks-gallery-grid:not(.has-nested-images).columns-1 .blocks-gallery-item { width: 100%; margin-left: 0; } @media (min-width: 600px) { - .wp-block-gallery.columns-3 .blocks-gallery-image, .wp-block-gallery.columns-3 .blocks-gallery-item, -.blocks-gallery-grid.columns-3 .blocks-gallery-image, -.blocks-gallery-grid.columns-3 .blocks-gallery-item { + .wp-block-gallery:not(.has-nested-images).columns-3 .blocks-gallery-image, .wp-block-gallery:not(.has-nested-images).columns-3 .blocks-gallery-item, +.blocks-gallery-grid:not(.has-nested-images).columns-3 .blocks-gallery-image, +.blocks-gallery-grid:not(.has-nested-images).columns-3 .blocks-gallery-item { width: calc(33.3333333333% - 0.6666666667em); margin-left: 1em; } - .wp-block-gallery.columns-4 .blocks-gallery-image, .wp-block-gallery.columns-4 .blocks-gallery-item, -.blocks-gallery-grid.columns-4 .blocks-gallery-image, -.blocks-gallery-grid.columns-4 .blocks-gallery-item { + .wp-block-gallery:not(.has-nested-images).columns-4 .blocks-gallery-image, .wp-block-gallery:not(.has-nested-images).columns-4 .blocks-gallery-item, +.blocks-gallery-grid:not(.has-nested-images).columns-4 .blocks-gallery-image, +.blocks-gallery-grid:not(.has-nested-images).columns-4 .blocks-gallery-item { width: calc(25% - 0.75em); margin-left: 1em; } - .wp-block-gallery.columns-5 .blocks-gallery-image, .wp-block-gallery.columns-5 .blocks-gallery-item, -.blocks-gallery-grid.columns-5 .blocks-gallery-image, -.blocks-gallery-grid.columns-5 .blocks-gallery-item { + .wp-block-gallery:not(.has-nested-images).columns-5 .blocks-gallery-image, .wp-block-gallery:not(.has-nested-images).columns-5 .blocks-gallery-item, +.blocks-gallery-grid:not(.has-nested-images).columns-5 .blocks-gallery-image, +.blocks-gallery-grid:not(.has-nested-images).columns-5 .blocks-gallery-item { width: calc(20% - 0.8em); margin-left: 1em; } - .wp-block-gallery.columns-6 .blocks-gallery-image, .wp-block-gallery.columns-6 .blocks-gallery-item, -.blocks-gallery-grid.columns-6 .blocks-gallery-image, -.blocks-gallery-grid.columns-6 .blocks-gallery-item { + .wp-block-gallery:not(.has-nested-images).columns-6 .blocks-gallery-image, .wp-block-gallery:not(.has-nested-images).columns-6 .blocks-gallery-item, +.blocks-gallery-grid:not(.has-nested-images).columns-6 .blocks-gallery-image, +.blocks-gallery-grid:not(.has-nested-images).columns-6 .blocks-gallery-item { width: calc(16.6666666667% - 0.8333333333em); margin-left: 1em; } - .wp-block-gallery.columns-7 .blocks-gallery-image, .wp-block-gallery.columns-7 .blocks-gallery-item, -.blocks-gallery-grid.columns-7 .blocks-gallery-image, -.blocks-gallery-grid.columns-7 .blocks-gallery-item { + .wp-block-gallery:not(.has-nested-images).columns-7 .blocks-gallery-image, .wp-block-gallery:not(.has-nested-images).columns-7 .blocks-gallery-item, +.blocks-gallery-grid:not(.has-nested-images).columns-7 .blocks-gallery-image, +.blocks-gallery-grid:not(.has-nested-images).columns-7 .blocks-gallery-item { width: calc(14.2857142857% - 0.8571428571em); margin-left: 1em; } - .wp-block-gallery.columns-8 .blocks-gallery-image, .wp-block-gallery.columns-8 .blocks-gallery-item, -.blocks-gallery-grid.columns-8 .blocks-gallery-image, -.blocks-gallery-grid.columns-8 .blocks-gallery-item { + .wp-block-gallery:not(.has-nested-images).columns-8 .blocks-gallery-image, .wp-block-gallery:not(.has-nested-images).columns-8 .blocks-gallery-item, +.blocks-gallery-grid:not(.has-nested-images).columns-8 .blocks-gallery-image, +.blocks-gallery-grid:not(.has-nested-images).columns-8 .blocks-gallery-item { width: calc(12.5% - 0.875em); margin-left: 1em; } - .wp-block-gallery.columns-1 .blocks-gallery-image:nth-of-type(1n), .wp-block-gallery.columns-1 .blocks-gallery-item:nth-of-type(1n), -.blocks-gallery-grid.columns-1 .blocks-gallery-image:nth-of-type(1n), -.blocks-gallery-grid.columns-1 .blocks-gallery-item:nth-of-type(1n) { + .wp-block-gallery:not(.has-nested-images).columns-1 .blocks-gallery-image:nth-of-type(1n), .wp-block-gallery:not(.has-nested-images).columns-1 .blocks-gallery-item:nth-of-type(1n), +.blocks-gallery-grid:not(.has-nested-images).columns-1 .blocks-gallery-image:nth-of-type(1n), +.blocks-gallery-grid:not(.has-nested-images).columns-1 .blocks-gallery-item:nth-of-type(1n) { margin-left: 0; } - .wp-block-gallery.columns-2 .blocks-gallery-image:nth-of-type(2n), .wp-block-gallery.columns-2 .blocks-gallery-item:nth-of-type(2n), -.blocks-gallery-grid.columns-2 .blocks-gallery-image:nth-of-type(2n), -.blocks-gallery-grid.columns-2 .blocks-gallery-item:nth-of-type(2n) { + .wp-block-gallery:not(.has-nested-images).columns-2 .blocks-gallery-image:nth-of-type(2n), .wp-block-gallery:not(.has-nested-images).columns-2 .blocks-gallery-item:nth-of-type(2n), +.blocks-gallery-grid:not(.has-nested-images).columns-2 .blocks-gallery-image:nth-of-type(2n), +.blocks-gallery-grid:not(.has-nested-images).columns-2 .blocks-gallery-item:nth-of-type(2n) { margin-left: 0; } - .wp-block-gallery.columns-3 .blocks-gallery-image:nth-of-type(3n), .wp-block-gallery.columns-3 .blocks-gallery-item:nth-of-type(3n), -.blocks-gallery-grid.columns-3 .blocks-gallery-image:nth-of-type(3n), -.blocks-gallery-grid.columns-3 .blocks-gallery-item:nth-of-type(3n) { + .wp-block-gallery:not(.has-nested-images).columns-3 .blocks-gallery-image:nth-of-type(3n), .wp-block-gallery:not(.has-nested-images).columns-3 .blocks-gallery-item:nth-of-type(3n), +.blocks-gallery-grid:not(.has-nested-images).columns-3 .blocks-gallery-image:nth-of-type(3n), +.blocks-gallery-grid:not(.has-nested-images).columns-3 .blocks-gallery-item:nth-of-type(3n) { margin-left: 0; } - .wp-block-gallery.columns-4 .blocks-gallery-image:nth-of-type(4n), .wp-block-gallery.columns-4 .blocks-gallery-item:nth-of-type(4n), -.blocks-gallery-grid.columns-4 .blocks-gallery-image:nth-of-type(4n), -.blocks-gallery-grid.columns-4 .blocks-gallery-item:nth-of-type(4n) { + .wp-block-gallery:not(.has-nested-images).columns-4 .blocks-gallery-image:nth-of-type(4n), .wp-block-gallery:not(.has-nested-images).columns-4 .blocks-gallery-item:nth-of-type(4n), +.blocks-gallery-grid:not(.has-nested-images).columns-4 .blocks-gallery-image:nth-of-type(4n), +.blocks-gallery-grid:not(.has-nested-images).columns-4 .blocks-gallery-item:nth-of-type(4n) { margin-left: 0; } - .wp-block-gallery.columns-5 .blocks-gallery-image:nth-of-type(5n), .wp-block-gallery.columns-5 .blocks-gallery-item:nth-of-type(5n), -.blocks-gallery-grid.columns-5 .blocks-gallery-image:nth-of-type(5n), -.blocks-gallery-grid.columns-5 .blocks-gallery-item:nth-of-type(5n) { + .wp-block-gallery:not(.has-nested-images).columns-5 .blocks-gallery-image:nth-of-type(5n), .wp-block-gallery:not(.has-nested-images).columns-5 .blocks-gallery-item:nth-of-type(5n), +.blocks-gallery-grid:not(.has-nested-images).columns-5 .blocks-gallery-image:nth-of-type(5n), +.blocks-gallery-grid:not(.has-nested-images).columns-5 .blocks-gallery-item:nth-of-type(5n) { margin-left: 0; } - .wp-block-gallery.columns-6 .blocks-gallery-image:nth-of-type(6n), .wp-block-gallery.columns-6 .blocks-gallery-item:nth-of-type(6n), -.blocks-gallery-grid.columns-6 .blocks-gallery-image:nth-of-type(6n), -.blocks-gallery-grid.columns-6 .blocks-gallery-item:nth-of-type(6n) { + .wp-block-gallery:not(.has-nested-images).columns-6 .blocks-gallery-image:nth-of-type(6n), .wp-block-gallery:not(.has-nested-images).columns-6 .blocks-gallery-item:nth-of-type(6n), +.blocks-gallery-grid:not(.has-nested-images).columns-6 .blocks-gallery-image:nth-of-type(6n), +.blocks-gallery-grid:not(.has-nested-images).columns-6 .blocks-gallery-item:nth-of-type(6n) { margin-left: 0; } - .wp-block-gallery.columns-7 .blocks-gallery-image:nth-of-type(7n), .wp-block-gallery.columns-7 .blocks-gallery-item:nth-of-type(7n), -.blocks-gallery-grid.columns-7 .blocks-gallery-image:nth-of-type(7n), -.blocks-gallery-grid.columns-7 .blocks-gallery-item:nth-of-type(7n) { + .wp-block-gallery:not(.has-nested-images).columns-7 .blocks-gallery-image:nth-of-type(7n), .wp-block-gallery:not(.has-nested-images).columns-7 .blocks-gallery-item:nth-of-type(7n), +.blocks-gallery-grid:not(.has-nested-images).columns-7 .blocks-gallery-image:nth-of-type(7n), +.blocks-gallery-grid:not(.has-nested-images).columns-7 .blocks-gallery-item:nth-of-type(7n) { margin-left: 0; } - .wp-block-gallery.columns-8 .blocks-gallery-image:nth-of-type(8n), .wp-block-gallery.columns-8 .blocks-gallery-item:nth-of-type(8n), -.blocks-gallery-grid.columns-8 .blocks-gallery-image:nth-of-type(8n), -.blocks-gallery-grid.columns-8 .blocks-gallery-item:nth-of-type(8n) { + .wp-block-gallery:not(.has-nested-images).columns-8 .blocks-gallery-image:nth-of-type(8n), .wp-block-gallery:not(.has-nested-images).columns-8 .blocks-gallery-item:nth-of-type(8n), +.blocks-gallery-grid:not(.has-nested-images).columns-8 .blocks-gallery-image:nth-of-type(8n), +.blocks-gallery-grid:not(.has-nested-images).columns-8 .blocks-gallery-item:nth-of-type(8n) { margin-left: 0; } } -.wp-block-gallery .blocks-gallery-image:last-child, -.wp-block-gallery .blocks-gallery-item:last-child, -.blocks-gallery-grid .blocks-gallery-image:last-child, -.blocks-gallery-grid .blocks-gallery-item:last-child { +.wp-block-gallery:not(.has-nested-images) .blocks-gallery-image:last-child, +.wp-block-gallery:not(.has-nested-images) .blocks-gallery-item:last-child, +.blocks-gallery-grid:not(.has-nested-images) .blocks-gallery-image:last-child, +.blocks-gallery-grid:not(.has-nested-images) .blocks-gallery-item:last-child { margin-left: 0; } -.wp-block-gallery.alignleft, .wp-block-gallery.alignright, -.blocks-gallery-grid.alignleft, -.blocks-gallery-grid.alignright { +.wp-block-gallery:not(.has-nested-images).alignleft, .wp-block-gallery:not(.has-nested-images).alignright, +.blocks-gallery-grid:not(.has-nested-images).alignleft, +.blocks-gallery-grid:not(.has-nested-images).alignright { max-width: 420px; width: 100%; } -.wp-block-gallery.aligncenter .blocks-gallery-item figure, -.blocks-gallery-grid.aligncenter .blocks-gallery-item figure { +.wp-block-gallery:not(.has-nested-images).aligncenter .blocks-gallery-item figure, +.blocks-gallery-grid:not(.has-nested-images).aligncenter .blocks-gallery-item figure { justify-content: center; } @@ -265,27 +265,19 @@ align-self: flex-start; } -.wp-block-gallery.has-nested-images { - display: flex; - flex-wrap: wrap; +figure.wp-block-gallery.has-nested-images { + align-items: normal; } + .wp-block-gallery.has-nested-images figure.wp-block-image:not(#individual-image) { - margin: 0 0 var(--gallery-block--gutter-size, 16px) var(--gallery-block--gutter-size, 16px); - width: calc(50% - (var(--gallery-block--gutter-size, 16px) / 2)); -} -.wp-block-gallery.has-nested-images figure.wp-block-image:not(#individual-image):last-of-type:not(#individual-image) { - margin-left: 0; -} -.wp-block-gallery.has-nested-images figure.wp-block-image:not(#individual-image):nth-of-type(even) { - margin-left: 0; + width: calc(50% - (var(--wp--style--unstable-gallery-gap, 16px) / 2)); + margin: 0; } .wp-block-gallery.has-nested-images figure.wp-block-image { display: flex; flex-grow: 1; justify-content: center; position: relative; - margin-top: auto; - margin-bottom: auto; flex-direction: column; max-width: 100%; } @@ -319,6 +311,9 @@ .wp-block-gallery.has-nested-images figure.wp-block-image figcaption img { display: inline; } +.wp-block-gallery.has-nested-images figure.wp-block-image figcaption a { + color: inherit; +} .wp-block-gallery.has-nested-images figure.wp-block-image.is-style-rounded > div, .wp-block-gallery.has-nested-images figure.wp-block-image.is-style-rounded > a { flex: 1 1 auto; @@ -340,12 +335,6 @@ margin-top: 0; margin-bottom: auto; } -.wp-block-gallery.has-nested-images:not(.is-cropped) figure.wp-block-image:not(#individual-image) img { - margin-bottom: var(--gallery-block--gutter-size, 16px); -} -.wp-block-gallery.has-nested-images:not(.is-cropped) figure.wp-block-image:not(#individual-image) figcaption { - bottom: var(--gallery-block--gutter-size, 16px); -} .wp-block-gallery.has-nested-images.is-cropped figure.wp-block-image:not(#individual-image) { align-self: inherit; } @@ -362,86 +351,33 @@ object-fit: cover; } .wp-block-gallery.has-nested-images.columns-1 figure.wp-block-image:not(#individual-image) { - margin-left: 0; width: 100%; } @media (min-width: 600px) { .wp-block-gallery.has-nested-images.columns-3 figure.wp-block-image:not(#individual-image) { - margin-left: var(--gallery-block--gutter-size, 16px); - width: calc(33.3333333333% - (var(--gallery-block--gutter-size, 16px) * 0.6666666667)); - } - .wp-block-gallery.has-nested-images.columns-3 figure.wp-block-image:not(#individual-image).is-dragging ~ figure.wp-block-image:not(#individual-image) { - margin-left: var(--gallery-block--gutter-size, 16px); + width: calc(33.3333333333% - (var(--wp--style--unstable-gallery-gap, 16px) * 0.6666666667)); } .wp-block-gallery.has-nested-images.columns-4 figure.wp-block-image:not(#individual-image) { - margin-left: var(--gallery-block--gutter-size, 16px); - width: calc(25% - (var(--gallery-block--gutter-size, 16px) * 0.75)); - } - .wp-block-gallery.has-nested-images.columns-4 figure.wp-block-image:not(#individual-image).is-dragging ~ figure.wp-block-image:not(#individual-image) { - margin-left: var(--gallery-block--gutter-size, 16px); + width: calc(25% - (var(--wp--style--unstable-gallery-gap, 16px) * 0.75)); } .wp-block-gallery.has-nested-images.columns-5 figure.wp-block-image:not(#individual-image) { - margin-left: var(--gallery-block--gutter-size, 16px); - width: calc(20% - (var(--gallery-block--gutter-size, 16px) * 0.8)); - } - .wp-block-gallery.has-nested-images.columns-5 figure.wp-block-image:not(#individual-image).is-dragging ~ figure.wp-block-image:not(#individual-image) { - margin-left: var(--gallery-block--gutter-size, 16px); + width: calc(20% - (var(--wp--style--unstable-gallery-gap, 16px) * 0.8)); } .wp-block-gallery.has-nested-images.columns-6 figure.wp-block-image:not(#individual-image) { - margin-left: var(--gallery-block--gutter-size, 16px); - width: calc(16.6666666667% - (var(--gallery-block--gutter-size, 16px) * 0.8333333333)); - } - .wp-block-gallery.has-nested-images.columns-6 figure.wp-block-image:not(#individual-image).is-dragging ~ figure.wp-block-image:not(#individual-image) { - margin-left: var(--gallery-block--gutter-size, 16px); + width: calc(16.6666666667% - (var(--wp--style--unstable-gallery-gap, 16px) * 0.8333333333)); } .wp-block-gallery.has-nested-images.columns-7 figure.wp-block-image:not(#individual-image) { - margin-left: var(--gallery-block--gutter-size, 16px); - width: calc(14.2857142857% - (var(--gallery-block--gutter-size, 16px) * 0.8571428571)); - } - .wp-block-gallery.has-nested-images.columns-7 figure.wp-block-image:not(#individual-image).is-dragging ~ figure.wp-block-image:not(#individual-image) { - margin-left: var(--gallery-block--gutter-size, 16px); + width: calc(14.2857142857% - (var(--wp--style--unstable-gallery-gap, 16px) * 0.8571428571)); } .wp-block-gallery.has-nested-images.columns-8 figure.wp-block-image:not(#individual-image) { - margin-left: var(--gallery-block--gutter-size, 16px); - width: calc(12.5% - (var(--gallery-block--gutter-size, 16px) * 0.875)); - } - .wp-block-gallery.has-nested-images.columns-8 figure.wp-block-image:not(#individual-image).is-dragging ~ figure.wp-block-image:not(#individual-image) { - margin-left: var(--gallery-block--gutter-size, 16px); - } - .wp-block-gallery.has-nested-images.columns-1 figure.wp-block-image:not(#individual-image):nth-of-type(1n) { - margin-left: 0; - } - .wp-block-gallery.has-nested-images.columns-2 figure.wp-block-image:not(#individual-image):nth-of-type(2n) { - margin-left: 0; - } - .wp-block-gallery.has-nested-images.columns-3 figure.wp-block-image:not(#individual-image):nth-of-type(3n) { - margin-left: 0; - } - .wp-block-gallery.has-nested-images.columns-4 figure.wp-block-image:not(#individual-image):nth-of-type(4n) { - margin-left: 0; - } - .wp-block-gallery.has-nested-images.columns-5 figure.wp-block-image:not(#individual-image):nth-of-type(5n) { - margin-left: 0; - } - .wp-block-gallery.has-nested-images.columns-6 figure.wp-block-image:not(#individual-image):nth-of-type(6n) { - margin-left: 0; - } - .wp-block-gallery.has-nested-images.columns-7 figure.wp-block-image:not(#individual-image):nth-of-type(7n) { - margin-left: 0; - } - .wp-block-gallery.has-nested-images.columns-8 figure.wp-block-image:not(#individual-image):nth-of-type(8n) { - margin-left: 0; + width: calc(12.5% - (var(--wp--style--unstable-gallery-gap, 16px) * 0.875)); } .wp-block-gallery.has-nested-images.columns-default figure.wp-block-image:not(#individual-image) { - margin-left: var(--gallery-block--gutter-size, 16px); - width: calc(33.33% - (var(--gallery-block--gutter-size, 16px) * 0.6666666667)); - } - .wp-block-gallery.has-nested-images.columns-default figure.wp-block-image:not(#individual-image):nth-of-type(3n+3) { - margin-left: 0; + width: calc(33.33% - (var(--wp--style--unstable-gallery-gap, 16px) * 0.6666666667)); } .wp-block-gallery.has-nested-images.columns-default figure.wp-block-image:not(#individual-image):first-child:nth-last-child(2), .wp-block-gallery.has-nested-images.columns-default figure.wp-block-image:not(#individual-image):first-child:nth-last-child(2) ~ figure.wp-block-image:not(#individual-image) { - width: calc(50% - (var(--gallery-block--gutter-size, 16px) * 0.5)); + width: calc(50% - (var(--wp--style--unstable-gallery-gap, 16px) * 0.5)); } .wp-block-gallery.has-nested-images.columns-default figure.wp-block-image:not(#individual-image):first-child:nth-last-child(1) { width: 100%; diff --git a/wp-includes/blocks/gallery/style-rtl.min.css b/wp-includes/blocks/gallery/style-rtl.min.css index 0186457823..1584824bba 100644 --- a/wp-includes/blocks/gallery/style-rtl.min.css +++ b/wp-includes/blocks/gallery/style-rtl.min.css @@ -1 +1 @@ -.blocks-gallery-grid,.wp-block-gallery{display:flex;flex-wrap:wrap;list-style-type:none;padding:0;margin:0}.blocks-gallery-grid .blocks-gallery-image,.blocks-gallery-grid .blocks-gallery-item,.wp-block-gallery .blocks-gallery-image,.wp-block-gallery .blocks-gallery-item{margin:0 0 1em 1em;display:flex;flex-grow:1;flex-direction:column;justify-content:center;position:relative;width:calc(50% - 1em)}.blocks-gallery-grid .blocks-gallery-image:nth-of-type(2n),.blocks-gallery-grid .blocks-gallery-item:nth-of-type(2n),.wp-block-gallery .blocks-gallery-image:nth-of-type(2n),.wp-block-gallery .blocks-gallery-item:nth-of-type(2n){margin-left:0}.blocks-gallery-grid .blocks-gallery-image figure,.blocks-gallery-grid .blocks-gallery-item figure,.wp-block-gallery .blocks-gallery-image figure,.wp-block-gallery .blocks-gallery-item figure{margin:0;height:100%;display:flex;align-items:flex-end;justify-content:flex-start}.blocks-gallery-grid .blocks-gallery-image img,.blocks-gallery-grid .blocks-gallery-item img,.wp-block-gallery .blocks-gallery-image img,.wp-block-gallery .blocks-gallery-item img{display:block;max-width:100%;height:auto;width:auto}.blocks-gallery-grid .blocks-gallery-image figcaption,.blocks-gallery-grid .blocks-gallery-item figcaption,.wp-block-gallery .blocks-gallery-image figcaption,.wp-block-gallery .blocks-gallery-item figcaption{position:absolute;bottom:0;width:100%;max-height:100%;overflow:auto;padding:3em .77em .7em;color:#fff;text-align:center;font-size:.8em;background:linear-gradient(0deg,rgba(0,0,0,.7),rgba(0,0,0,.3) 70%,transparent);box-sizing:border-box;margin:0;z-index:2}.blocks-gallery-grid .blocks-gallery-image figcaption img,.blocks-gallery-grid .blocks-gallery-item figcaption img,.wp-block-gallery .blocks-gallery-image figcaption img,.wp-block-gallery .blocks-gallery-item figcaption img{display:inline}.blocks-gallery-grid figcaption,.wp-block-gallery figcaption{flex-grow:1}.blocks-gallery-grid.is-cropped .blocks-gallery-image a,.blocks-gallery-grid.is-cropped .blocks-gallery-image img,.blocks-gallery-grid.is-cropped .blocks-gallery-item a,.blocks-gallery-grid.is-cropped .blocks-gallery-item img,.wp-block-gallery.is-cropped .blocks-gallery-image a,.wp-block-gallery.is-cropped .blocks-gallery-image img,.wp-block-gallery.is-cropped .blocks-gallery-item a,.wp-block-gallery.is-cropped .blocks-gallery-item img{width:100%;height:100%;flex:1;-o-object-fit:cover;object-fit:cover}.blocks-gallery-grid.columns-1 .blocks-gallery-image,.blocks-gallery-grid.columns-1 .blocks-gallery-item,.wp-block-gallery.columns-1 .blocks-gallery-image,.wp-block-gallery.columns-1 .blocks-gallery-item{width:100%;margin-left:0}@media (min-width:600px){.blocks-gallery-grid.columns-3 .blocks-gallery-image,.blocks-gallery-grid.columns-3 .blocks-gallery-item,.wp-block-gallery.columns-3 .blocks-gallery-image,.wp-block-gallery.columns-3 .blocks-gallery-item{width:calc(33.33333% - .66667em);margin-left:1em}.blocks-gallery-grid.columns-4 .blocks-gallery-image,.blocks-gallery-grid.columns-4 .blocks-gallery-item,.wp-block-gallery.columns-4 .blocks-gallery-image,.wp-block-gallery.columns-4 .blocks-gallery-item{width:calc(25% - .75em);margin-left:1em}.blocks-gallery-grid.columns-5 .blocks-gallery-image,.blocks-gallery-grid.columns-5 .blocks-gallery-item,.wp-block-gallery.columns-5 .blocks-gallery-image,.wp-block-gallery.columns-5 .blocks-gallery-item{width:calc(20% - .8em);margin-left:1em}.blocks-gallery-grid.columns-6 .blocks-gallery-image,.blocks-gallery-grid.columns-6 .blocks-gallery-item,.wp-block-gallery.columns-6 .blocks-gallery-image,.wp-block-gallery.columns-6 .blocks-gallery-item{width:calc(16.66667% - .83333em);margin-left:1em}.blocks-gallery-grid.columns-7 .blocks-gallery-image,.blocks-gallery-grid.columns-7 .blocks-gallery-item,.wp-block-gallery.columns-7 .blocks-gallery-image,.wp-block-gallery.columns-7 .blocks-gallery-item{width:calc(14.28571% - .85714em);margin-left:1em}.blocks-gallery-grid.columns-8 .blocks-gallery-image,.blocks-gallery-grid.columns-8 .blocks-gallery-item,.wp-block-gallery.columns-8 .blocks-gallery-image,.wp-block-gallery.columns-8 .blocks-gallery-item{width:calc(12.5% - .875em);margin-left:1em}.blocks-gallery-grid.columns-1 .blocks-gallery-image:nth-of-type(1n),.blocks-gallery-grid.columns-1 .blocks-gallery-item:nth-of-type(1n),.blocks-gallery-grid.columns-2 .blocks-gallery-image:nth-of-type(2n),.blocks-gallery-grid.columns-2 .blocks-gallery-item:nth-of-type(2n),.blocks-gallery-grid.columns-3 .blocks-gallery-image:nth-of-type(3n),.blocks-gallery-grid.columns-3 .blocks-gallery-item:nth-of-type(3n),.blocks-gallery-grid.columns-4 .blocks-gallery-image:nth-of-type(4n),.blocks-gallery-grid.columns-4 .blocks-gallery-item:nth-of-type(4n),.blocks-gallery-grid.columns-5 .blocks-gallery-image:nth-of-type(5n),.blocks-gallery-grid.columns-5 .blocks-gallery-item:nth-of-type(5n),.blocks-gallery-grid.columns-6 .blocks-gallery-image:nth-of-type(6n),.blocks-gallery-grid.columns-6 .blocks-gallery-item:nth-of-type(6n),.blocks-gallery-grid.columns-7 .blocks-gallery-image:nth-of-type(7n),.blocks-gallery-grid.columns-7 .blocks-gallery-item:nth-of-type(7n),.blocks-gallery-grid.columns-8 .blocks-gallery-image:nth-of-type(8n),.blocks-gallery-grid.columns-8 .blocks-gallery-item:nth-of-type(8n),.wp-block-gallery.columns-1 .blocks-gallery-image:nth-of-type(1n),.wp-block-gallery.columns-1 .blocks-gallery-item:nth-of-type(1n),.wp-block-gallery.columns-2 .blocks-gallery-image:nth-of-type(2n),.wp-block-gallery.columns-2 .blocks-gallery-item:nth-of-type(2n),.wp-block-gallery.columns-3 .blocks-gallery-image:nth-of-type(3n),.wp-block-gallery.columns-3 .blocks-gallery-item:nth-of-type(3n),.wp-block-gallery.columns-4 .blocks-gallery-image:nth-of-type(4n),.wp-block-gallery.columns-4 .blocks-gallery-item:nth-of-type(4n),.wp-block-gallery.columns-5 .blocks-gallery-image:nth-of-type(5n),.wp-block-gallery.columns-5 .blocks-gallery-item:nth-of-type(5n),.wp-block-gallery.columns-6 .blocks-gallery-image:nth-of-type(6n),.wp-block-gallery.columns-6 .blocks-gallery-item:nth-of-type(6n),.wp-block-gallery.columns-7 .blocks-gallery-image:nth-of-type(7n),.wp-block-gallery.columns-7 .blocks-gallery-item:nth-of-type(7n),.wp-block-gallery.columns-8 .blocks-gallery-image:nth-of-type(8n),.wp-block-gallery.columns-8 .blocks-gallery-item:nth-of-type(8n){margin-left:0}}.blocks-gallery-grid .blocks-gallery-image:last-child,.blocks-gallery-grid .blocks-gallery-item:last-child,.wp-block-gallery .blocks-gallery-image:last-child,.wp-block-gallery .blocks-gallery-item:last-child{margin-left:0}.blocks-gallery-grid.alignleft,.blocks-gallery-grid.alignright,.wp-block-gallery.alignleft,.wp-block-gallery.alignright{max-width:420px;width:100%}.blocks-gallery-grid.aligncenter .blocks-gallery-item figure,.wp-block-gallery.aligncenter .blocks-gallery-item figure{justify-content:center}.wp-block-gallery:not(.is-cropped) .blocks-gallery-item{align-self:flex-start}.wp-block-gallery.has-nested-images{display:flex;flex-wrap:wrap}.wp-block-gallery.has-nested-images figure.wp-block-image:not(#individual-image){margin:0 0 var(--gallery-block--gutter-size,16px) var(--gallery-block--gutter-size,16px);width:calc(50% - var(--gallery-block--gutter-size, 16px)/2)}.wp-block-gallery.has-nested-images figure.wp-block-image:not(#individual-image):last-of-type:not(#individual-image),.wp-block-gallery.has-nested-images figure.wp-block-image:not(#individual-image):nth-of-type(2n){margin-left:0}.wp-block-gallery.has-nested-images figure.wp-block-image{display:flex;flex-grow:1;justify-content:center;position:relative;margin-top:auto;margin-bottom:auto;flex-direction:column;max-width:100%}.wp-block-gallery.has-nested-images figure.wp-block-image>a,.wp-block-gallery.has-nested-images figure.wp-block-image>div{margin:0;flex-direction:column;flex-grow:1}.wp-block-gallery.has-nested-images figure.wp-block-image img{display:block;height:auto;max-width:100%!important;width:auto}.wp-block-gallery.has-nested-images figure.wp-block-image figcaption{background:linear-gradient(0deg,rgba(0,0,0,.7),rgba(0,0,0,.3) 70%,transparent);bottom:0;color:#fff;font-size:13px;right:0;margin-bottom:0;max-height:60%;overflow:auto;padding:0 8px 8px;position:absolute;text-align:center;width:100%;box-sizing:border-box}.wp-block-gallery.has-nested-images figure.wp-block-image figcaption img{display:inline}.wp-block-gallery.has-nested-images figure.wp-block-image.is-style-rounded>a,.wp-block-gallery.has-nested-images figure.wp-block-image.is-style-rounded>div{flex:1 1 auto}.wp-block-gallery.has-nested-images figure.wp-block-image.is-style-rounded figcaption{flex:initial;background:none;color:inherit;margin:0;padding:10px 10px 9px;position:relative}.wp-block-gallery.has-nested-images figcaption{flex-grow:1;flex-basis:100%;text-align:center}.wp-block-gallery.has-nested-images:not(.is-cropped) figure.wp-block-image:not(#individual-image){margin-top:0;margin-bottom:auto}.wp-block-gallery.has-nested-images:not(.is-cropped) figure.wp-block-image:not(#individual-image) img{margin-bottom:var(--gallery-block--gutter-size,16px)}.wp-block-gallery.has-nested-images:not(.is-cropped) figure.wp-block-image:not(#individual-image) figcaption{bottom:var(--gallery-block--gutter-size,16px)}.wp-block-gallery.has-nested-images.is-cropped figure.wp-block-image:not(#individual-image){align-self:inherit}.wp-block-gallery.has-nested-images.is-cropped figure.wp-block-image:not(#individual-image)>a,.wp-block-gallery.has-nested-images.is-cropped figure.wp-block-image:not(#individual-image)>div:not(.components-drop-zone){display:flex}.wp-block-gallery.has-nested-images.is-cropped figure.wp-block-image:not(#individual-image) a,.wp-block-gallery.has-nested-images.is-cropped figure.wp-block-image:not(#individual-image) img{width:100%;flex:1 0 0%;height:100%;-o-object-fit:cover;object-fit:cover}.wp-block-gallery.has-nested-images.columns-1 figure.wp-block-image:not(#individual-image){margin-left:0;width:100%}@media (min-width:600px){.wp-block-gallery.has-nested-images.columns-3 figure.wp-block-image:not(#individual-image){margin-left:var(--gallery-block--gutter-size,16px);width:calc(33.33333% - var(--gallery-block--gutter-size, 16px)*0.66667)}.wp-block-gallery.has-nested-images.columns-3 figure.wp-block-image:not(#individual-image).is-dragging~figure.wp-block-image:not(#individual-image){margin-left:var(--gallery-block--gutter-size,16px)}.wp-block-gallery.has-nested-images.columns-4 figure.wp-block-image:not(#individual-image){margin-left:var(--gallery-block--gutter-size,16px);width:calc(25% - var(--gallery-block--gutter-size, 16px)*0.75)}.wp-block-gallery.has-nested-images.columns-4 figure.wp-block-image:not(#individual-image).is-dragging~figure.wp-block-image:not(#individual-image){margin-left:var(--gallery-block--gutter-size,16px)}.wp-block-gallery.has-nested-images.columns-5 figure.wp-block-image:not(#individual-image){margin-left:var(--gallery-block--gutter-size,16px);width:calc(20% - var(--gallery-block--gutter-size, 16px)*0.8)}.wp-block-gallery.has-nested-images.columns-5 figure.wp-block-image:not(#individual-image).is-dragging~figure.wp-block-image:not(#individual-image){margin-left:var(--gallery-block--gutter-size,16px)}.wp-block-gallery.has-nested-images.columns-6 figure.wp-block-image:not(#individual-image){margin-left:var(--gallery-block--gutter-size,16px);width:calc(16.66667% - var(--gallery-block--gutter-size, 16px)*0.83333)}.wp-block-gallery.has-nested-images.columns-6 figure.wp-block-image:not(#individual-image).is-dragging~figure.wp-block-image:not(#individual-image){margin-left:var(--gallery-block--gutter-size,16px)}.wp-block-gallery.has-nested-images.columns-7 figure.wp-block-image:not(#individual-image){margin-left:var(--gallery-block--gutter-size,16px);width:calc(14.28571% - var(--gallery-block--gutter-size, 16px)*0.85714)}.wp-block-gallery.has-nested-images.columns-7 figure.wp-block-image:not(#individual-image).is-dragging~figure.wp-block-image:not(#individual-image){margin-left:var(--gallery-block--gutter-size,16px)}.wp-block-gallery.has-nested-images.columns-8 figure.wp-block-image:not(#individual-image){margin-left:var(--gallery-block--gutter-size,16px);width:calc(12.5% - var(--gallery-block--gutter-size, 16px)*0.875)}.wp-block-gallery.has-nested-images.columns-8 figure.wp-block-image:not(#individual-image).is-dragging~figure.wp-block-image:not(#individual-image){margin-left:var(--gallery-block--gutter-size,16px)}.wp-block-gallery.has-nested-images.columns-1 figure.wp-block-image:not(#individual-image):nth-of-type(1n),.wp-block-gallery.has-nested-images.columns-2 figure.wp-block-image:not(#individual-image):nth-of-type(2n),.wp-block-gallery.has-nested-images.columns-3 figure.wp-block-image:not(#individual-image):nth-of-type(3n),.wp-block-gallery.has-nested-images.columns-4 figure.wp-block-image:not(#individual-image):nth-of-type(4n),.wp-block-gallery.has-nested-images.columns-5 figure.wp-block-image:not(#individual-image):nth-of-type(5n),.wp-block-gallery.has-nested-images.columns-6 figure.wp-block-image:not(#individual-image):nth-of-type(6n),.wp-block-gallery.has-nested-images.columns-7 figure.wp-block-image:not(#individual-image):nth-of-type(7n),.wp-block-gallery.has-nested-images.columns-8 figure.wp-block-image:not(#individual-image):nth-of-type(8n){margin-left:0}.wp-block-gallery.has-nested-images.columns-default figure.wp-block-image:not(#individual-image){margin-left:var(--gallery-block--gutter-size,16px);width:calc(33.33% - var(--gallery-block--gutter-size, 16px)*0.66667)}.wp-block-gallery.has-nested-images.columns-default figure.wp-block-image:not(#individual-image):nth-of-type(3n+3){margin-left:0}.wp-block-gallery.has-nested-images.columns-default figure.wp-block-image:not(#individual-image):first-child:nth-last-child(2),.wp-block-gallery.has-nested-images.columns-default figure.wp-block-image:not(#individual-image):first-child:nth-last-child(2)~figure.wp-block-image:not(#individual-image){width:calc(50% - var(--gallery-block--gutter-size, 16px)*0.5)}.wp-block-gallery.has-nested-images.columns-default figure.wp-block-image:not(#individual-image):first-child:last-child{width:100%}}.wp-block-gallery.has-nested-images.alignleft,.wp-block-gallery.has-nested-images.alignright{max-width:420px;width:100%}.wp-block-gallery.has-nested-images.aligncenter{justify-content:center} \ No newline at end of file +.blocks-gallery-grid:not(.has-nested-images),.wp-block-gallery:not(.has-nested-images){display:flex;flex-wrap:wrap;list-style-type:none;padding:0;margin:0}.blocks-gallery-grid:not(.has-nested-images) .blocks-gallery-image,.blocks-gallery-grid:not(.has-nested-images) .blocks-gallery-item,.wp-block-gallery:not(.has-nested-images) .blocks-gallery-image,.wp-block-gallery:not(.has-nested-images) .blocks-gallery-item{margin:0 0 1em 1em;display:flex;flex-grow:1;flex-direction:column;justify-content:center;position:relative;width:calc(50% - 1em)}.blocks-gallery-grid:not(.has-nested-images) .blocks-gallery-image:nth-of-type(2n),.blocks-gallery-grid:not(.has-nested-images) .blocks-gallery-item:nth-of-type(2n),.wp-block-gallery:not(.has-nested-images) .blocks-gallery-image:nth-of-type(2n),.wp-block-gallery:not(.has-nested-images) .blocks-gallery-item:nth-of-type(2n){margin-left:0}.blocks-gallery-grid:not(.has-nested-images) .blocks-gallery-image figure,.blocks-gallery-grid:not(.has-nested-images) .blocks-gallery-item figure,.wp-block-gallery:not(.has-nested-images) .blocks-gallery-image figure,.wp-block-gallery:not(.has-nested-images) .blocks-gallery-item figure{margin:0;height:100%;display:flex;align-items:flex-end;justify-content:flex-start}.blocks-gallery-grid:not(.has-nested-images) .blocks-gallery-image img,.blocks-gallery-grid:not(.has-nested-images) .blocks-gallery-item img,.wp-block-gallery:not(.has-nested-images) .blocks-gallery-image img,.wp-block-gallery:not(.has-nested-images) .blocks-gallery-item img{display:block;max-width:100%;height:auto;width:auto}.blocks-gallery-grid:not(.has-nested-images) .blocks-gallery-image figcaption,.blocks-gallery-grid:not(.has-nested-images) .blocks-gallery-item figcaption,.wp-block-gallery:not(.has-nested-images) .blocks-gallery-image figcaption,.wp-block-gallery:not(.has-nested-images) .blocks-gallery-item figcaption{position:absolute;bottom:0;width:100%;max-height:100%;overflow:auto;padding:3em .77em .7em;color:#fff;text-align:center;font-size:.8em;background:linear-gradient(0deg,rgba(0,0,0,.7),rgba(0,0,0,.3) 70%,transparent);box-sizing:border-box;margin:0;z-index:2}.blocks-gallery-grid:not(.has-nested-images) .blocks-gallery-image figcaption img,.blocks-gallery-grid:not(.has-nested-images) .blocks-gallery-item figcaption img,.wp-block-gallery:not(.has-nested-images) .blocks-gallery-image figcaption img,.wp-block-gallery:not(.has-nested-images) .blocks-gallery-item figcaption img{display:inline}.blocks-gallery-grid:not(.has-nested-images) figcaption,.wp-block-gallery:not(.has-nested-images) figcaption{flex-grow:1}.blocks-gallery-grid:not(.has-nested-images).is-cropped .blocks-gallery-image a,.blocks-gallery-grid:not(.has-nested-images).is-cropped .blocks-gallery-image img,.blocks-gallery-grid:not(.has-nested-images).is-cropped .blocks-gallery-item a,.blocks-gallery-grid:not(.has-nested-images).is-cropped .blocks-gallery-item img,.wp-block-gallery:not(.has-nested-images).is-cropped .blocks-gallery-image a,.wp-block-gallery:not(.has-nested-images).is-cropped .blocks-gallery-image img,.wp-block-gallery:not(.has-nested-images).is-cropped .blocks-gallery-item a,.wp-block-gallery:not(.has-nested-images).is-cropped .blocks-gallery-item img{width:100%;height:100%;flex:1;-o-object-fit:cover;object-fit:cover}.blocks-gallery-grid:not(.has-nested-images).columns-1 .blocks-gallery-image,.blocks-gallery-grid:not(.has-nested-images).columns-1 .blocks-gallery-item,.wp-block-gallery:not(.has-nested-images).columns-1 .blocks-gallery-image,.wp-block-gallery:not(.has-nested-images).columns-1 .blocks-gallery-item{width:100%;margin-left:0}@media (min-width:600px){.blocks-gallery-grid:not(.has-nested-images).columns-3 .blocks-gallery-image,.blocks-gallery-grid:not(.has-nested-images).columns-3 .blocks-gallery-item,.wp-block-gallery:not(.has-nested-images).columns-3 .blocks-gallery-image,.wp-block-gallery:not(.has-nested-images).columns-3 .blocks-gallery-item{width:calc(33.33333% - .66667em);margin-left:1em}.blocks-gallery-grid:not(.has-nested-images).columns-4 .blocks-gallery-image,.blocks-gallery-grid:not(.has-nested-images).columns-4 .blocks-gallery-item,.wp-block-gallery:not(.has-nested-images).columns-4 .blocks-gallery-image,.wp-block-gallery:not(.has-nested-images).columns-4 .blocks-gallery-item{width:calc(25% - .75em);margin-left:1em}.blocks-gallery-grid:not(.has-nested-images).columns-5 .blocks-gallery-image,.blocks-gallery-grid:not(.has-nested-images).columns-5 .blocks-gallery-item,.wp-block-gallery:not(.has-nested-images).columns-5 .blocks-gallery-image,.wp-block-gallery:not(.has-nested-images).columns-5 .blocks-gallery-item{width:calc(20% - .8em);margin-left:1em}.blocks-gallery-grid:not(.has-nested-images).columns-6 .blocks-gallery-image,.blocks-gallery-grid:not(.has-nested-images).columns-6 .blocks-gallery-item,.wp-block-gallery:not(.has-nested-images).columns-6 .blocks-gallery-image,.wp-block-gallery:not(.has-nested-images).columns-6 .blocks-gallery-item{width:calc(16.66667% - .83333em);margin-left:1em}.blocks-gallery-grid:not(.has-nested-images).columns-7 .blocks-gallery-image,.blocks-gallery-grid:not(.has-nested-images).columns-7 .blocks-gallery-item,.wp-block-gallery:not(.has-nested-images).columns-7 .blocks-gallery-image,.wp-block-gallery:not(.has-nested-images).columns-7 .blocks-gallery-item{width:calc(14.28571% - .85714em);margin-left:1em}.blocks-gallery-grid:not(.has-nested-images).columns-8 .blocks-gallery-image,.blocks-gallery-grid:not(.has-nested-images).columns-8 .blocks-gallery-item,.wp-block-gallery:not(.has-nested-images).columns-8 .blocks-gallery-image,.wp-block-gallery:not(.has-nested-images).columns-8 .blocks-gallery-item{width:calc(12.5% - .875em);margin-left:1em}.blocks-gallery-grid:not(.has-nested-images).columns-1 .blocks-gallery-image:nth-of-type(1n),.blocks-gallery-grid:not(.has-nested-images).columns-1 .blocks-gallery-item:nth-of-type(1n),.blocks-gallery-grid:not(.has-nested-images).columns-2 .blocks-gallery-image:nth-of-type(2n),.blocks-gallery-grid:not(.has-nested-images).columns-2 .blocks-gallery-item:nth-of-type(2n),.blocks-gallery-grid:not(.has-nested-images).columns-3 .blocks-gallery-image:nth-of-type(3n),.blocks-gallery-grid:not(.has-nested-images).columns-3 .blocks-gallery-item:nth-of-type(3n),.blocks-gallery-grid:not(.has-nested-images).columns-4 .blocks-gallery-image:nth-of-type(4n),.blocks-gallery-grid:not(.has-nested-images).columns-4 .blocks-gallery-item:nth-of-type(4n),.blocks-gallery-grid:not(.has-nested-images).columns-5 .blocks-gallery-image:nth-of-type(5n),.blocks-gallery-grid:not(.has-nested-images).columns-5 .blocks-gallery-item:nth-of-type(5n),.blocks-gallery-grid:not(.has-nested-images).columns-6 .blocks-gallery-image:nth-of-type(6n),.blocks-gallery-grid:not(.has-nested-images).columns-6 .blocks-gallery-item:nth-of-type(6n),.blocks-gallery-grid:not(.has-nested-images).columns-7 .blocks-gallery-image:nth-of-type(7n),.blocks-gallery-grid:not(.has-nested-images).columns-7 .blocks-gallery-item:nth-of-type(7n),.blocks-gallery-grid:not(.has-nested-images).columns-8 .blocks-gallery-image:nth-of-type(8n),.blocks-gallery-grid:not(.has-nested-images).columns-8 .blocks-gallery-item:nth-of-type(8n),.wp-block-gallery:not(.has-nested-images).columns-1 .blocks-gallery-image:nth-of-type(1n),.wp-block-gallery:not(.has-nested-images).columns-1 .blocks-gallery-item:nth-of-type(1n),.wp-block-gallery:not(.has-nested-images).columns-2 .blocks-gallery-image:nth-of-type(2n),.wp-block-gallery:not(.has-nested-images).columns-2 .blocks-gallery-item:nth-of-type(2n),.wp-block-gallery:not(.has-nested-images).columns-3 .blocks-gallery-image:nth-of-type(3n),.wp-block-gallery:not(.has-nested-images).columns-3 .blocks-gallery-item:nth-of-type(3n),.wp-block-gallery:not(.has-nested-images).columns-4 .blocks-gallery-image:nth-of-type(4n),.wp-block-gallery:not(.has-nested-images).columns-4 .blocks-gallery-item:nth-of-type(4n),.wp-block-gallery:not(.has-nested-images).columns-5 .blocks-gallery-image:nth-of-type(5n),.wp-block-gallery:not(.has-nested-images).columns-5 .blocks-gallery-item:nth-of-type(5n),.wp-block-gallery:not(.has-nested-images).columns-6 .blocks-gallery-image:nth-of-type(6n),.wp-block-gallery:not(.has-nested-images).columns-6 .blocks-gallery-item:nth-of-type(6n),.wp-block-gallery:not(.has-nested-images).columns-7 .blocks-gallery-image:nth-of-type(7n),.wp-block-gallery:not(.has-nested-images).columns-7 .blocks-gallery-item:nth-of-type(7n),.wp-block-gallery:not(.has-nested-images).columns-8 .blocks-gallery-image:nth-of-type(8n),.wp-block-gallery:not(.has-nested-images).columns-8 .blocks-gallery-item:nth-of-type(8n){margin-left:0}}.blocks-gallery-grid:not(.has-nested-images) .blocks-gallery-image:last-child,.blocks-gallery-grid:not(.has-nested-images) .blocks-gallery-item:last-child,.wp-block-gallery:not(.has-nested-images) .blocks-gallery-image:last-child,.wp-block-gallery:not(.has-nested-images) .blocks-gallery-item:last-child{margin-left:0}.blocks-gallery-grid:not(.has-nested-images).alignleft,.blocks-gallery-grid:not(.has-nested-images).alignright,.wp-block-gallery:not(.has-nested-images).alignleft,.wp-block-gallery:not(.has-nested-images).alignright{max-width:420px;width:100%}.blocks-gallery-grid:not(.has-nested-images).aligncenter .blocks-gallery-item figure,.wp-block-gallery:not(.has-nested-images).aligncenter .blocks-gallery-item figure{justify-content:center}.wp-block-gallery:not(.is-cropped) .blocks-gallery-item{align-self:flex-start}figure.wp-block-gallery.has-nested-images{align-items:normal}.wp-block-gallery.has-nested-images figure.wp-block-image:not(#individual-image){width:calc(50% - var(--wp--style--unstable-gallery-gap, 16px)/2);margin:0}.wp-block-gallery.has-nested-images figure.wp-block-image{display:flex;flex-grow:1;justify-content:center;position:relative;flex-direction:column;max-width:100%}.wp-block-gallery.has-nested-images figure.wp-block-image>a,.wp-block-gallery.has-nested-images figure.wp-block-image>div{margin:0;flex-direction:column;flex-grow:1}.wp-block-gallery.has-nested-images figure.wp-block-image img{display:block;height:auto;max-width:100%!important;width:auto}.wp-block-gallery.has-nested-images figure.wp-block-image figcaption{background:linear-gradient(0deg,rgba(0,0,0,.7),rgba(0,0,0,.3) 70%,transparent);bottom:0;color:#fff;font-size:13px;right:0;margin-bottom:0;max-height:60%;overflow:auto;padding:0 8px 8px;position:absolute;text-align:center;width:100%;box-sizing:border-box}.wp-block-gallery.has-nested-images figure.wp-block-image figcaption img{display:inline}.wp-block-gallery.has-nested-images figure.wp-block-image figcaption a{color:inherit}.wp-block-gallery.has-nested-images figure.wp-block-image.is-style-rounded>a,.wp-block-gallery.has-nested-images figure.wp-block-image.is-style-rounded>div{flex:1 1 auto}.wp-block-gallery.has-nested-images figure.wp-block-image.is-style-rounded figcaption{flex:initial;background:none;color:inherit;margin:0;padding:10px 10px 9px;position:relative}.wp-block-gallery.has-nested-images figcaption{flex-grow:1;flex-basis:100%;text-align:center}.wp-block-gallery.has-nested-images:not(.is-cropped) figure.wp-block-image:not(#individual-image){margin-top:0;margin-bottom:auto}.wp-block-gallery.has-nested-images.is-cropped figure.wp-block-image:not(#individual-image){align-self:inherit}.wp-block-gallery.has-nested-images.is-cropped figure.wp-block-image:not(#individual-image)>a,.wp-block-gallery.has-nested-images.is-cropped figure.wp-block-image:not(#individual-image)>div:not(.components-drop-zone){display:flex}.wp-block-gallery.has-nested-images.is-cropped figure.wp-block-image:not(#individual-image) a,.wp-block-gallery.has-nested-images.is-cropped figure.wp-block-image:not(#individual-image) img{width:100%;flex:1 0 0%;height:100%;-o-object-fit:cover;object-fit:cover}.wp-block-gallery.has-nested-images.columns-1 figure.wp-block-image:not(#individual-image){width:100%}@media (min-width:600px){.wp-block-gallery.has-nested-images.columns-3 figure.wp-block-image:not(#individual-image){width:calc(33.33333% - var(--wp--style--unstable-gallery-gap, 16px)*0.66667)}.wp-block-gallery.has-nested-images.columns-4 figure.wp-block-image:not(#individual-image){width:calc(25% - var(--wp--style--unstable-gallery-gap, 16px)*0.75)}.wp-block-gallery.has-nested-images.columns-5 figure.wp-block-image:not(#individual-image){width:calc(20% - var(--wp--style--unstable-gallery-gap, 16px)*0.8)}.wp-block-gallery.has-nested-images.columns-6 figure.wp-block-image:not(#individual-image){width:calc(16.66667% - var(--wp--style--unstable-gallery-gap, 16px)*0.83333)}.wp-block-gallery.has-nested-images.columns-7 figure.wp-block-image:not(#individual-image){width:calc(14.28571% - var(--wp--style--unstable-gallery-gap, 16px)*0.85714)}.wp-block-gallery.has-nested-images.columns-8 figure.wp-block-image:not(#individual-image){width:calc(12.5% - var(--wp--style--unstable-gallery-gap, 16px)*0.875)}.wp-block-gallery.has-nested-images.columns-default figure.wp-block-image:not(#individual-image){width:calc(33.33% - var(--wp--style--unstable-gallery-gap, 16px)*0.66667)}.wp-block-gallery.has-nested-images.columns-default figure.wp-block-image:not(#individual-image):first-child:nth-last-child(2),.wp-block-gallery.has-nested-images.columns-default figure.wp-block-image:not(#individual-image):first-child:nth-last-child(2)~figure.wp-block-image:not(#individual-image){width:calc(50% - var(--wp--style--unstable-gallery-gap, 16px)*0.5)}.wp-block-gallery.has-nested-images.columns-default figure.wp-block-image:not(#individual-image):first-child:last-child{width:100%}}.wp-block-gallery.has-nested-images.alignleft,.wp-block-gallery.has-nested-images.alignright{max-width:420px;width:100%}.wp-block-gallery.has-nested-images.aligncenter{justify-content:center} \ No newline at end of file diff --git a/wp-includes/blocks/gallery/style.css b/wp-includes/blocks/gallery/style.css index 779f95acde..64e108b9d8 100644 --- a/wp-includes/blocks/gallery/style.css +++ b/wp-includes/blocks/gallery/style.css @@ -74,18 +74,18 @@ /** * Reset the WP Admin page styles for Gutenberg-like pages. */ -.wp-block-gallery, -.blocks-gallery-grid { +.wp-block-gallery:not(.has-nested-images), +.blocks-gallery-grid:not(.has-nested-images) { display: flex; flex-wrap: wrap; list-style-type: none; padding: 0; margin: 0; } -.wp-block-gallery .blocks-gallery-image, -.wp-block-gallery .blocks-gallery-item, -.blocks-gallery-grid .blocks-gallery-image, -.blocks-gallery-grid .blocks-gallery-item { +.wp-block-gallery:not(.has-nested-images) .blocks-gallery-image, +.wp-block-gallery:not(.has-nested-images) .blocks-gallery-item, +.blocks-gallery-grid:not(.has-nested-images) .blocks-gallery-image, +.blocks-gallery-grid:not(.has-nested-images) .blocks-gallery-item { margin: 0 1em 1em 0; display: flex; flex-grow: 1; @@ -94,35 +94,35 @@ position: relative; width: calc(50% - 1em); } -.wp-block-gallery .blocks-gallery-image:nth-of-type(even), -.wp-block-gallery .blocks-gallery-item:nth-of-type(even), -.blocks-gallery-grid .blocks-gallery-image:nth-of-type(even), -.blocks-gallery-grid .blocks-gallery-item:nth-of-type(even) { +.wp-block-gallery:not(.has-nested-images) .blocks-gallery-image:nth-of-type(even), +.wp-block-gallery:not(.has-nested-images) .blocks-gallery-item:nth-of-type(even), +.blocks-gallery-grid:not(.has-nested-images) .blocks-gallery-image:nth-of-type(even), +.blocks-gallery-grid:not(.has-nested-images) .blocks-gallery-item:nth-of-type(even) { margin-right: 0; } -.wp-block-gallery .blocks-gallery-image figure, -.wp-block-gallery .blocks-gallery-item figure, -.blocks-gallery-grid .blocks-gallery-image figure, -.blocks-gallery-grid .blocks-gallery-item figure { +.wp-block-gallery:not(.has-nested-images) .blocks-gallery-image figure, +.wp-block-gallery:not(.has-nested-images) .blocks-gallery-item figure, +.blocks-gallery-grid:not(.has-nested-images) .blocks-gallery-image figure, +.blocks-gallery-grid:not(.has-nested-images) .blocks-gallery-item figure { margin: 0; height: 100%; display: flex; align-items: flex-end; justify-content: flex-start; } -.wp-block-gallery .blocks-gallery-image img, -.wp-block-gallery .blocks-gallery-item img, -.blocks-gallery-grid .blocks-gallery-image img, -.blocks-gallery-grid .blocks-gallery-item img { +.wp-block-gallery:not(.has-nested-images) .blocks-gallery-image img, +.wp-block-gallery:not(.has-nested-images) .blocks-gallery-item img, +.blocks-gallery-grid:not(.has-nested-images) .blocks-gallery-image img, +.blocks-gallery-grid:not(.has-nested-images) .blocks-gallery-item img { display: block; max-width: 100%; height: auto; width: auto; } -.wp-block-gallery .blocks-gallery-image figcaption, -.wp-block-gallery .blocks-gallery-item figcaption, -.blocks-gallery-grid .blocks-gallery-image figcaption, -.blocks-gallery-grid .blocks-gallery-item figcaption { +.wp-block-gallery:not(.has-nested-images) .blocks-gallery-image figcaption, +.wp-block-gallery:not(.has-nested-images) .blocks-gallery-item figcaption, +.blocks-gallery-grid:not(.has-nested-images) .blocks-gallery-image figcaption, +.blocks-gallery-grid:not(.has-nested-images) .blocks-gallery-item figcaption { position: absolute; bottom: 0; width: 100%; @@ -137,127 +137,127 @@ margin: 0; z-index: 2; } -.wp-block-gallery .blocks-gallery-image figcaption img, -.wp-block-gallery .blocks-gallery-item figcaption img, -.blocks-gallery-grid .blocks-gallery-image figcaption img, -.blocks-gallery-grid .blocks-gallery-item figcaption img { +.wp-block-gallery:not(.has-nested-images) .blocks-gallery-image figcaption img, +.wp-block-gallery:not(.has-nested-images) .blocks-gallery-item figcaption img, +.blocks-gallery-grid:not(.has-nested-images) .blocks-gallery-image figcaption img, +.blocks-gallery-grid:not(.has-nested-images) .blocks-gallery-item figcaption img { display: inline; } -.wp-block-gallery figcaption, -.blocks-gallery-grid figcaption { +.wp-block-gallery:not(.has-nested-images) figcaption, +.blocks-gallery-grid:not(.has-nested-images) figcaption { flex-grow: 1; } -.wp-block-gallery.is-cropped .blocks-gallery-image a, -.wp-block-gallery.is-cropped .blocks-gallery-image img, .wp-block-gallery.is-cropped .blocks-gallery-item a, -.wp-block-gallery.is-cropped .blocks-gallery-item img, -.blocks-gallery-grid.is-cropped .blocks-gallery-image a, -.blocks-gallery-grid.is-cropped .blocks-gallery-image img, -.blocks-gallery-grid.is-cropped .blocks-gallery-item a, -.blocks-gallery-grid.is-cropped .blocks-gallery-item img { +.wp-block-gallery:not(.has-nested-images).is-cropped .blocks-gallery-image a, +.wp-block-gallery:not(.has-nested-images).is-cropped .blocks-gallery-image img, .wp-block-gallery:not(.has-nested-images).is-cropped .blocks-gallery-item a, +.wp-block-gallery:not(.has-nested-images).is-cropped .blocks-gallery-item img, +.blocks-gallery-grid:not(.has-nested-images).is-cropped .blocks-gallery-image a, +.blocks-gallery-grid:not(.has-nested-images).is-cropped .blocks-gallery-image img, +.blocks-gallery-grid:not(.has-nested-images).is-cropped .blocks-gallery-item a, +.blocks-gallery-grid:not(.has-nested-images).is-cropped .blocks-gallery-item img { width: 100%; height: 100%; flex: 1; -o-object-fit: cover; object-fit: cover; } -.wp-block-gallery.columns-1 .blocks-gallery-image, .wp-block-gallery.columns-1 .blocks-gallery-item, -.blocks-gallery-grid.columns-1 .blocks-gallery-image, -.blocks-gallery-grid.columns-1 .blocks-gallery-item { +.wp-block-gallery:not(.has-nested-images).columns-1 .blocks-gallery-image, .wp-block-gallery:not(.has-nested-images).columns-1 .blocks-gallery-item, +.blocks-gallery-grid:not(.has-nested-images).columns-1 .blocks-gallery-image, +.blocks-gallery-grid:not(.has-nested-images).columns-1 .blocks-gallery-item { width: 100%; margin-right: 0; } @media (min-width: 600px) { - .wp-block-gallery.columns-3 .blocks-gallery-image, .wp-block-gallery.columns-3 .blocks-gallery-item, -.blocks-gallery-grid.columns-3 .blocks-gallery-image, -.blocks-gallery-grid.columns-3 .blocks-gallery-item { + .wp-block-gallery:not(.has-nested-images).columns-3 .blocks-gallery-image, .wp-block-gallery:not(.has-nested-images).columns-3 .blocks-gallery-item, +.blocks-gallery-grid:not(.has-nested-images).columns-3 .blocks-gallery-image, +.blocks-gallery-grid:not(.has-nested-images).columns-3 .blocks-gallery-item { width: calc(33.3333333333% - 0.6666666667em); margin-right: 1em; } - .wp-block-gallery.columns-4 .blocks-gallery-image, .wp-block-gallery.columns-4 .blocks-gallery-item, -.blocks-gallery-grid.columns-4 .blocks-gallery-image, -.blocks-gallery-grid.columns-4 .blocks-gallery-item { + .wp-block-gallery:not(.has-nested-images).columns-4 .blocks-gallery-image, .wp-block-gallery:not(.has-nested-images).columns-4 .blocks-gallery-item, +.blocks-gallery-grid:not(.has-nested-images).columns-4 .blocks-gallery-image, +.blocks-gallery-grid:not(.has-nested-images).columns-4 .blocks-gallery-item { width: calc(25% - 0.75em); margin-right: 1em; } - .wp-block-gallery.columns-5 .blocks-gallery-image, .wp-block-gallery.columns-5 .blocks-gallery-item, -.blocks-gallery-grid.columns-5 .blocks-gallery-image, -.blocks-gallery-grid.columns-5 .blocks-gallery-item { + .wp-block-gallery:not(.has-nested-images).columns-5 .blocks-gallery-image, .wp-block-gallery:not(.has-nested-images).columns-5 .blocks-gallery-item, +.blocks-gallery-grid:not(.has-nested-images).columns-5 .blocks-gallery-image, +.blocks-gallery-grid:not(.has-nested-images).columns-5 .blocks-gallery-item { width: calc(20% - 0.8em); margin-right: 1em; } - .wp-block-gallery.columns-6 .blocks-gallery-image, .wp-block-gallery.columns-6 .blocks-gallery-item, -.blocks-gallery-grid.columns-6 .blocks-gallery-image, -.blocks-gallery-grid.columns-6 .blocks-gallery-item { + .wp-block-gallery:not(.has-nested-images).columns-6 .blocks-gallery-image, .wp-block-gallery:not(.has-nested-images).columns-6 .blocks-gallery-item, +.blocks-gallery-grid:not(.has-nested-images).columns-6 .blocks-gallery-image, +.blocks-gallery-grid:not(.has-nested-images).columns-6 .blocks-gallery-item { width: calc(16.6666666667% - 0.8333333333em); margin-right: 1em; } - .wp-block-gallery.columns-7 .blocks-gallery-image, .wp-block-gallery.columns-7 .blocks-gallery-item, -.blocks-gallery-grid.columns-7 .blocks-gallery-image, -.blocks-gallery-grid.columns-7 .blocks-gallery-item { + .wp-block-gallery:not(.has-nested-images).columns-7 .blocks-gallery-image, .wp-block-gallery:not(.has-nested-images).columns-7 .blocks-gallery-item, +.blocks-gallery-grid:not(.has-nested-images).columns-7 .blocks-gallery-image, +.blocks-gallery-grid:not(.has-nested-images).columns-7 .blocks-gallery-item { width: calc(14.2857142857% - 0.8571428571em); margin-right: 1em; } - .wp-block-gallery.columns-8 .blocks-gallery-image, .wp-block-gallery.columns-8 .blocks-gallery-item, -.blocks-gallery-grid.columns-8 .blocks-gallery-image, -.blocks-gallery-grid.columns-8 .blocks-gallery-item { + .wp-block-gallery:not(.has-nested-images).columns-8 .blocks-gallery-image, .wp-block-gallery:not(.has-nested-images).columns-8 .blocks-gallery-item, +.blocks-gallery-grid:not(.has-nested-images).columns-8 .blocks-gallery-image, +.blocks-gallery-grid:not(.has-nested-images).columns-8 .blocks-gallery-item { width: calc(12.5% - 0.875em); margin-right: 1em; } - .wp-block-gallery.columns-1 .blocks-gallery-image:nth-of-type(1n), .wp-block-gallery.columns-1 .blocks-gallery-item:nth-of-type(1n), -.blocks-gallery-grid.columns-1 .blocks-gallery-image:nth-of-type(1n), -.blocks-gallery-grid.columns-1 .blocks-gallery-item:nth-of-type(1n) { + .wp-block-gallery:not(.has-nested-images).columns-1 .blocks-gallery-image:nth-of-type(1n), .wp-block-gallery:not(.has-nested-images).columns-1 .blocks-gallery-item:nth-of-type(1n), +.blocks-gallery-grid:not(.has-nested-images).columns-1 .blocks-gallery-image:nth-of-type(1n), +.blocks-gallery-grid:not(.has-nested-images).columns-1 .blocks-gallery-item:nth-of-type(1n) { margin-right: 0; } - .wp-block-gallery.columns-2 .blocks-gallery-image:nth-of-type(2n), .wp-block-gallery.columns-2 .blocks-gallery-item:nth-of-type(2n), -.blocks-gallery-grid.columns-2 .blocks-gallery-image:nth-of-type(2n), -.blocks-gallery-grid.columns-2 .blocks-gallery-item:nth-of-type(2n) { + .wp-block-gallery:not(.has-nested-images).columns-2 .blocks-gallery-image:nth-of-type(2n), .wp-block-gallery:not(.has-nested-images).columns-2 .blocks-gallery-item:nth-of-type(2n), +.blocks-gallery-grid:not(.has-nested-images).columns-2 .blocks-gallery-image:nth-of-type(2n), +.blocks-gallery-grid:not(.has-nested-images).columns-2 .blocks-gallery-item:nth-of-type(2n) { margin-right: 0; } - .wp-block-gallery.columns-3 .blocks-gallery-image:nth-of-type(3n), .wp-block-gallery.columns-3 .blocks-gallery-item:nth-of-type(3n), -.blocks-gallery-grid.columns-3 .blocks-gallery-image:nth-of-type(3n), -.blocks-gallery-grid.columns-3 .blocks-gallery-item:nth-of-type(3n) { + .wp-block-gallery:not(.has-nested-images).columns-3 .blocks-gallery-image:nth-of-type(3n), .wp-block-gallery:not(.has-nested-images).columns-3 .blocks-gallery-item:nth-of-type(3n), +.blocks-gallery-grid:not(.has-nested-images).columns-3 .blocks-gallery-image:nth-of-type(3n), +.blocks-gallery-grid:not(.has-nested-images).columns-3 .blocks-gallery-item:nth-of-type(3n) { margin-right: 0; } - .wp-block-gallery.columns-4 .blocks-gallery-image:nth-of-type(4n), .wp-block-gallery.columns-4 .blocks-gallery-item:nth-of-type(4n), -.blocks-gallery-grid.columns-4 .blocks-gallery-image:nth-of-type(4n), -.blocks-gallery-grid.columns-4 .blocks-gallery-item:nth-of-type(4n) { + .wp-block-gallery:not(.has-nested-images).columns-4 .blocks-gallery-image:nth-of-type(4n), .wp-block-gallery:not(.has-nested-images).columns-4 .blocks-gallery-item:nth-of-type(4n), +.blocks-gallery-grid:not(.has-nested-images).columns-4 .blocks-gallery-image:nth-of-type(4n), +.blocks-gallery-grid:not(.has-nested-images).columns-4 .blocks-gallery-item:nth-of-type(4n) { margin-right: 0; } - .wp-block-gallery.columns-5 .blocks-gallery-image:nth-of-type(5n), .wp-block-gallery.columns-5 .blocks-gallery-item:nth-of-type(5n), -.blocks-gallery-grid.columns-5 .blocks-gallery-image:nth-of-type(5n), -.blocks-gallery-grid.columns-5 .blocks-gallery-item:nth-of-type(5n) { + .wp-block-gallery:not(.has-nested-images).columns-5 .blocks-gallery-image:nth-of-type(5n), .wp-block-gallery:not(.has-nested-images).columns-5 .blocks-gallery-item:nth-of-type(5n), +.blocks-gallery-grid:not(.has-nested-images).columns-5 .blocks-gallery-image:nth-of-type(5n), +.blocks-gallery-grid:not(.has-nested-images).columns-5 .blocks-gallery-item:nth-of-type(5n) { margin-right: 0; } - .wp-block-gallery.columns-6 .blocks-gallery-image:nth-of-type(6n), .wp-block-gallery.columns-6 .blocks-gallery-item:nth-of-type(6n), -.blocks-gallery-grid.columns-6 .blocks-gallery-image:nth-of-type(6n), -.blocks-gallery-grid.columns-6 .blocks-gallery-item:nth-of-type(6n) { + .wp-block-gallery:not(.has-nested-images).columns-6 .blocks-gallery-image:nth-of-type(6n), .wp-block-gallery:not(.has-nested-images).columns-6 .blocks-gallery-item:nth-of-type(6n), +.blocks-gallery-grid:not(.has-nested-images).columns-6 .blocks-gallery-image:nth-of-type(6n), +.blocks-gallery-grid:not(.has-nested-images).columns-6 .blocks-gallery-item:nth-of-type(6n) { margin-right: 0; } - .wp-block-gallery.columns-7 .blocks-gallery-image:nth-of-type(7n), .wp-block-gallery.columns-7 .blocks-gallery-item:nth-of-type(7n), -.blocks-gallery-grid.columns-7 .blocks-gallery-image:nth-of-type(7n), -.blocks-gallery-grid.columns-7 .blocks-gallery-item:nth-of-type(7n) { + .wp-block-gallery:not(.has-nested-images).columns-7 .blocks-gallery-image:nth-of-type(7n), .wp-block-gallery:not(.has-nested-images).columns-7 .blocks-gallery-item:nth-of-type(7n), +.blocks-gallery-grid:not(.has-nested-images).columns-7 .blocks-gallery-image:nth-of-type(7n), +.blocks-gallery-grid:not(.has-nested-images).columns-7 .blocks-gallery-item:nth-of-type(7n) { margin-right: 0; } - .wp-block-gallery.columns-8 .blocks-gallery-image:nth-of-type(8n), .wp-block-gallery.columns-8 .blocks-gallery-item:nth-of-type(8n), -.blocks-gallery-grid.columns-8 .blocks-gallery-image:nth-of-type(8n), -.blocks-gallery-grid.columns-8 .blocks-gallery-item:nth-of-type(8n) { + .wp-block-gallery:not(.has-nested-images).columns-8 .blocks-gallery-image:nth-of-type(8n), .wp-block-gallery:not(.has-nested-images).columns-8 .blocks-gallery-item:nth-of-type(8n), +.blocks-gallery-grid:not(.has-nested-images).columns-8 .blocks-gallery-image:nth-of-type(8n), +.blocks-gallery-grid:not(.has-nested-images).columns-8 .blocks-gallery-item:nth-of-type(8n) { margin-right: 0; } } -.wp-block-gallery .blocks-gallery-image:last-child, -.wp-block-gallery .blocks-gallery-item:last-child, -.blocks-gallery-grid .blocks-gallery-image:last-child, -.blocks-gallery-grid .blocks-gallery-item:last-child { +.wp-block-gallery:not(.has-nested-images) .blocks-gallery-image:last-child, +.wp-block-gallery:not(.has-nested-images) .blocks-gallery-item:last-child, +.blocks-gallery-grid:not(.has-nested-images) .blocks-gallery-image:last-child, +.blocks-gallery-grid:not(.has-nested-images) .blocks-gallery-item:last-child { margin-right: 0; } -.wp-block-gallery.alignleft, .wp-block-gallery.alignright, -.blocks-gallery-grid.alignleft, -.blocks-gallery-grid.alignright { +.wp-block-gallery:not(.has-nested-images).alignleft, .wp-block-gallery:not(.has-nested-images).alignright, +.blocks-gallery-grid:not(.has-nested-images).alignleft, +.blocks-gallery-grid:not(.has-nested-images).alignright { max-width: 420px; width: 100%; } -.wp-block-gallery.aligncenter .blocks-gallery-item figure, -.blocks-gallery-grid.aligncenter .blocks-gallery-item figure { +.wp-block-gallery:not(.has-nested-images).aligncenter .blocks-gallery-item figure, +.blocks-gallery-grid:not(.has-nested-images).aligncenter .blocks-gallery-item figure { justify-content: center; } @@ -265,27 +265,19 @@ align-self: flex-start; } -.wp-block-gallery.has-nested-images { - display: flex; - flex-wrap: wrap; +figure.wp-block-gallery.has-nested-images { + align-items: normal; } + .wp-block-gallery.has-nested-images figure.wp-block-image:not(#individual-image) { - margin: 0 var(--gallery-block--gutter-size, 16px) var(--gallery-block--gutter-size, 16px) 0; - width: calc(50% - (var(--gallery-block--gutter-size, 16px) / 2)); -} -.wp-block-gallery.has-nested-images figure.wp-block-image:not(#individual-image):last-of-type:not(#individual-image) { - margin-right: 0; -} -.wp-block-gallery.has-nested-images figure.wp-block-image:not(#individual-image):nth-of-type(even) { - margin-right: 0; + width: calc(50% - (var(--wp--style--unstable-gallery-gap, 16px) / 2)); + margin: 0; } .wp-block-gallery.has-nested-images figure.wp-block-image { display: flex; flex-grow: 1; justify-content: center; position: relative; - margin-top: auto; - margin-bottom: auto; flex-direction: column; max-width: 100%; } @@ -319,6 +311,9 @@ .wp-block-gallery.has-nested-images figure.wp-block-image figcaption img { display: inline; } +.wp-block-gallery.has-nested-images figure.wp-block-image figcaption a { + color: inherit; +} .wp-block-gallery.has-nested-images figure.wp-block-image.is-style-rounded > div, .wp-block-gallery.has-nested-images figure.wp-block-image.is-style-rounded > a { flex: 1 1 auto; @@ -340,12 +335,6 @@ margin-top: 0; margin-bottom: auto; } -.wp-block-gallery.has-nested-images:not(.is-cropped) figure.wp-block-image:not(#individual-image) img { - margin-bottom: var(--gallery-block--gutter-size, 16px); -} -.wp-block-gallery.has-nested-images:not(.is-cropped) figure.wp-block-image:not(#individual-image) figcaption { - bottom: var(--gallery-block--gutter-size, 16px); -} .wp-block-gallery.has-nested-images.is-cropped figure.wp-block-image:not(#individual-image) { align-self: inherit; } @@ -362,86 +351,33 @@ object-fit: cover; } .wp-block-gallery.has-nested-images.columns-1 figure.wp-block-image:not(#individual-image) { - margin-right: 0; width: 100%; } @media (min-width: 600px) { .wp-block-gallery.has-nested-images.columns-3 figure.wp-block-image:not(#individual-image) { - margin-right: var(--gallery-block--gutter-size, 16px); - width: calc(33.3333333333% - (var(--gallery-block--gutter-size, 16px) * 0.6666666667)); - } - .wp-block-gallery.has-nested-images.columns-3 figure.wp-block-image:not(#individual-image).is-dragging ~ figure.wp-block-image:not(#individual-image) { - margin-right: var(--gallery-block--gutter-size, 16px); + width: calc(33.3333333333% - (var(--wp--style--unstable-gallery-gap, 16px) * 0.6666666667)); } .wp-block-gallery.has-nested-images.columns-4 figure.wp-block-image:not(#individual-image) { - margin-right: var(--gallery-block--gutter-size, 16px); - width: calc(25% - (var(--gallery-block--gutter-size, 16px) * 0.75)); - } - .wp-block-gallery.has-nested-images.columns-4 figure.wp-block-image:not(#individual-image).is-dragging ~ figure.wp-block-image:not(#individual-image) { - margin-right: var(--gallery-block--gutter-size, 16px); + width: calc(25% - (var(--wp--style--unstable-gallery-gap, 16px) * 0.75)); } .wp-block-gallery.has-nested-images.columns-5 figure.wp-block-image:not(#individual-image) { - margin-right: var(--gallery-block--gutter-size, 16px); - width: calc(20% - (var(--gallery-block--gutter-size, 16px) * 0.8)); - } - .wp-block-gallery.has-nested-images.columns-5 figure.wp-block-image:not(#individual-image).is-dragging ~ figure.wp-block-image:not(#individual-image) { - margin-right: var(--gallery-block--gutter-size, 16px); + width: calc(20% - (var(--wp--style--unstable-gallery-gap, 16px) * 0.8)); } .wp-block-gallery.has-nested-images.columns-6 figure.wp-block-image:not(#individual-image) { - margin-right: var(--gallery-block--gutter-size, 16px); - width: calc(16.6666666667% - (var(--gallery-block--gutter-size, 16px) * 0.8333333333)); - } - .wp-block-gallery.has-nested-images.columns-6 figure.wp-block-image:not(#individual-image).is-dragging ~ figure.wp-block-image:not(#individual-image) { - margin-right: var(--gallery-block--gutter-size, 16px); + width: calc(16.6666666667% - (var(--wp--style--unstable-gallery-gap, 16px) * 0.8333333333)); } .wp-block-gallery.has-nested-images.columns-7 figure.wp-block-image:not(#individual-image) { - margin-right: var(--gallery-block--gutter-size, 16px); - width: calc(14.2857142857% - (var(--gallery-block--gutter-size, 16px) * 0.8571428571)); - } - .wp-block-gallery.has-nested-images.columns-7 figure.wp-block-image:not(#individual-image).is-dragging ~ figure.wp-block-image:not(#individual-image) { - margin-right: var(--gallery-block--gutter-size, 16px); + width: calc(14.2857142857% - (var(--wp--style--unstable-gallery-gap, 16px) * 0.8571428571)); } .wp-block-gallery.has-nested-images.columns-8 figure.wp-block-image:not(#individual-image) { - margin-right: var(--gallery-block--gutter-size, 16px); - width: calc(12.5% - (var(--gallery-block--gutter-size, 16px) * 0.875)); - } - .wp-block-gallery.has-nested-images.columns-8 figure.wp-block-image:not(#individual-image).is-dragging ~ figure.wp-block-image:not(#individual-image) { - margin-right: var(--gallery-block--gutter-size, 16px); - } - .wp-block-gallery.has-nested-images.columns-1 figure.wp-block-image:not(#individual-image):nth-of-type(1n) { - margin-right: 0; - } - .wp-block-gallery.has-nested-images.columns-2 figure.wp-block-image:not(#individual-image):nth-of-type(2n) { - margin-right: 0; - } - .wp-block-gallery.has-nested-images.columns-3 figure.wp-block-image:not(#individual-image):nth-of-type(3n) { - margin-right: 0; - } - .wp-block-gallery.has-nested-images.columns-4 figure.wp-block-image:not(#individual-image):nth-of-type(4n) { - margin-right: 0; - } - .wp-block-gallery.has-nested-images.columns-5 figure.wp-block-image:not(#individual-image):nth-of-type(5n) { - margin-right: 0; - } - .wp-block-gallery.has-nested-images.columns-6 figure.wp-block-image:not(#individual-image):nth-of-type(6n) { - margin-right: 0; - } - .wp-block-gallery.has-nested-images.columns-7 figure.wp-block-image:not(#individual-image):nth-of-type(7n) { - margin-right: 0; - } - .wp-block-gallery.has-nested-images.columns-8 figure.wp-block-image:not(#individual-image):nth-of-type(8n) { - margin-right: 0; + width: calc(12.5% - (var(--wp--style--unstable-gallery-gap, 16px) * 0.875)); } .wp-block-gallery.has-nested-images.columns-default figure.wp-block-image:not(#individual-image) { - margin-right: var(--gallery-block--gutter-size, 16px); - width: calc(33.33% - (var(--gallery-block--gutter-size, 16px) * 0.6666666667)); - } - .wp-block-gallery.has-nested-images.columns-default figure.wp-block-image:not(#individual-image):nth-of-type(3n+3) { - margin-right: 0; + width: calc(33.33% - (var(--wp--style--unstable-gallery-gap, 16px) * 0.6666666667)); } .wp-block-gallery.has-nested-images.columns-default figure.wp-block-image:not(#individual-image):first-child:nth-last-child(2), .wp-block-gallery.has-nested-images.columns-default figure.wp-block-image:not(#individual-image):first-child:nth-last-child(2) ~ figure.wp-block-image:not(#individual-image) { - width: calc(50% - (var(--gallery-block--gutter-size, 16px) * 0.5)); + width: calc(50% - (var(--wp--style--unstable-gallery-gap, 16px) * 0.5)); } .wp-block-gallery.has-nested-images.columns-default figure.wp-block-image:not(#individual-image):first-child:nth-last-child(1) { width: 100%; diff --git a/wp-includes/blocks/gallery/style.min.css b/wp-includes/blocks/gallery/style.min.css index 551d6109a8..ea2dd7f247 100644 --- a/wp-includes/blocks/gallery/style.min.css +++ b/wp-includes/blocks/gallery/style.min.css @@ -1 +1 @@ -.blocks-gallery-grid,.wp-block-gallery{display:flex;flex-wrap:wrap;list-style-type:none;padding:0;margin:0}.blocks-gallery-grid .blocks-gallery-image,.blocks-gallery-grid .blocks-gallery-item,.wp-block-gallery .blocks-gallery-image,.wp-block-gallery .blocks-gallery-item{margin:0 1em 1em 0;display:flex;flex-grow:1;flex-direction:column;justify-content:center;position:relative;width:calc(50% - 1em)}.blocks-gallery-grid .blocks-gallery-image:nth-of-type(2n),.blocks-gallery-grid .blocks-gallery-item:nth-of-type(2n),.wp-block-gallery .blocks-gallery-image:nth-of-type(2n),.wp-block-gallery .blocks-gallery-item:nth-of-type(2n){margin-right:0}.blocks-gallery-grid .blocks-gallery-image figure,.blocks-gallery-grid .blocks-gallery-item figure,.wp-block-gallery .blocks-gallery-image figure,.wp-block-gallery .blocks-gallery-item figure{margin:0;height:100%;display:flex;align-items:flex-end;justify-content:flex-start}.blocks-gallery-grid .blocks-gallery-image img,.blocks-gallery-grid .blocks-gallery-item img,.wp-block-gallery .blocks-gallery-image img,.wp-block-gallery .blocks-gallery-item img{display:block;max-width:100%;height:auto;width:auto}.blocks-gallery-grid .blocks-gallery-image figcaption,.blocks-gallery-grid .blocks-gallery-item figcaption,.wp-block-gallery .blocks-gallery-image figcaption,.wp-block-gallery .blocks-gallery-item figcaption{position:absolute;bottom:0;width:100%;max-height:100%;overflow:auto;padding:3em .77em .7em;color:#fff;text-align:center;font-size:.8em;background:linear-gradient(0deg,rgba(0,0,0,.7),rgba(0,0,0,.3) 70%,transparent);box-sizing:border-box;margin:0;z-index:2}.blocks-gallery-grid .blocks-gallery-image figcaption img,.blocks-gallery-grid .blocks-gallery-item figcaption img,.wp-block-gallery .blocks-gallery-image figcaption img,.wp-block-gallery .blocks-gallery-item figcaption img{display:inline}.blocks-gallery-grid figcaption,.wp-block-gallery figcaption{flex-grow:1}.blocks-gallery-grid.is-cropped .blocks-gallery-image a,.blocks-gallery-grid.is-cropped .blocks-gallery-image img,.blocks-gallery-grid.is-cropped .blocks-gallery-item a,.blocks-gallery-grid.is-cropped .blocks-gallery-item img,.wp-block-gallery.is-cropped .blocks-gallery-image a,.wp-block-gallery.is-cropped .blocks-gallery-image img,.wp-block-gallery.is-cropped .blocks-gallery-item a,.wp-block-gallery.is-cropped .blocks-gallery-item img{width:100%;height:100%;flex:1;-o-object-fit:cover;object-fit:cover}.blocks-gallery-grid.columns-1 .blocks-gallery-image,.blocks-gallery-grid.columns-1 .blocks-gallery-item,.wp-block-gallery.columns-1 .blocks-gallery-image,.wp-block-gallery.columns-1 .blocks-gallery-item{width:100%;margin-right:0}@media (min-width:600px){.blocks-gallery-grid.columns-3 .blocks-gallery-image,.blocks-gallery-grid.columns-3 .blocks-gallery-item,.wp-block-gallery.columns-3 .blocks-gallery-image,.wp-block-gallery.columns-3 .blocks-gallery-item{width:calc(33.33333% - .66667em);margin-right:1em}.blocks-gallery-grid.columns-4 .blocks-gallery-image,.blocks-gallery-grid.columns-4 .blocks-gallery-item,.wp-block-gallery.columns-4 .blocks-gallery-image,.wp-block-gallery.columns-4 .blocks-gallery-item{width:calc(25% - .75em);margin-right:1em}.blocks-gallery-grid.columns-5 .blocks-gallery-image,.blocks-gallery-grid.columns-5 .blocks-gallery-item,.wp-block-gallery.columns-5 .blocks-gallery-image,.wp-block-gallery.columns-5 .blocks-gallery-item{width:calc(20% - .8em);margin-right:1em}.blocks-gallery-grid.columns-6 .blocks-gallery-image,.blocks-gallery-grid.columns-6 .blocks-gallery-item,.wp-block-gallery.columns-6 .blocks-gallery-image,.wp-block-gallery.columns-6 .blocks-gallery-item{width:calc(16.66667% - .83333em);margin-right:1em}.blocks-gallery-grid.columns-7 .blocks-gallery-image,.blocks-gallery-grid.columns-7 .blocks-gallery-item,.wp-block-gallery.columns-7 .blocks-gallery-image,.wp-block-gallery.columns-7 .blocks-gallery-item{width:calc(14.28571% - .85714em);margin-right:1em}.blocks-gallery-grid.columns-8 .blocks-gallery-image,.blocks-gallery-grid.columns-8 .blocks-gallery-item,.wp-block-gallery.columns-8 .blocks-gallery-image,.wp-block-gallery.columns-8 .blocks-gallery-item{width:calc(12.5% - .875em);margin-right:1em}.blocks-gallery-grid.columns-1 .blocks-gallery-image:nth-of-type(1n),.blocks-gallery-grid.columns-1 .blocks-gallery-item:nth-of-type(1n),.blocks-gallery-grid.columns-2 .blocks-gallery-image:nth-of-type(2n),.blocks-gallery-grid.columns-2 .blocks-gallery-item:nth-of-type(2n),.blocks-gallery-grid.columns-3 .blocks-gallery-image:nth-of-type(3n),.blocks-gallery-grid.columns-3 .blocks-gallery-item:nth-of-type(3n),.blocks-gallery-grid.columns-4 .blocks-gallery-image:nth-of-type(4n),.blocks-gallery-grid.columns-4 .blocks-gallery-item:nth-of-type(4n),.blocks-gallery-grid.columns-5 .blocks-gallery-image:nth-of-type(5n),.blocks-gallery-grid.columns-5 .blocks-gallery-item:nth-of-type(5n),.blocks-gallery-grid.columns-6 .blocks-gallery-image:nth-of-type(6n),.blocks-gallery-grid.columns-6 .blocks-gallery-item:nth-of-type(6n),.blocks-gallery-grid.columns-7 .blocks-gallery-image:nth-of-type(7n),.blocks-gallery-grid.columns-7 .blocks-gallery-item:nth-of-type(7n),.blocks-gallery-grid.columns-8 .blocks-gallery-image:nth-of-type(8n),.blocks-gallery-grid.columns-8 .blocks-gallery-item:nth-of-type(8n),.wp-block-gallery.columns-1 .blocks-gallery-image:nth-of-type(1n),.wp-block-gallery.columns-1 .blocks-gallery-item:nth-of-type(1n),.wp-block-gallery.columns-2 .blocks-gallery-image:nth-of-type(2n),.wp-block-gallery.columns-2 .blocks-gallery-item:nth-of-type(2n),.wp-block-gallery.columns-3 .blocks-gallery-image:nth-of-type(3n),.wp-block-gallery.columns-3 .blocks-gallery-item:nth-of-type(3n),.wp-block-gallery.columns-4 .blocks-gallery-image:nth-of-type(4n),.wp-block-gallery.columns-4 .blocks-gallery-item:nth-of-type(4n),.wp-block-gallery.columns-5 .blocks-gallery-image:nth-of-type(5n),.wp-block-gallery.columns-5 .blocks-gallery-item:nth-of-type(5n),.wp-block-gallery.columns-6 .blocks-gallery-image:nth-of-type(6n),.wp-block-gallery.columns-6 .blocks-gallery-item:nth-of-type(6n),.wp-block-gallery.columns-7 .blocks-gallery-image:nth-of-type(7n),.wp-block-gallery.columns-7 .blocks-gallery-item:nth-of-type(7n),.wp-block-gallery.columns-8 .blocks-gallery-image:nth-of-type(8n),.wp-block-gallery.columns-8 .blocks-gallery-item:nth-of-type(8n){margin-right:0}}.blocks-gallery-grid .blocks-gallery-image:last-child,.blocks-gallery-grid .blocks-gallery-item:last-child,.wp-block-gallery .blocks-gallery-image:last-child,.wp-block-gallery .blocks-gallery-item:last-child{margin-right:0}.blocks-gallery-grid.alignleft,.blocks-gallery-grid.alignright,.wp-block-gallery.alignleft,.wp-block-gallery.alignright{max-width:420px;width:100%}.blocks-gallery-grid.aligncenter .blocks-gallery-item figure,.wp-block-gallery.aligncenter .blocks-gallery-item figure{justify-content:center}.wp-block-gallery:not(.is-cropped) .blocks-gallery-item{align-self:flex-start}.wp-block-gallery.has-nested-images{display:flex;flex-wrap:wrap}.wp-block-gallery.has-nested-images figure.wp-block-image:not(#individual-image){margin:0 var(--gallery-block--gutter-size,16px) var(--gallery-block--gutter-size,16px) 0;width:calc(50% - var(--gallery-block--gutter-size, 16px)/2)}.wp-block-gallery.has-nested-images figure.wp-block-image:not(#individual-image):last-of-type:not(#individual-image),.wp-block-gallery.has-nested-images figure.wp-block-image:not(#individual-image):nth-of-type(2n){margin-right:0}.wp-block-gallery.has-nested-images figure.wp-block-image{display:flex;flex-grow:1;justify-content:center;position:relative;margin-top:auto;margin-bottom:auto;flex-direction:column;max-width:100%}.wp-block-gallery.has-nested-images figure.wp-block-image>a,.wp-block-gallery.has-nested-images figure.wp-block-image>div{margin:0;flex-direction:column;flex-grow:1}.wp-block-gallery.has-nested-images figure.wp-block-image img{display:block;height:auto;max-width:100%!important;width:auto}.wp-block-gallery.has-nested-images figure.wp-block-image figcaption{background:linear-gradient(0deg,rgba(0,0,0,.7),rgba(0,0,0,.3) 70%,transparent);bottom:0;color:#fff;font-size:13px;left:0;margin-bottom:0;max-height:60%;overflow:auto;padding:0 8px 8px;position:absolute;text-align:center;width:100%;box-sizing:border-box}.wp-block-gallery.has-nested-images figure.wp-block-image figcaption img{display:inline}.wp-block-gallery.has-nested-images figure.wp-block-image.is-style-rounded>a,.wp-block-gallery.has-nested-images figure.wp-block-image.is-style-rounded>div{flex:1 1 auto}.wp-block-gallery.has-nested-images figure.wp-block-image.is-style-rounded figcaption{flex:initial;background:none;color:inherit;margin:0;padding:10px 10px 9px;position:relative}.wp-block-gallery.has-nested-images figcaption{flex-grow:1;flex-basis:100%;text-align:center}.wp-block-gallery.has-nested-images:not(.is-cropped) figure.wp-block-image:not(#individual-image){margin-top:0;margin-bottom:auto}.wp-block-gallery.has-nested-images:not(.is-cropped) figure.wp-block-image:not(#individual-image) img{margin-bottom:var(--gallery-block--gutter-size,16px)}.wp-block-gallery.has-nested-images:not(.is-cropped) figure.wp-block-image:not(#individual-image) figcaption{bottom:var(--gallery-block--gutter-size,16px)}.wp-block-gallery.has-nested-images.is-cropped figure.wp-block-image:not(#individual-image){align-self:inherit}.wp-block-gallery.has-nested-images.is-cropped figure.wp-block-image:not(#individual-image)>a,.wp-block-gallery.has-nested-images.is-cropped figure.wp-block-image:not(#individual-image)>div:not(.components-drop-zone){display:flex}.wp-block-gallery.has-nested-images.is-cropped figure.wp-block-image:not(#individual-image) a,.wp-block-gallery.has-nested-images.is-cropped figure.wp-block-image:not(#individual-image) img{width:100%;flex:1 0 0%;height:100%;-o-object-fit:cover;object-fit:cover}.wp-block-gallery.has-nested-images.columns-1 figure.wp-block-image:not(#individual-image){margin-right:0;width:100%}@media (min-width:600px){.wp-block-gallery.has-nested-images.columns-3 figure.wp-block-image:not(#individual-image){margin-right:var(--gallery-block--gutter-size,16px);width:calc(33.33333% - var(--gallery-block--gutter-size, 16px)*0.66667)}.wp-block-gallery.has-nested-images.columns-3 figure.wp-block-image:not(#individual-image).is-dragging~figure.wp-block-image:not(#individual-image){margin-right:var(--gallery-block--gutter-size,16px)}.wp-block-gallery.has-nested-images.columns-4 figure.wp-block-image:not(#individual-image){margin-right:var(--gallery-block--gutter-size,16px);width:calc(25% - var(--gallery-block--gutter-size, 16px)*0.75)}.wp-block-gallery.has-nested-images.columns-4 figure.wp-block-image:not(#individual-image).is-dragging~figure.wp-block-image:not(#individual-image){margin-right:var(--gallery-block--gutter-size,16px)}.wp-block-gallery.has-nested-images.columns-5 figure.wp-block-image:not(#individual-image){margin-right:var(--gallery-block--gutter-size,16px);width:calc(20% - var(--gallery-block--gutter-size, 16px)*0.8)}.wp-block-gallery.has-nested-images.columns-5 figure.wp-block-image:not(#individual-image).is-dragging~figure.wp-block-image:not(#individual-image){margin-right:var(--gallery-block--gutter-size,16px)}.wp-block-gallery.has-nested-images.columns-6 figure.wp-block-image:not(#individual-image){margin-right:var(--gallery-block--gutter-size,16px);width:calc(16.66667% - var(--gallery-block--gutter-size, 16px)*0.83333)}.wp-block-gallery.has-nested-images.columns-6 figure.wp-block-image:not(#individual-image).is-dragging~figure.wp-block-image:not(#individual-image){margin-right:var(--gallery-block--gutter-size,16px)}.wp-block-gallery.has-nested-images.columns-7 figure.wp-block-image:not(#individual-image){margin-right:var(--gallery-block--gutter-size,16px);width:calc(14.28571% - var(--gallery-block--gutter-size, 16px)*0.85714)}.wp-block-gallery.has-nested-images.columns-7 figure.wp-block-image:not(#individual-image).is-dragging~figure.wp-block-image:not(#individual-image){margin-right:var(--gallery-block--gutter-size,16px)}.wp-block-gallery.has-nested-images.columns-8 figure.wp-block-image:not(#individual-image){margin-right:var(--gallery-block--gutter-size,16px);width:calc(12.5% - var(--gallery-block--gutter-size, 16px)*0.875)}.wp-block-gallery.has-nested-images.columns-8 figure.wp-block-image:not(#individual-image).is-dragging~figure.wp-block-image:not(#individual-image){margin-right:var(--gallery-block--gutter-size,16px)}.wp-block-gallery.has-nested-images.columns-1 figure.wp-block-image:not(#individual-image):nth-of-type(1n),.wp-block-gallery.has-nested-images.columns-2 figure.wp-block-image:not(#individual-image):nth-of-type(2n),.wp-block-gallery.has-nested-images.columns-3 figure.wp-block-image:not(#individual-image):nth-of-type(3n),.wp-block-gallery.has-nested-images.columns-4 figure.wp-block-image:not(#individual-image):nth-of-type(4n),.wp-block-gallery.has-nested-images.columns-5 figure.wp-block-image:not(#individual-image):nth-of-type(5n),.wp-block-gallery.has-nested-images.columns-6 figure.wp-block-image:not(#individual-image):nth-of-type(6n),.wp-block-gallery.has-nested-images.columns-7 figure.wp-block-image:not(#individual-image):nth-of-type(7n),.wp-block-gallery.has-nested-images.columns-8 figure.wp-block-image:not(#individual-image):nth-of-type(8n){margin-right:0}.wp-block-gallery.has-nested-images.columns-default figure.wp-block-image:not(#individual-image){margin-right:var(--gallery-block--gutter-size,16px);width:calc(33.33% - var(--gallery-block--gutter-size, 16px)*0.66667)}.wp-block-gallery.has-nested-images.columns-default figure.wp-block-image:not(#individual-image):nth-of-type(3n+3){margin-right:0}.wp-block-gallery.has-nested-images.columns-default figure.wp-block-image:not(#individual-image):first-child:nth-last-child(2),.wp-block-gallery.has-nested-images.columns-default figure.wp-block-image:not(#individual-image):first-child:nth-last-child(2)~figure.wp-block-image:not(#individual-image){width:calc(50% - var(--gallery-block--gutter-size, 16px)*0.5)}.wp-block-gallery.has-nested-images.columns-default figure.wp-block-image:not(#individual-image):first-child:last-child{width:100%}}.wp-block-gallery.has-nested-images.alignleft,.wp-block-gallery.has-nested-images.alignright{max-width:420px;width:100%}.wp-block-gallery.has-nested-images.aligncenter{justify-content:center} \ No newline at end of file +.blocks-gallery-grid:not(.has-nested-images),.wp-block-gallery:not(.has-nested-images){display:flex;flex-wrap:wrap;list-style-type:none;padding:0;margin:0}.blocks-gallery-grid:not(.has-nested-images) .blocks-gallery-image,.blocks-gallery-grid:not(.has-nested-images) .blocks-gallery-item,.wp-block-gallery:not(.has-nested-images) .blocks-gallery-image,.wp-block-gallery:not(.has-nested-images) .blocks-gallery-item{margin:0 1em 1em 0;display:flex;flex-grow:1;flex-direction:column;justify-content:center;position:relative;width:calc(50% - 1em)}.blocks-gallery-grid:not(.has-nested-images) .blocks-gallery-image:nth-of-type(2n),.blocks-gallery-grid:not(.has-nested-images) .blocks-gallery-item:nth-of-type(2n),.wp-block-gallery:not(.has-nested-images) .blocks-gallery-image:nth-of-type(2n),.wp-block-gallery:not(.has-nested-images) .blocks-gallery-item:nth-of-type(2n){margin-right:0}.blocks-gallery-grid:not(.has-nested-images) .blocks-gallery-image figure,.blocks-gallery-grid:not(.has-nested-images) .blocks-gallery-item figure,.wp-block-gallery:not(.has-nested-images) .blocks-gallery-image figure,.wp-block-gallery:not(.has-nested-images) .blocks-gallery-item figure{margin:0;height:100%;display:flex;align-items:flex-end;justify-content:flex-start}.blocks-gallery-grid:not(.has-nested-images) .blocks-gallery-image img,.blocks-gallery-grid:not(.has-nested-images) .blocks-gallery-item img,.wp-block-gallery:not(.has-nested-images) .blocks-gallery-image img,.wp-block-gallery:not(.has-nested-images) .blocks-gallery-item img{display:block;max-width:100%;height:auto;width:auto}.blocks-gallery-grid:not(.has-nested-images) .blocks-gallery-image figcaption,.blocks-gallery-grid:not(.has-nested-images) .blocks-gallery-item figcaption,.wp-block-gallery:not(.has-nested-images) .blocks-gallery-image figcaption,.wp-block-gallery:not(.has-nested-images) .blocks-gallery-item figcaption{position:absolute;bottom:0;width:100%;max-height:100%;overflow:auto;padding:3em .77em .7em;color:#fff;text-align:center;font-size:.8em;background:linear-gradient(0deg,rgba(0,0,0,.7),rgba(0,0,0,.3) 70%,transparent);box-sizing:border-box;margin:0;z-index:2}.blocks-gallery-grid:not(.has-nested-images) .blocks-gallery-image figcaption img,.blocks-gallery-grid:not(.has-nested-images) .blocks-gallery-item figcaption img,.wp-block-gallery:not(.has-nested-images) .blocks-gallery-image figcaption img,.wp-block-gallery:not(.has-nested-images) .blocks-gallery-item figcaption img{display:inline}.blocks-gallery-grid:not(.has-nested-images) figcaption,.wp-block-gallery:not(.has-nested-images) figcaption{flex-grow:1}.blocks-gallery-grid:not(.has-nested-images).is-cropped .blocks-gallery-image a,.blocks-gallery-grid:not(.has-nested-images).is-cropped .blocks-gallery-image img,.blocks-gallery-grid:not(.has-nested-images).is-cropped .blocks-gallery-item a,.blocks-gallery-grid:not(.has-nested-images).is-cropped .blocks-gallery-item img,.wp-block-gallery:not(.has-nested-images).is-cropped .blocks-gallery-image a,.wp-block-gallery:not(.has-nested-images).is-cropped .blocks-gallery-image img,.wp-block-gallery:not(.has-nested-images).is-cropped .blocks-gallery-item a,.wp-block-gallery:not(.has-nested-images).is-cropped .blocks-gallery-item img{width:100%;height:100%;flex:1;-o-object-fit:cover;object-fit:cover}.blocks-gallery-grid:not(.has-nested-images).columns-1 .blocks-gallery-image,.blocks-gallery-grid:not(.has-nested-images).columns-1 .blocks-gallery-item,.wp-block-gallery:not(.has-nested-images).columns-1 .blocks-gallery-image,.wp-block-gallery:not(.has-nested-images).columns-1 .blocks-gallery-item{width:100%;margin-right:0}@media (min-width:600px){.blocks-gallery-grid:not(.has-nested-images).columns-3 .blocks-gallery-image,.blocks-gallery-grid:not(.has-nested-images).columns-3 .blocks-gallery-item,.wp-block-gallery:not(.has-nested-images).columns-3 .blocks-gallery-image,.wp-block-gallery:not(.has-nested-images).columns-3 .blocks-gallery-item{width:calc(33.33333% - .66667em);margin-right:1em}.blocks-gallery-grid:not(.has-nested-images).columns-4 .blocks-gallery-image,.blocks-gallery-grid:not(.has-nested-images).columns-4 .blocks-gallery-item,.wp-block-gallery:not(.has-nested-images).columns-4 .blocks-gallery-image,.wp-block-gallery:not(.has-nested-images).columns-4 .blocks-gallery-item{width:calc(25% - .75em);margin-right:1em}.blocks-gallery-grid:not(.has-nested-images).columns-5 .blocks-gallery-image,.blocks-gallery-grid:not(.has-nested-images).columns-5 .blocks-gallery-item,.wp-block-gallery:not(.has-nested-images).columns-5 .blocks-gallery-image,.wp-block-gallery:not(.has-nested-images).columns-5 .blocks-gallery-item{width:calc(20% - .8em);margin-right:1em}.blocks-gallery-grid:not(.has-nested-images).columns-6 .blocks-gallery-image,.blocks-gallery-grid:not(.has-nested-images).columns-6 .blocks-gallery-item,.wp-block-gallery:not(.has-nested-images).columns-6 .blocks-gallery-image,.wp-block-gallery:not(.has-nested-images).columns-6 .blocks-gallery-item{width:calc(16.66667% - .83333em);margin-right:1em}.blocks-gallery-grid:not(.has-nested-images).columns-7 .blocks-gallery-image,.blocks-gallery-grid:not(.has-nested-images).columns-7 .blocks-gallery-item,.wp-block-gallery:not(.has-nested-images).columns-7 .blocks-gallery-image,.wp-block-gallery:not(.has-nested-images).columns-7 .blocks-gallery-item{width:calc(14.28571% - .85714em);margin-right:1em}.blocks-gallery-grid:not(.has-nested-images).columns-8 .blocks-gallery-image,.blocks-gallery-grid:not(.has-nested-images).columns-8 .blocks-gallery-item,.wp-block-gallery:not(.has-nested-images).columns-8 .blocks-gallery-image,.wp-block-gallery:not(.has-nested-images).columns-8 .blocks-gallery-item{width:calc(12.5% - .875em);margin-right:1em}.blocks-gallery-grid:not(.has-nested-images).columns-1 .blocks-gallery-image:nth-of-type(1n),.blocks-gallery-grid:not(.has-nested-images).columns-1 .blocks-gallery-item:nth-of-type(1n),.blocks-gallery-grid:not(.has-nested-images).columns-2 .blocks-gallery-image:nth-of-type(2n),.blocks-gallery-grid:not(.has-nested-images).columns-2 .blocks-gallery-item:nth-of-type(2n),.blocks-gallery-grid:not(.has-nested-images).columns-3 .blocks-gallery-image:nth-of-type(3n),.blocks-gallery-grid:not(.has-nested-images).columns-3 .blocks-gallery-item:nth-of-type(3n),.blocks-gallery-grid:not(.has-nested-images).columns-4 .blocks-gallery-image:nth-of-type(4n),.blocks-gallery-grid:not(.has-nested-images).columns-4 .blocks-gallery-item:nth-of-type(4n),.blocks-gallery-grid:not(.has-nested-images).columns-5 .blocks-gallery-image:nth-of-type(5n),.blocks-gallery-grid:not(.has-nested-images).columns-5 .blocks-gallery-item:nth-of-type(5n),.blocks-gallery-grid:not(.has-nested-images).columns-6 .blocks-gallery-image:nth-of-type(6n),.blocks-gallery-grid:not(.has-nested-images).columns-6 .blocks-gallery-item:nth-of-type(6n),.blocks-gallery-grid:not(.has-nested-images).columns-7 .blocks-gallery-image:nth-of-type(7n),.blocks-gallery-grid:not(.has-nested-images).columns-7 .blocks-gallery-item:nth-of-type(7n),.blocks-gallery-grid:not(.has-nested-images).columns-8 .blocks-gallery-image:nth-of-type(8n),.blocks-gallery-grid:not(.has-nested-images).columns-8 .blocks-gallery-item:nth-of-type(8n),.wp-block-gallery:not(.has-nested-images).columns-1 .blocks-gallery-image:nth-of-type(1n),.wp-block-gallery:not(.has-nested-images).columns-1 .blocks-gallery-item:nth-of-type(1n),.wp-block-gallery:not(.has-nested-images).columns-2 .blocks-gallery-image:nth-of-type(2n),.wp-block-gallery:not(.has-nested-images).columns-2 .blocks-gallery-item:nth-of-type(2n),.wp-block-gallery:not(.has-nested-images).columns-3 .blocks-gallery-image:nth-of-type(3n),.wp-block-gallery:not(.has-nested-images).columns-3 .blocks-gallery-item:nth-of-type(3n),.wp-block-gallery:not(.has-nested-images).columns-4 .blocks-gallery-image:nth-of-type(4n),.wp-block-gallery:not(.has-nested-images).columns-4 .blocks-gallery-item:nth-of-type(4n),.wp-block-gallery:not(.has-nested-images).columns-5 .blocks-gallery-image:nth-of-type(5n),.wp-block-gallery:not(.has-nested-images).columns-5 .blocks-gallery-item:nth-of-type(5n),.wp-block-gallery:not(.has-nested-images).columns-6 .blocks-gallery-image:nth-of-type(6n),.wp-block-gallery:not(.has-nested-images).columns-6 .blocks-gallery-item:nth-of-type(6n),.wp-block-gallery:not(.has-nested-images).columns-7 .blocks-gallery-image:nth-of-type(7n),.wp-block-gallery:not(.has-nested-images).columns-7 .blocks-gallery-item:nth-of-type(7n),.wp-block-gallery:not(.has-nested-images).columns-8 .blocks-gallery-image:nth-of-type(8n),.wp-block-gallery:not(.has-nested-images).columns-8 .blocks-gallery-item:nth-of-type(8n){margin-right:0}}.blocks-gallery-grid:not(.has-nested-images) .blocks-gallery-image:last-child,.blocks-gallery-grid:not(.has-nested-images) .blocks-gallery-item:last-child,.wp-block-gallery:not(.has-nested-images) .blocks-gallery-image:last-child,.wp-block-gallery:not(.has-nested-images) .blocks-gallery-item:last-child{margin-right:0}.blocks-gallery-grid:not(.has-nested-images).alignleft,.blocks-gallery-grid:not(.has-nested-images).alignright,.wp-block-gallery:not(.has-nested-images).alignleft,.wp-block-gallery:not(.has-nested-images).alignright{max-width:420px;width:100%}.blocks-gallery-grid:not(.has-nested-images).aligncenter .blocks-gallery-item figure,.wp-block-gallery:not(.has-nested-images).aligncenter .blocks-gallery-item figure{justify-content:center}.wp-block-gallery:not(.is-cropped) .blocks-gallery-item{align-self:flex-start}figure.wp-block-gallery.has-nested-images{align-items:normal}.wp-block-gallery.has-nested-images figure.wp-block-image:not(#individual-image){width:calc(50% - var(--wp--style--unstable-gallery-gap, 16px)/2);margin:0}.wp-block-gallery.has-nested-images figure.wp-block-image{display:flex;flex-grow:1;justify-content:center;position:relative;flex-direction:column;max-width:100%}.wp-block-gallery.has-nested-images figure.wp-block-image>a,.wp-block-gallery.has-nested-images figure.wp-block-image>div{margin:0;flex-direction:column;flex-grow:1}.wp-block-gallery.has-nested-images figure.wp-block-image img{display:block;height:auto;max-width:100%!important;width:auto}.wp-block-gallery.has-nested-images figure.wp-block-image figcaption{background:linear-gradient(0deg,rgba(0,0,0,.7),rgba(0,0,0,.3) 70%,transparent);bottom:0;color:#fff;font-size:13px;left:0;margin-bottom:0;max-height:60%;overflow:auto;padding:0 8px 8px;position:absolute;text-align:center;width:100%;box-sizing:border-box}.wp-block-gallery.has-nested-images figure.wp-block-image figcaption img{display:inline}.wp-block-gallery.has-nested-images figure.wp-block-image figcaption a{color:inherit}.wp-block-gallery.has-nested-images figure.wp-block-image.is-style-rounded>a,.wp-block-gallery.has-nested-images figure.wp-block-image.is-style-rounded>div{flex:1 1 auto}.wp-block-gallery.has-nested-images figure.wp-block-image.is-style-rounded figcaption{flex:initial;background:none;color:inherit;margin:0;padding:10px 10px 9px;position:relative}.wp-block-gallery.has-nested-images figcaption{flex-grow:1;flex-basis:100%;text-align:center}.wp-block-gallery.has-nested-images:not(.is-cropped) figure.wp-block-image:not(#individual-image){margin-top:0;margin-bottom:auto}.wp-block-gallery.has-nested-images.is-cropped figure.wp-block-image:not(#individual-image){align-self:inherit}.wp-block-gallery.has-nested-images.is-cropped figure.wp-block-image:not(#individual-image)>a,.wp-block-gallery.has-nested-images.is-cropped figure.wp-block-image:not(#individual-image)>div:not(.components-drop-zone){display:flex}.wp-block-gallery.has-nested-images.is-cropped figure.wp-block-image:not(#individual-image) a,.wp-block-gallery.has-nested-images.is-cropped figure.wp-block-image:not(#individual-image) img{width:100%;flex:1 0 0%;height:100%;-o-object-fit:cover;object-fit:cover}.wp-block-gallery.has-nested-images.columns-1 figure.wp-block-image:not(#individual-image){width:100%}@media (min-width:600px){.wp-block-gallery.has-nested-images.columns-3 figure.wp-block-image:not(#individual-image){width:calc(33.33333% - var(--wp--style--unstable-gallery-gap, 16px)*0.66667)}.wp-block-gallery.has-nested-images.columns-4 figure.wp-block-image:not(#individual-image){width:calc(25% - var(--wp--style--unstable-gallery-gap, 16px)*0.75)}.wp-block-gallery.has-nested-images.columns-5 figure.wp-block-image:not(#individual-image){width:calc(20% - var(--wp--style--unstable-gallery-gap, 16px)*0.8)}.wp-block-gallery.has-nested-images.columns-6 figure.wp-block-image:not(#individual-image){width:calc(16.66667% - var(--wp--style--unstable-gallery-gap, 16px)*0.83333)}.wp-block-gallery.has-nested-images.columns-7 figure.wp-block-image:not(#individual-image){width:calc(14.28571% - var(--wp--style--unstable-gallery-gap, 16px)*0.85714)}.wp-block-gallery.has-nested-images.columns-8 figure.wp-block-image:not(#individual-image){width:calc(12.5% - var(--wp--style--unstable-gallery-gap, 16px)*0.875)}.wp-block-gallery.has-nested-images.columns-default figure.wp-block-image:not(#individual-image){width:calc(33.33% - var(--wp--style--unstable-gallery-gap, 16px)*0.66667)}.wp-block-gallery.has-nested-images.columns-default figure.wp-block-image:not(#individual-image):first-child:nth-last-child(2),.wp-block-gallery.has-nested-images.columns-default figure.wp-block-image:not(#individual-image):first-child:nth-last-child(2)~figure.wp-block-image:not(#individual-image){width:calc(50% - var(--wp--style--unstable-gallery-gap, 16px)*0.5)}.wp-block-gallery.has-nested-images.columns-default figure.wp-block-image:not(#individual-image):first-child:last-child{width:100%}}.wp-block-gallery.has-nested-images.alignleft,.wp-block-gallery.has-nested-images.alignright{max-width:420px;width:100%}.wp-block-gallery.has-nested-images.aligncenter{justify-content:center} \ No newline at end of file diff --git a/wp-includes/blocks/group/block.json b/wp-includes/blocks/group/block.json index 7921b74ffd..2e3a99f78a 100644 --- a/wp-includes/blocks/group/block.json +++ b/wp-includes/blocks/group/block.json @@ -1,9 +1,10 @@ { + "$schema": "https://schemas.wp.org/trunk/block.json", "apiVersion": 2, "name": "core/group", "title": "Group", "category": "design", - "description": "Combine blocks into a group.", + "description": "Gather blocks in a layout container.", "keywords": [ "container", "wrapper", "row", "section" ], "textdomain": "default", "attributes": { @@ -22,9 +23,14 @@ "html": false, "color": { "gradients": true, - "link": true + "link": true, + "__experimentalDefaultControls": { + "background": true, + "text": true + } }, "spacing": { + "margin": [ "top", "bottom" ], "padding": true, "blockGap": true, "__experimentalDefaultControls": { @@ -36,7 +42,24 @@ "color": true, "radius": true, "style": true, - "width": true + "width": true, + "__experimentalDefaultControls": { + "color": true, + "radius": true, + "style": true, + "width": true + } + }, + "typography": { + "fontSize": true, + "lineHeight": true, + "__experimentalFontStyle": true, + "__experimentalFontWeight": true, + "__experimentalLetterSpacing": true, + "__experimentalTextTransform": true, + "__experimentalDefaultControls": { + "fontSize": true + } }, "__experimentalLayout": true }, diff --git a/wp-includes/blocks/group/editor-rtl.css b/wp-includes/blocks/group/editor-rtl.css index 59f73e394e..e9297b5861 100644 --- a/wp-includes/blocks/group/editor-rtl.css +++ b/wp-includes/blocks/group/editor-rtl.css @@ -89,4 +89,30 @@ [data-type="core/group"].is-selected .has-background .block-list-appender { margin-top: 18px; margin-bottom: 18px; +} + +.is-layout-flex.block-editor-block-list__block .block-list-appender:only-child { + gap: inherit; + pointer-events: none; +} +.is-layout-flex.block-editor-block-list__block .block-list-appender:only-child, +.is-layout-flex.block-editor-block-list__block .block-list-appender:only-child .block-editor-default-block-appender__content, +.is-layout-flex.block-editor-block-list__block .block-list-appender:only-child .block-editor-inserter { + display: inherit; + width: 100%; + flex-direction: inherit; + flex: 1; +} +.is-layout-flex.block-editor-block-list__block .block-list-appender:only-child::after { + content: ""; + display: flex; + border: 1px dashed currentColor; + opacity: 0.4; + border-radius: 2px; + flex: 1; + pointer-events: none; + min-height: 48px; +} +.is-layout-flex.block-editor-block-list__block .block-list-appender:only-child .block-editor-inserter { + pointer-events: all; } \ No newline at end of file diff --git a/wp-includes/blocks/group/editor-rtl.min.css b/wp-includes/blocks/group/editor-rtl.min.css index b75588b91c..b2504086ab 100644 --- a/wp-includes/blocks/group/editor-rtl.min.css +++ b/wp-includes/blocks/group/editor-rtl.min.css @@ -1 +1 @@ -.wp-block-group .block-editor-block-list__insertion-point{right:0;left:0}[data-type="core/group"].is-selected .block-list-appender{margin-right:0;margin-left:0}[data-type="core/group"].is-selected .has-background .block-list-appender{margin-top:18px;margin-bottom:18px} \ No newline at end of file +.wp-block-group .block-editor-block-list__insertion-point{right:0;left:0}[data-type="core/group"].is-selected .block-list-appender{margin-right:0;margin-left:0}[data-type="core/group"].is-selected .has-background .block-list-appender{margin-top:18px;margin-bottom:18px}.is-layout-flex.block-editor-block-list__block .block-list-appender:only-child{gap:inherit;pointer-events:none}.is-layout-flex.block-editor-block-list__block .block-list-appender:only-child,.is-layout-flex.block-editor-block-list__block .block-list-appender:only-child .block-editor-default-block-appender__content,.is-layout-flex.block-editor-block-list__block .block-list-appender:only-child .block-editor-inserter{display:inherit;width:100%;flex-direction:inherit;flex:1}.is-layout-flex.block-editor-block-list__block .block-list-appender:only-child:after{content:"";display:flex;border:1px dashed;opacity:.4;border-radius:2px;flex:1;pointer-events:none;min-height:48px}.is-layout-flex.block-editor-block-list__block .block-list-appender:only-child .block-editor-inserter{pointer-events:all} \ No newline at end of file diff --git a/wp-includes/blocks/group/editor.css b/wp-includes/blocks/group/editor.css index 2d3d197fd2..4da8f38a1c 100644 --- a/wp-includes/blocks/group/editor.css +++ b/wp-includes/blocks/group/editor.css @@ -89,4 +89,30 @@ [data-type="core/group"].is-selected .has-background .block-list-appender { margin-top: 18px; margin-bottom: 18px; +} + +.is-layout-flex.block-editor-block-list__block .block-list-appender:only-child { + gap: inherit; + pointer-events: none; +} +.is-layout-flex.block-editor-block-list__block .block-list-appender:only-child, +.is-layout-flex.block-editor-block-list__block .block-list-appender:only-child .block-editor-default-block-appender__content, +.is-layout-flex.block-editor-block-list__block .block-list-appender:only-child .block-editor-inserter { + display: inherit; + width: 100%; + flex-direction: inherit; + flex: 1; +} +.is-layout-flex.block-editor-block-list__block .block-list-appender:only-child::after { + content: ""; + display: flex; + border: 1px dashed currentColor; + opacity: 0.4; + border-radius: 2px; + flex: 1; + pointer-events: none; + min-height: 48px; +} +.is-layout-flex.block-editor-block-list__block .block-list-appender:only-child .block-editor-inserter { + pointer-events: all; } \ No newline at end of file diff --git a/wp-includes/blocks/group/editor.min.css b/wp-includes/blocks/group/editor.min.css index d9a41f7c14..77cecf1ac4 100644 --- a/wp-includes/blocks/group/editor.min.css +++ b/wp-includes/blocks/group/editor.min.css @@ -1 +1 @@ -.wp-block-group .block-editor-block-list__insertion-point{left:0;right:0}[data-type="core/group"].is-selected .block-list-appender{margin-left:0;margin-right:0}[data-type="core/group"].is-selected .has-background .block-list-appender{margin-top:18px;margin-bottom:18px} \ No newline at end of file +.wp-block-group .block-editor-block-list__insertion-point{left:0;right:0}[data-type="core/group"].is-selected .block-list-appender{margin-left:0;margin-right:0}[data-type="core/group"].is-selected .has-background .block-list-appender{margin-top:18px;margin-bottom:18px}.is-layout-flex.block-editor-block-list__block .block-list-appender:only-child{gap:inherit;pointer-events:none}.is-layout-flex.block-editor-block-list__block .block-list-appender:only-child,.is-layout-flex.block-editor-block-list__block .block-list-appender:only-child .block-editor-default-block-appender__content,.is-layout-flex.block-editor-block-list__block .block-list-appender:only-child .block-editor-inserter{display:inherit;width:100%;flex-direction:inherit;flex:1}.is-layout-flex.block-editor-block-list__block .block-list-appender:only-child:after{content:"";display:flex;border:1px dashed;opacity:.4;border-radius:2px;flex:1;pointer-events:none;min-height:48px}.is-layout-flex.block-editor-block-list__block .block-list-appender:only-child .block-editor-inserter{pointer-events:all} \ No newline at end of file diff --git a/wp-includes/blocks/group/theme-rtl.css b/wp-includes/blocks/group/theme-rtl.css index 21e5c5850a..151fca81d6 100644 --- a/wp-includes/blocks/group/theme-rtl.css +++ b/wp-includes/blocks/group/theme-rtl.css @@ -74,6 +74,6 @@ /** * Reset the WP Admin page styles for Gutenberg-like pages. */ -.wp-block-group:where(.has-background) { +:where(.wp-block-group.has-background) { padding: 1.25em 2.375em; } \ No newline at end of file diff --git a/wp-includes/blocks/group/theme-rtl.min.css b/wp-includes/blocks/group/theme-rtl.min.css index 7b73295ad7..df68e7e12c 100644 --- a/wp-includes/blocks/group/theme-rtl.min.css +++ b/wp-includes/blocks/group/theme-rtl.min.css @@ -1 +1 @@ -.wp-block-group:where(.has-background){padding:1.25em 2.375em} \ No newline at end of file +:where(.wp-block-group.has-background){padding:1.25em 2.375em} \ No newline at end of file diff --git a/wp-includes/blocks/group/theme.css b/wp-includes/blocks/group/theme.css index 21e5c5850a..151fca81d6 100644 --- a/wp-includes/blocks/group/theme.css +++ b/wp-includes/blocks/group/theme.css @@ -74,6 +74,6 @@ /** * Reset the WP Admin page styles for Gutenberg-like pages. */ -.wp-block-group:where(.has-background) { +:where(.wp-block-group.has-background) { padding: 1.25em 2.375em; } \ No newline at end of file diff --git a/wp-includes/blocks/group/theme.min.css b/wp-includes/blocks/group/theme.min.css index 7b73295ad7..df68e7e12c 100644 --- a/wp-includes/blocks/group/theme.min.css +++ b/wp-includes/blocks/group/theme.min.css @@ -1 +1 @@ -.wp-block-group:where(.has-background){padding:1.25em 2.375em} \ No newline at end of file +:where(.wp-block-group.has-background){padding:1.25em 2.375em} \ No newline at end of file diff --git a/wp-includes/blocks/heading/block.json b/wp-includes/blocks/heading/block.json index b09baa78d4..d2c1b4fb76 100644 --- a/wp-includes/blocks/heading/block.json +++ b/wp-includes/blocks/heading/block.json @@ -1,4 +1,5 @@ { + "$schema": "https://schemas.wp.org/trunk/block.json", "apiVersion": 2, "name": "core/heading", "title": "Heading", @@ -30,7 +31,11 @@ "anchor": true, "className": false, "color": { - "link": true + "link": true, + "__experimentalDefaultControls": { + "background": true, + "text": true + } }, "spacing": { "margin": true diff --git a/wp-includes/blocks/heading/style-rtl.css b/wp-includes/blocks/heading/style-rtl.css index 2a163ecb5e..e9acf56b57 100644 --- a/wp-includes/blocks/heading/style-rtl.css +++ b/wp-includes/blocks/heading/style-rtl.css @@ -74,14 +74,6 @@ /** * Reset the WP Admin page styles for Gutenberg-like pages. */ -h1, -h2, -h3, -h4, -h5, -h6 { - overflow-wrap: break-word; -} h1.has-background, h2.has-background, h3.has-background, diff --git a/wp-includes/blocks/heading/style-rtl.min.css b/wp-includes/blocks/heading/style-rtl.min.css index a520e75dc7..38760e892f 100644 --- a/wp-includes/blocks/heading/style-rtl.min.css +++ b/wp-includes/blocks/heading/style-rtl.min.css @@ -1 +1 @@ -h1,h2,h3,h4,h5,h6{overflow-wrap:break-word}h1.has-background,h2.has-background,h3.has-background,h4.has-background,h5.has-background,h6.has-background{padding:1.25em 2.375em} \ No newline at end of file +h1.has-background,h2.has-background,h3.has-background,h4.has-background,h5.has-background,h6.has-background{padding:1.25em 2.375em} \ No newline at end of file diff --git a/wp-includes/blocks/heading/style.css b/wp-includes/blocks/heading/style.css index 2a163ecb5e..e9acf56b57 100644 --- a/wp-includes/blocks/heading/style.css +++ b/wp-includes/blocks/heading/style.css @@ -74,14 +74,6 @@ /** * Reset the WP Admin page styles for Gutenberg-like pages. */ -h1, -h2, -h3, -h4, -h5, -h6 { - overflow-wrap: break-word; -} h1.has-background, h2.has-background, h3.has-background, diff --git a/wp-includes/blocks/heading/style.min.css b/wp-includes/blocks/heading/style.min.css index a520e75dc7..38760e892f 100644 --- a/wp-includes/blocks/heading/style.min.css +++ b/wp-includes/blocks/heading/style.min.css @@ -1 +1 @@ -h1,h2,h3,h4,h5,h6{overflow-wrap:break-word}h1.has-background,h2.has-background,h3.has-background,h4.has-background,h5.has-background,h6.has-background{padding:1.25em 2.375em} \ No newline at end of file +h1.has-background,h2.has-background,h3.has-background,h4.has-background,h5.has-background,h6.has-background{padding:1.25em 2.375em} \ No newline at end of file diff --git a/wp-includes/blocks/home-link.php b/wp-includes/blocks/home-link.php new file mode 100644 index 0000000000..56712913aa --- /dev/null +++ b/wp-includes/blocks/home-link.php @@ -0,0 +1,162 @@ + array(), + 'inline_styles' => '', + ); + + // Text color. + $has_named_text_color = array_key_exists( 'textColor', $context ); + $has_custom_text_color = isset( $context['style']['color']['text'] ); + + // If has text color. + if ( $has_custom_text_color || $has_named_text_color ) { + // Add has-text-color class. + $colors['css_classes'][] = 'has-text-color'; + } + + if ( $has_named_text_color ) { + // Add the color class. + $colors['css_classes'][] = sprintf( 'has-%s-color', $context['textColor'] ); + } elseif ( $has_custom_text_color ) { + // Add the custom color inline style. + $colors['inline_styles'] .= sprintf( 'color: %s;', $context['style']['color']['text'] ); + } + + // Background color. + $has_named_background_color = array_key_exists( 'backgroundColor', $context ); + $has_custom_background_color = isset( $context['style']['color']['background'] ); + + // If has background color. + if ( $has_custom_background_color || $has_named_background_color ) { + // Add has-background class. + $colors['css_classes'][] = 'has-background'; + } + + if ( $has_named_background_color ) { + // Add the background-color class. + $colors['css_classes'][] = sprintf( 'has-%s-background-color', $context['backgroundColor'] ); + } elseif ( $has_custom_background_color ) { + // Add the custom background-color inline style. + $colors['inline_styles'] .= sprintf( 'background-color: %s;', $context['style']['color']['background'] ); + } + + return $colors; +} + +/** + * Build an array with CSS classes and inline styles defining the font sizes + * which will be applied to the home link markup in the front-end. + * + * @param array $context Home link block context. + * @return array Font size CSS classes and inline styles. + */ +function block_core_home_link_build_css_font_sizes( $context ) { + // CSS classes. + $font_sizes = array( + 'css_classes' => array(), + 'inline_styles' => '', + ); + + $has_named_font_size = array_key_exists( 'fontSize', $context ); + $has_custom_font_size = isset( $context['style']['typography']['fontSize'] ); + + if ( $has_named_font_size ) { + // Add the font size class. + $font_sizes['css_classes'][] = sprintf( 'has-%s-font-size', $context['fontSize'] ); + } elseif ( $has_custom_font_size ) { + // Add the custom font size inline style. + $font_sizes['inline_styles'] = sprintf( 'font-size: %s;', $context['style']['typography']['fontSize'] ); + } + + return $font_sizes; +} + +/** + * Builds an array with classes and style for the li wrapper + * + * @param array $context Home link block context. + * @return array The li wrapper attributes. + */ +function block_core_home_link_build_li_wrapper_attributes( $context ) { + $colors = block_core_home_link_build_css_colors( $context ); + $font_sizes = block_core_home_link_build_css_font_sizes( $context ); + $classes = array_merge( + $colors['css_classes'], + $font_sizes['css_classes'] + ); + $style_attribute = ( $colors['inline_styles'] . $font_sizes['inline_styles'] ); + $css_classes = trim( implode( ' ', $classes ) ) . ' wp-block-navigation-item'; + + $wrapper_attributes = get_block_wrapper_attributes( + array( + 'class' => $css_classes, + 'style' => $style_attribute, + ) + ); + + return $wrapper_attributes; +} + +/** + * Renders the `core/home-link` block. + * + * @param array $attributes The block attributes. + * @param string $content The saved content. + * @param WP_Block $block The parsed block. + * + * @return string Returns the post content with the home url added. + */ +function render_block_core_home_link( $attributes, $content, $block ) { + if ( empty( $attributes['label'] ) ) { + return ''; + } + + $wrapper_attributes = block_core_home_link_build_li_wrapper_attributes( $block->context ); + + $aria_current = is_home() || ( is_front_page() && 'page' === get_option( 'show_on_front' ) ) ? ' aria-current="page"' : ''; + + $html = '
  • 'render_block_core_home_link', + ) + ); +} +add_action( 'init', 'register_block_core_home_link' ); diff --git a/wp-includes/blocks/home-link/block.json b/wp-includes/blocks/home-link/block.json new file mode 100644 index 0000000000..3597aa9d55 --- /dev/null +++ b/wp-includes/blocks/home-link/block.json @@ -0,0 +1,30 @@ +{ + "$schema": "https://schemas.wp.org/trunk/block.json", + "apiVersion": 2, + "name": "core/home-link", + "category": "design", + "parent": [ "core/navigation" ], + "title": "Home Link", + "description": "Create a link that always points to the homepage of the site. Usually not necessary if there is already a site title link present in the header.", + "textdomain": "default", + "attributes": { + "label": { + "type": "string" + } + }, + "usesContext": [ + "textColor", + "customTextColor", + "backgroundColor", + "customBackgroundColor", + "fontSize", + "customFontSize", + "style" + ], + "supports": { + "reusable": false, + "html": false + }, + "editorStyle": "wp-block-home-link-editor", + "style": "wp-block-home-link" +} diff --git a/wp-includes/blocks/html/block.json b/wp-includes/blocks/html/block.json index 962db3f368..e72a674373 100644 --- a/wp-includes/blocks/html/block.json +++ b/wp-includes/blocks/html/block.json @@ -1,4 +1,5 @@ { + "$schema": "https://schemas.wp.org/trunk/block.json", "apiVersion": 2, "name": "core/html", "title": "Custom HTML", diff --git a/wp-includes/blocks/image.php b/wp-includes/blocks/image.php index f8f7066a97..70fa3a0a30 100644 --- a/wp-includes/blocks/image.php +++ b/wp-includes/blocks/image.php @@ -9,8 +9,8 @@ * Renders the `core/image` block on the server, * adding a data-id attribute to the element if core/gallery has added on pre-render. * - * @param array $attributes The block attributes. - * @param array $content The block content. + * @param array $attributes The block attributes. + * @param string $content The block content. * @return string Returns the block content with the data-id attribute added. */ function render_block_core_image( $attributes, $content ) { @@ -20,7 +20,7 @@ function render_block_core_image( $attributes, $content ) { // which now wraps Image Blocks within innerBlocks. // The data-id attribute is added in a core/gallery `render_block_data` hook. $data_id_attribute = 'data-id="' . esc_attr( $attributes['data-id'] ) . '"'; - if ( ! strpos( $content, $data_id_attribute ) ) { + if ( false === strpos( $content, $data_id_attribute ) ) { $content = str_replace( ' .wp-block-image { - display: grid; - grid-template-columns: [image] minmax(0, max-content) [placeholder] auto; -} -*:not([data-align]) > .wp-block-image .components-placeholder { - grid-column: placeholder; -} -*:not([data-align]) > .wp-block-image > div:not(.components-placeholder) { - grid-column: image; -} -*:not([data-align]) > .wp-block-image > figcaption { - grid-column: image; - display: table-caption; - caption-side: bottom; -} - .wp-block[data-align=left] > .wp-block-image { margin-left: 1em; margin-right: 0; diff --git a/wp-includes/blocks/image/editor-rtl.min.css b/wp-includes/blocks/image/editor-rtl.min.css index de52b27977..1c3430c529 100644 --- a/wp-includes/blocks/image/editor-rtl.min.css +++ b/wp-includes/blocks/image/editor-rtl.min.css @@ -1 +1 @@ -figure.wp-block-image:not(.wp-block){margin:0}.wp-block-image{position:relative}.wp-block-image .is-applying img,.wp-block-image.is-transient img{opacity:.3}.wp-block-image figcaption img{display:inline}.wp-block-image .components-spinner{position:absolute;top:50%;right:50%;margin-top:-9px;margin-right:-9px}.wp-block-image:not(.is-style-rounded)>div:not(.components-placeholder){border-radius:inherit}.wp-block-image .components-resizable-box__container{display:inline-block}.wp-block-image .components-resizable-box__container img{display:block;width:inherit;height:inherit}.block-editor-block-list__block[data-type="core/image"] .block-editor-block-toolbar .block-editor-url-input__button-modal{position:absolute;right:0;left:0;margin:-1px 0}@media (min-width:600px){.block-editor-block-list__block[data-type="core/image"] .block-editor-block-toolbar .block-editor-url-input__button-modal{margin:-1px}}[data-align=full]>.wp-block-image img,[data-align=wide]>.wp-block-image img{height:auto;width:100%}.wp-block[data-align=center]>.wp-block-image,.wp-block[data-align=left]>.wp-block-image,.wp-block[data-align=right]>.wp-block-image{display:table}.wp-block[data-align=center]>.wp-block-image>figcaption,.wp-block[data-align=left]>.wp-block-image>figcaption,.wp-block[data-align=right]>.wp-block-image>figcaption{display:table-caption;caption-side:bottom}:not([data-align])>.wp-block-image{display:grid;grid-template-columns:[image] minmax(0,max-content) [placeholder] auto}:not([data-align])>.wp-block-image .components-placeholder{grid-column:placeholder}:not([data-align])>.wp-block-image>div:not(.components-placeholder){grid-column:image}:not([data-align])>.wp-block-image>figcaption{grid-column:image;display:table-caption;caption-side:bottom}.wp-block[data-align=left]>.wp-block-image{margin:.5em 0 .5em 1em}.wp-block[data-align=right]>.wp-block-image{margin:.5em 1em .5em 0}.wp-block[data-align=center]>.wp-block-image{margin-right:auto;margin-left:auto;text-align:center}.wp-block-image__crop-area{position:relative;max-width:100%;width:100%}.wp-block-image__crop-icon{padding:0 8px;min-width:48px;display:flex;justify-content:center;align-items:center}.wp-block-image__crop-icon svg{fill:currentColor}.wp-block-image__zoom .components-popover__content{overflow:visible;min-width:260px}.wp-block-image__zoom .components-range-control{flex:1}.wp-block-image__zoom .components-base-control__field{display:flex;margin-bottom:0;flex-direction:column;align-items:flex-start}.wp-block-image__aspect-ratio{height:46px;margin-bottom:-8px;display:flex;align-items:center}.wp-block-image__aspect-ratio .components-button{width:36px;padding-right:0;padding-left:0} \ No newline at end of file +figure.wp-block-image:not(.wp-block){margin:0}.wp-block-image{position:relative}.wp-block-image .is-applying img,.wp-block-image.is-transient img{opacity:.3}.wp-block-image figcaption img{display:inline}.wp-block-image .components-spinner{position:absolute;top:50%;right:50%;margin-top:-9px;margin-right:-9px}.wp-block-image:not(.is-style-rounded)>div:not(.components-placeholder){border-radius:inherit}.wp-block-image .components-resizable-box__container{display:inline-block}.wp-block-image .components-resizable-box__container img{display:block;width:inherit;height:inherit}.block-editor-block-list__block[data-type="core/image"] .block-editor-block-toolbar .block-editor-url-input__button-modal{position:absolute;right:0;left:0;margin:-1px 0}@media (min-width:600px){.block-editor-block-list__block[data-type="core/image"] .block-editor-block-toolbar .block-editor-url-input__button-modal{margin:-1px}}[data-align=full]>.wp-block-image img,[data-align=wide]>.wp-block-image img{height:auto;width:100%}.wp-block[data-align=center]>.wp-block-image,.wp-block[data-align=left]>.wp-block-image,.wp-block[data-align=right]>.wp-block-image{display:table}.wp-block[data-align=center]>.wp-block-image>figcaption,.wp-block[data-align=left]>.wp-block-image>figcaption,.wp-block[data-align=right]>.wp-block-image>figcaption{display:table-caption;caption-side:bottom}.wp-block[data-align=left]>.wp-block-image{margin:.5em 0 .5em 1em}.wp-block[data-align=right]>.wp-block-image{margin:.5em 1em .5em 0}.wp-block[data-align=center]>.wp-block-image{margin-right:auto;margin-left:auto;text-align:center}.wp-block-image__crop-area{position:relative;max-width:100%;width:100%}.wp-block-image__crop-icon{padding:0 8px;min-width:48px;display:flex;justify-content:center;align-items:center}.wp-block-image__crop-icon svg{fill:currentColor}.wp-block-image__zoom .components-popover__content{overflow:visible;min-width:260px}.wp-block-image__zoom .components-range-control{flex:1}.wp-block-image__zoom .components-base-control__field{display:flex;margin-bottom:0;flex-direction:column;align-items:flex-start}.wp-block-image__aspect-ratio{height:46px;margin-bottom:-8px;display:flex;align-items:center}.wp-block-image__aspect-ratio .components-button{width:36px;padding-right:0;padding-left:0} \ No newline at end of file diff --git a/wp-includes/blocks/image/editor.css b/wp-includes/blocks/image/editor.css index 896a56c5cb..3e3765fad7 100644 --- a/wp-includes/blocks/image/editor.css +++ b/wp-includes/blocks/image/editor.css @@ -137,22 +137,6 @@ figure.wp-block-image:not(.wp-block) { caption-side: bottom; } -*:not([data-align]) > .wp-block-image { - display: grid; - grid-template-columns: [image] minmax(0, max-content) [placeholder] auto; -} -*:not([data-align]) > .wp-block-image .components-placeholder { - grid-column: placeholder; -} -*:not([data-align]) > .wp-block-image > div:not(.components-placeholder) { - grid-column: image; -} -*:not([data-align]) > .wp-block-image > figcaption { - grid-column: image; - display: table-caption; - caption-side: bottom; -} - .wp-block[data-align=left] > .wp-block-image { margin-right: 1em; margin-left: 0; diff --git a/wp-includes/blocks/image/editor.min.css b/wp-includes/blocks/image/editor.min.css index 201926be2f..5de8124934 100644 --- a/wp-includes/blocks/image/editor.min.css +++ b/wp-includes/blocks/image/editor.min.css @@ -1 +1 @@ -figure.wp-block-image:not(.wp-block){margin:0}.wp-block-image{position:relative}.wp-block-image .is-applying img,.wp-block-image.is-transient img{opacity:.3}.wp-block-image figcaption img{display:inline}.wp-block-image .components-spinner{position:absolute;top:50%;left:50%;margin-top:-9px;margin-left:-9px}.wp-block-image:not(.is-style-rounded)>div:not(.components-placeholder){border-radius:inherit}.wp-block-image .components-resizable-box__container{display:inline-block}.wp-block-image .components-resizable-box__container img{display:block;width:inherit;height:inherit}.block-editor-block-list__block[data-type="core/image"] .block-editor-block-toolbar .block-editor-url-input__button-modal{position:absolute;left:0;right:0;margin:-1px 0}@media (min-width:600px){.block-editor-block-list__block[data-type="core/image"] .block-editor-block-toolbar .block-editor-url-input__button-modal{margin:-1px}}[data-align=full]>.wp-block-image img,[data-align=wide]>.wp-block-image img{height:auto;width:100%}.wp-block[data-align=center]>.wp-block-image,.wp-block[data-align=left]>.wp-block-image,.wp-block[data-align=right]>.wp-block-image{display:table}.wp-block[data-align=center]>.wp-block-image>figcaption,.wp-block[data-align=left]>.wp-block-image>figcaption,.wp-block[data-align=right]>.wp-block-image>figcaption{display:table-caption;caption-side:bottom}:not([data-align])>.wp-block-image{display:grid;grid-template-columns:[image] minmax(0,max-content) [placeholder] auto}:not([data-align])>.wp-block-image .components-placeholder{grid-column:placeholder}:not([data-align])>.wp-block-image>div:not(.components-placeholder){grid-column:image}:not([data-align])>.wp-block-image>figcaption{grid-column:image;display:table-caption;caption-side:bottom}.wp-block[data-align=left]>.wp-block-image{margin:.5em 1em .5em 0}.wp-block[data-align=right]>.wp-block-image{margin:.5em 0 .5em 1em}.wp-block[data-align=center]>.wp-block-image{margin-left:auto;margin-right:auto;text-align:center}.wp-block-image__crop-area{position:relative;max-width:100%;width:100%}.wp-block-image__crop-icon{padding:0 8px;min-width:48px;display:flex;justify-content:center;align-items:center}.wp-block-image__crop-icon svg{fill:currentColor}.wp-block-image__zoom .components-popover__content{overflow:visible;min-width:260px}.wp-block-image__zoom .components-range-control{flex:1}.wp-block-image__zoom .components-base-control__field{display:flex;margin-bottom:0;flex-direction:column;align-items:flex-start}.wp-block-image__aspect-ratio{height:46px;margin-bottom:-8px;display:flex;align-items:center}.wp-block-image__aspect-ratio .components-button{width:36px;padding-left:0;padding-right:0} \ No newline at end of file +figure.wp-block-image:not(.wp-block){margin:0}.wp-block-image{position:relative}.wp-block-image .is-applying img,.wp-block-image.is-transient img{opacity:.3}.wp-block-image figcaption img{display:inline}.wp-block-image .components-spinner{position:absolute;top:50%;left:50%;margin-top:-9px;margin-left:-9px}.wp-block-image:not(.is-style-rounded)>div:not(.components-placeholder){border-radius:inherit}.wp-block-image .components-resizable-box__container{display:inline-block}.wp-block-image .components-resizable-box__container img{display:block;width:inherit;height:inherit}.block-editor-block-list__block[data-type="core/image"] .block-editor-block-toolbar .block-editor-url-input__button-modal{position:absolute;left:0;right:0;margin:-1px 0}@media (min-width:600px){.block-editor-block-list__block[data-type="core/image"] .block-editor-block-toolbar .block-editor-url-input__button-modal{margin:-1px}}[data-align=full]>.wp-block-image img,[data-align=wide]>.wp-block-image img{height:auto;width:100%}.wp-block[data-align=center]>.wp-block-image,.wp-block[data-align=left]>.wp-block-image,.wp-block[data-align=right]>.wp-block-image{display:table}.wp-block[data-align=center]>.wp-block-image>figcaption,.wp-block[data-align=left]>.wp-block-image>figcaption,.wp-block[data-align=right]>.wp-block-image>figcaption{display:table-caption;caption-side:bottom}.wp-block[data-align=left]>.wp-block-image{margin:.5em 1em .5em 0}.wp-block[data-align=right]>.wp-block-image{margin:.5em 0 .5em 1em}.wp-block[data-align=center]>.wp-block-image{margin-left:auto;margin-right:auto;text-align:center}.wp-block-image__crop-area{position:relative;max-width:100%;width:100%}.wp-block-image__crop-icon{padding:0 8px;min-width:48px;display:flex;justify-content:center;align-items:center}.wp-block-image__crop-icon svg{fill:currentColor}.wp-block-image__zoom .components-popover__content{overflow:visible;min-width:260px}.wp-block-image__zoom .components-range-control{flex:1}.wp-block-image__zoom .components-base-control__field{display:flex;margin-bottom:0;flex-direction:column;align-items:flex-start}.wp-block-image__aspect-ratio{height:46px;margin-bottom:-8px;display:flex;align-items:center}.wp-block-image__aspect-ratio .components-button{width:36px;padding-left:0;padding-right:0} \ No newline at end of file diff --git a/wp-includes/blocks/image/style-rtl.css b/wp-includes/blocks/image/style-rtl.css index 35c706a77c..7d7cba2ef9 100644 --- a/wp-includes/blocks/image/style-rtl.css +++ b/wp-includes/blocks/image/style-rtl.css @@ -78,6 +78,8 @@ margin: 0 0 1em 0; } .wp-block-image img { + height: auto; + max-width: 100%; vertical-align: bottom; } .wp-block-image:not(.is-style-rounded) > a, @@ -91,11 +93,13 @@ height: auto; width: 100%; } +.wp-block-image.alignleft, .wp-block-image.alignright, .wp-block-image.aligncenter, .wp-block-image .alignleft, .wp-block-image .alignright, .wp-block-image .aligncenter { display: table; } +.wp-block-image.alignleft > figcaption, .wp-block-image.alignright > figcaption, .wp-block-image.aligncenter > figcaption, .wp-block-image .alignleft > figcaption, .wp-block-image .alignright > figcaption, .wp-block-image .aligncenter > figcaption { @@ -124,7 +128,8 @@ margin-top: 0.5em; margin-bottom: 1em; } -.wp-block-image.is-style-rounded img { +.wp-block-image.is-style-rounded img, +.wp-block-image .is-style-rounded img { border-radius: 9999px; } .wp-block-image.is-style-circle-mask img { diff --git a/wp-includes/blocks/image/style-rtl.min.css b/wp-includes/blocks/image/style-rtl.min.css index 74ecedbf43..40386095b2 100644 --- a/wp-includes/blocks/image/style-rtl.min.css +++ b/wp-includes/blocks/image/style-rtl.min.css @@ -1 +1 @@ -.wp-block-image{margin:0 0 1em}.wp-block-image img{vertical-align:bottom}.wp-block-image:not(.is-style-rounded)>a,.wp-block-image:not(.is-style-rounded) img{border-radius:inherit}.wp-block-image.aligncenter{text-align:center}.wp-block-image.alignfull img,.wp-block-image.alignwide img{height:auto;width:100%}.wp-block-image .aligncenter,.wp-block-image .alignleft,.wp-block-image .alignright{display:table}.wp-block-image .aligncenter>figcaption,.wp-block-image .alignleft>figcaption,.wp-block-image .alignright>figcaption{display:table-caption;caption-side:bottom}.wp-block-image .alignleft{float:left;margin-left:1em;margin-top:.5em;margin-bottom:.5em}.wp-block-image .alignright{float:right;margin-right:1em;margin-top:.5em;margin-bottom:.5em}.wp-block-image .aligncenter{margin-right:auto;margin-left:auto}.wp-block-image figcaption{margin-top:.5em;margin-bottom:1em}.wp-block-image.is-style-circle-mask img,.wp-block-image.is-style-rounded img{border-radius:9999px}@supports ((-webkit-mask-image:none) or (mask-image:none)) or (-webkit-mask-image:none){.wp-block-image.is-style-circle-mask img{-webkit-mask-image:url('data:image/svg+xml;utf8,');mask-image:url('data:image/svg+xml;utf8,');mask-mode:alpha;-webkit-mask-repeat:no-repeat;mask-repeat:no-repeat;-webkit-mask-size:contain;mask-size:contain;-webkit-mask-position:center;mask-position:center;border-radius:0}}.wp-block-image figure{margin:0} \ No newline at end of file +.wp-block-image{margin:0 0 1em}.wp-block-image img{height:auto;max-width:100%;vertical-align:bottom}.wp-block-image:not(.is-style-rounded)>a,.wp-block-image:not(.is-style-rounded) img{border-radius:inherit}.wp-block-image.aligncenter{text-align:center}.wp-block-image.alignfull img,.wp-block-image.alignwide img{height:auto;width:100%}.wp-block-image.aligncenter,.wp-block-image .aligncenter,.wp-block-image.alignleft,.wp-block-image .alignleft,.wp-block-image.alignright,.wp-block-image .alignright{display:table}.wp-block-image.aligncenter>figcaption,.wp-block-image .aligncenter>figcaption,.wp-block-image.alignleft>figcaption,.wp-block-image .alignleft>figcaption,.wp-block-image.alignright>figcaption,.wp-block-image .alignright>figcaption{display:table-caption;caption-side:bottom}.wp-block-image .alignleft{float:left;margin-left:1em;margin-top:.5em;margin-bottom:.5em}.wp-block-image .alignright{float:right;margin-right:1em;margin-top:.5em;margin-bottom:.5em}.wp-block-image .aligncenter{margin-right:auto;margin-left:auto}.wp-block-image figcaption{margin-top:.5em;margin-bottom:1em}.wp-block-image.is-style-circle-mask img,.wp-block-image.is-style-rounded img,.wp-block-image .is-style-rounded img{border-radius:9999px}@supports ((-webkit-mask-image:none) or (mask-image:none)) or (-webkit-mask-image:none){.wp-block-image.is-style-circle-mask img{-webkit-mask-image:url('data:image/svg+xml;utf8,');mask-image:url('data:image/svg+xml;utf8,');mask-mode:alpha;-webkit-mask-repeat:no-repeat;mask-repeat:no-repeat;-webkit-mask-size:contain;mask-size:contain;-webkit-mask-position:center;mask-position:center;border-radius:0}}.wp-block-image figure{margin:0} \ No newline at end of file diff --git a/wp-includes/blocks/image/style.css b/wp-includes/blocks/image/style.css index 5f3e523acb..58da60d410 100644 --- a/wp-includes/blocks/image/style.css +++ b/wp-includes/blocks/image/style.css @@ -78,6 +78,8 @@ margin: 0 0 1em 0; } .wp-block-image img { + height: auto; + max-width: 100%; vertical-align: bottom; } .wp-block-image:not(.is-style-rounded) > a, @@ -91,11 +93,13 @@ height: auto; width: 100%; } +.wp-block-image.alignleft, .wp-block-image.alignright, .wp-block-image.aligncenter, .wp-block-image .alignleft, .wp-block-image .alignright, .wp-block-image .aligncenter { display: table; } +.wp-block-image.alignleft > figcaption, .wp-block-image.alignright > figcaption, .wp-block-image.aligncenter > figcaption, .wp-block-image .alignleft > figcaption, .wp-block-image .alignright > figcaption, .wp-block-image .aligncenter > figcaption { @@ -128,7 +132,8 @@ margin-top: 0.5em; margin-bottom: 1em; } -.wp-block-image.is-style-rounded img { +.wp-block-image.is-style-rounded img, +.wp-block-image .is-style-rounded img { border-radius: 9999px; } .wp-block-image.is-style-circle-mask img { diff --git a/wp-includes/blocks/image/style.min.css b/wp-includes/blocks/image/style.min.css index 4b95f9fc80..9c56111854 100644 --- a/wp-includes/blocks/image/style.min.css +++ b/wp-includes/blocks/image/style.min.css @@ -1 +1 @@ -.wp-block-image{margin:0 0 1em}.wp-block-image img{vertical-align:bottom}.wp-block-image:not(.is-style-rounded)>a,.wp-block-image:not(.is-style-rounded) img{border-radius:inherit}.wp-block-image.aligncenter{text-align:center}.wp-block-image.alignfull img,.wp-block-image.alignwide img{height:auto;width:100%}.wp-block-image .aligncenter,.wp-block-image .alignleft,.wp-block-image .alignright{display:table}.wp-block-image .aligncenter>figcaption,.wp-block-image .alignleft>figcaption,.wp-block-image .alignright>figcaption{display:table-caption;caption-side:bottom}.wp-block-image .alignleft{float:left;margin:.5em 1em .5em 0}.wp-block-image .alignright{float:right;margin:.5em 0 .5em 1em}.wp-block-image .aligncenter{margin-left:auto;margin-right:auto}.wp-block-image figcaption{margin-top:.5em;margin-bottom:1em}.wp-block-image.is-style-circle-mask img,.wp-block-image.is-style-rounded img{border-radius:9999px}@supports ((-webkit-mask-image:none) or (mask-image:none)) or (-webkit-mask-image:none){.wp-block-image.is-style-circle-mask img{-webkit-mask-image:url('data:image/svg+xml;utf8,');mask-image:url('data:image/svg+xml;utf8,');mask-mode:alpha;-webkit-mask-repeat:no-repeat;mask-repeat:no-repeat;-webkit-mask-size:contain;mask-size:contain;-webkit-mask-position:center;mask-position:center;border-radius:0}}.wp-block-image figure{margin:0} \ No newline at end of file +.wp-block-image{margin:0 0 1em}.wp-block-image img{height:auto;max-width:100%;vertical-align:bottom}.wp-block-image:not(.is-style-rounded)>a,.wp-block-image:not(.is-style-rounded) img{border-radius:inherit}.wp-block-image.aligncenter{text-align:center}.wp-block-image.alignfull img,.wp-block-image.alignwide img{height:auto;width:100%}.wp-block-image.aligncenter,.wp-block-image .aligncenter,.wp-block-image.alignleft,.wp-block-image .alignleft,.wp-block-image.alignright,.wp-block-image .alignright{display:table}.wp-block-image.aligncenter>figcaption,.wp-block-image .aligncenter>figcaption,.wp-block-image.alignleft>figcaption,.wp-block-image .alignleft>figcaption,.wp-block-image.alignright>figcaption,.wp-block-image .alignright>figcaption{display:table-caption;caption-side:bottom}.wp-block-image .alignleft{float:left;margin:.5em 1em .5em 0}.wp-block-image .alignright{float:right;margin:.5em 0 .5em 1em}.wp-block-image .aligncenter{margin-left:auto;margin-right:auto}.wp-block-image figcaption{margin-top:.5em;margin-bottom:1em}.wp-block-image.is-style-circle-mask img,.wp-block-image.is-style-rounded img,.wp-block-image .is-style-rounded img{border-radius:9999px}@supports ((-webkit-mask-image:none) or (mask-image:none)) or (-webkit-mask-image:none){.wp-block-image.is-style-circle-mask img{-webkit-mask-image:url('data:image/svg+xml;utf8,');mask-image:url('data:image/svg+xml;utf8,');mask-mode:alpha;-webkit-mask-repeat:no-repeat;mask-repeat:no-repeat;-webkit-mask-size:contain;mask-size:contain;-webkit-mask-position:center;mask-position:center;border-radius:0}}.wp-block-image figure{margin:0} \ No newline at end of file diff --git a/wp-includes/blocks/index.php b/wp-includes/blocks/index.php index 755944db03..ce5d4fde71 100644 --- a/wp-includes/blocks/index.php +++ b/wp-includes/blocks/index.php @@ -7,11 +7,23 @@ // Include files required for core blocks registration. require ABSPATH . WPINC . '/blocks/archives.php'; +require ABSPATH . WPINC . '/blocks/avatar.php'; require ABSPATH . WPINC . '/blocks/block.php'; require ABSPATH . WPINC . '/blocks/calendar.php'; require ABSPATH . WPINC . '/blocks/categories.php'; +require ABSPATH . WPINC . '/blocks/comment-author-name.php'; +require ABSPATH . WPINC . '/blocks/comment-content.php'; +require ABSPATH . WPINC . '/blocks/comment-date.php'; +require ABSPATH . WPINC . '/blocks/comment-edit-link.php'; +require ABSPATH . WPINC . '/blocks/comment-reply-link.php'; +require ABSPATH . WPINC . '/blocks/comment-template.php'; +require ABSPATH . WPINC . '/blocks/comments-pagination-next.php'; +require ABSPATH . WPINC . '/blocks/comments-pagination-numbers.php'; +require ABSPATH . WPINC . '/blocks/comments-pagination-previous.php'; +require ABSPATH . WPINC . '/blocks/comments-pagination.php'; require ABSPATH . WPINC . '/blocks/file.php'; require ABSPATH . WPINC . '/blocks/gallery.php'; +require ABSPATH . WPINC . '/blocks/home-link.php'; require ABSPATH . WPINC . '/blocks/image.php'; require ABSPATH . WPINC . '/blocks/latest-comments.php'; require ABSPATH . WPINC . '/blocks/latest-posts.php'; @@ -22,6 +34,7 @@ require ABSPATH . WPINC . '/blocks/navigation-submenu.php'; require ABSPATH . WPINC . '/blocks/navigation.php'; require ABSPATH . WPINC . '/blocks/page-list.php'; require ABSPATH . WPINC . '/blocks/pattern.php'; +require ABSPATH . WPINC . '/blocks/post-author-biography.php'; require ABSPATH . WPINC . '/blocks/post-author.php'; require ABSPATH . WPINC . '/blocks/post-comments.php'; require ABSPATH . WPINC . '/blocks/post-content.php'; @@ -32,12 +45,14 @@ require ABSPATH . WPINC . '/blocks/post-navigation-link.php'; require ABSPATH . WPINC . '/blocks/post-template.php'; require ABSPATH . WPINC . '/blocks/post-terms.php'; require ABSPATH . WPINC . '/blocks/post-title.php'; +require ABSPATH . WPINC . '/blocks/query-no-results.php'; require ABSPATH . WPINC . '/blocks/query-pagination-next.php'; require ABSPATH . WPINC . '/blocks/query-pagination-numbers.php'; require ABSPATH . WPINC . '/blocks/query-pagination-previous.php'; require ABSPATH . WPINC . '/blocks/query-pagination.php'; require ABSPATH . WPINC . '/blocks/query-title.php'; require ABSPATH . WPINC . '/blocks/query.php'; +require ABSPATH . WPINC . '/blocks/read-more.php'; require ABSPATH . WPINC . '/blocks/rss.php'; require ABSPATH . WPINC . '/blocks/search.php'; require ABSPATH . WPINC . '/blocks/shortcode.php'; diff --git a/wp-includes/blocks/latest-comments.php b/wp-includes/blocks/latest-comments.php index 3e649bbf5f..830e22ac33 100644 --- a/wp-includes/blocks/latest-comments.php +++ b/wp-includes/blocks/latest-comments.php @@ -30,7 +30,7 @@ function wp_latest_comments_draft_or_post_title( $post = 0 ) { if ( empty( $title ) ) { $title = __( '(no title)' ); } - return esc_html( $title ); + return $title; } /** diff --git a/wp-includes/blocks/latest-comments/block.json b/wp-includes/blocks/latest-comments/block.json index fa5aace648..4f8b0fbf54 100644 --- a/wp-includes/blocks/latest-comments/block.json +++ b/wp-includes/blocks/latest-comments/block.json @@ -1,4 +1,5 @@ { + "$schema": "https://schemas.wp.org/trunk/block.json", "apiVersion": 2, "name": "core/latest-comments", "title": "Latest Comments", diff --git a/wp-includes/blocks/latest-posts.php b/wp-includes/blocks/latest-posts.php index 00565cda6c..05a9d63437 100644 --- a/wp-includes/blocks/latest-posts.php +++ b/wp-includes/blocks/latest-posts.php @@ -60,6 +60,11 @@ function render_block_core_latest_posts( $attributes ) { foreach ( $recent_posts as $post ) { $post_link = esc_url( get_permalink( $post ) ); + $title = get_the_title( $post ); + + if ( ! $title ) { + $title = __( '(no title)' ); + } $list_items_markup .= '
  • '; @@ -81,30 +86,27 @@ function render_block_core_latest_posts( $attributes ) { $post, $attributes['featuredImageSizeSlug'], array( - 'style' => $image_style, + 'style' => esc_attr( $image_style ), ) ); if ( $attributes['addLinkToFeaturedImage'] ) { $featured_image = sprintf( - '%2$s', - $post_link, + '%3$s', + esc_url( $post_link ), + esc_attr( $title ), $featured_image ); } $list_items_markup .= sprintf( '
    %2$s
    ', - $image_classes, + esc_attr( $image_classes ), $featured_image ); } - $title = get_the_title( $post ); - if ( ! $title ) { - $title = __( '(no title)' ); - } $list_items_markup .= sprintf( - '%2$s', - $post_link, + '%2$s', + esc_url( $post_link ), $title ); @@ -117,7 +119,7 @@ function render_block_core_latest_posts( $attributes ) { if ( ! empty( $author_display_name ) ) { $list_items_markup .= sprintf( '
    %1$s
    ', - esc_html( $byline ) + $byline ); } } @@ -126,7 +128,7 @@ function render_block_core_latest_posts( $attributes ) { $list_items_markup .= sprintf( '', esc_attr( get_the_date( 'c', $post ) ), - esc_html( get_the_date( '', $post ) ) + get_the_date( '', $post ) ); } @@ -148,7 +150,7 @@ function render_block_core_latest_posts( $attributes ) { if ( isset( $attributes['displayPostContent'] ) && $attributes['displayPostContent'] && isset( $attributes['displayPostContentRadio'] ) && 'full_post' === $attributes['displayPostContentRadio'] ) { - $post_content = wp_kses_post( html_entity_decode( $post->post_content, ENT_QUOTES, get_option( 'blog_charset' ) ) ); + $post_content = html_entity_decode( $post->post_content, ENT_QUOTES, get_option( 'blog_charset' ) ); if ( post_password_required( $post ) ) { $post_content = __( 'This content is password protected.' ); @@ -156,7 +158,7 @@ function render_block_core_latest_posts( $attributes ) { $list_items_markup .= sprintf( '
    %1$s
    ', - $post_content + wp_kses_post( $post_content ) ); } diff --git a/wp-includes/blocks/latest-posts/block.json b/wp-includes/blocks/latest-posts/block.json index dfc69621f5..6dcffe37a6 100644 --- a/wp-includes/blocks/latest-posts/block.json +++ b/wp-includes/blocks/latest-posts/block.json @@ -1,4 +1,5 @@ { + "$schema": "https://schemas.wp.org/trunk/block.json", "apiVersion": 2, "name": "core/latest-posts", "title": "Latest Posts", diff --git a/wp-includes/blocks/latest-posts/editor-rtl.css b/wp-includes/blocks/latest-posts/editor-rtl.css index 11a1d930bf..b114be4ad6 100644 --- a/wp-includes/blocks/latest-posts/editor-rtl.css +++ b/wp-includes/blocks/latest-posts/editor-rtl.css @@ -87,4 +87,11 @@ .edit-post-visual-editor .wp-block-latest-posts.is-grid li { margin-bottom: 20px; +} + +.editor-latest-posts-image-alignment-control .components-base-control__label { + display: block; +} +.editor-latest-posts-image-alignment-control .components-toolbar { + border-radius: 2px; } \ No newline at end of file diff --git a/wp-includes/blocks/latest-posts/editor-rtl.min.css b/wp-includes/blocks/latest-posts/editor-rtl.min.css index 2ff90dba52..1af38efd6e 100644 --- a/wp-includes/blocks/latest-posts/editor-rtl.min.css +++ b/wp-includes/blocks/latest-posts/editor-rtl.min.css @@ -1 +1 @@ -.wp-block-latest-posts{padding-right:2.5em}.wp-block-latest-posts.is-grid{padding-right:0}.wp-block-latest-posts li a>div{display:inline}.edit-post-visual-editor .wp-block-latest-posts.is-grid li{margin-bottom:20px} \ No newline at end of file +.wp-block-latest-posts{padding-right:2.5em}.wp-block-latest-posts.is-grid{padding-right:0}.wp-block-latest-posts li a>div{display:inline}.edit-post-visual-editor .wp-block-latest-posts.is-grid li{margin-bottom:20px}.editor-latest-posts-image-alignment-control .components-base-control__label{display:block}.editor-latest-posts-image-alignment-control .components-toolbar{border-radius:2px} \ No newline at end of file diff --git a/wp-includes/blocks/latest-posts/editor.css b/wp-includes/blocks/latest-posts/editor.css index 4e2394d905..c549fc3ca3 100644 --- a/wp-includes/blocks/latest-posts/editor.css +++ b/wp-includes/blocks/latest-posts/editor.css @@ -87,4 +87,11 @@ .edit-post-visual-editor .wp-block-latest-posts.is-grid li { margin-bottom: 20px; +} + +.editor-latest-posts-image-alignment-control .components-base-control__label { + display: block; +} +.editor-latest-posts-image-alignment-control .components-toolbar { + border-radius: 2px; } \ No newline at end of file diff --git a/wp-includes/blocks/latest-posts/editor.min.css b/wp-includes/blocks/latest-posts/editor.min.css index 79cb52f46a..356ac1780b 100644 --- a/wp-includes/blocks/latest-posts/editor.min.css +++ b/wp-includes/blocks/latest-posts/editor.min.css @@ -1 +1 @@ -.wp-block-latest-posts{padding-left:2.5em}.wp-block-latest-posts.is-grid{padding-left:0}.wp-block-latest-posts li a>div{display:inline}.edit-post-visual-editor .wp-block-latest-posts.is-grid li{margin-bottom:20px} \ No newline at end of file +.wp-block-latest-posts{padding-left:2.5em}.wp-block-latest-posts.is-grid{padding-left:0}.wp-block-latest-posts li a>div{display:inline}.edit-post-visual-editor .wp-block-latest-posts.is-grid li{margin-bottom:20px}.editor-latest-posts-image-alignment-control .components-base-control__label{display:block}.editor-latest-posts-image-alignment-control .components-toolbar{border-radius:2px} \ No newline at end of file diff --git a/wp-includes/blocks/latest-posts/style-rtl.css b/wp-includes/blocks/latest-posts/style-rtl.css index 332c3aa65e..1457665f0f 100644 --- a/wp-includes/blocks/latest-posts/style-rtl.css +++ b/wp-includes/blocks/latest-posts/style-rtl.css @@ -157,13 +157,4 @@ .wp-block-latest-posts__featured-image.aligncenter { margin-bottom: 1em; text-align: center; -} - -.block-editor-image-alignment-control__row .components-base-control__field { - display: flex; - justify-content: space-between; - align-items: center; -} -.block-editor-image-alignment-control__row .components-base-control__field .components-base-control__label { - margin-bottom: 0; } \ No newline at end of file diff --git a/wp-includes/blocks/latest-posts/style-rtl.min.css b/wp-includes/blocks/latest-posts/style-rtl.min.css index 19a4b2ee3e..bcf72d0414 100644 --- a/wp-includes/blocks/latest-posts/style-rtl.min.css +++ b/wp-includes/blocks/latest-posts/style-rtl.min.css @@ -1 +1 @@ -.wp-block-latest-posts.alignleft{margin-right:2em}.wp-block-latest-posts.alignright{margin-left:2em}.wp-block-latest-posts.wp-block-latest-posts__list{list-style:none;padding-right:0}.wp-block-latest-posts.wp-block-latest-posts__list li{clear:both}.wp-block-latest-posts.is-grid{display:flex;flex-wrap:wrap;padding:0}.wp-block-latest-posts.is-grid li{margin:0 0 1.25em 1.25em;width:100%}@media (min-width:600px){.wp-block-latest-posts.columns-2 li{width:calc(50% - .625em)}.wp-block-latest-posts.columns-2 li:nth-child(2n){margin-left:0}.wp-block-latest-posts.columns-3 li{width:calc(33.33333% - .83333em)}.wp-block-latest-posts.columns-3 li:nth-child(3n){margin-left:0}.wp-block-latest-posts.columns-4 li{width:calc(25% - .9375em)}.wp-block-latest-posts.columns-4 li:nth-child(4n){margin-left:0}.wp-block-latest-posts.columns-5 li{width:calc(20% - 1em)}.wp-block-latest-posts.columns-5 li:nth-child(5n){margin-left:0}.wp-block-latest-posts.columns-6 li{width:calc(16.66667% - 1.04167em)}.wp-block-latest-posts.columns-6 li:nth-child(6n){margin-left:0}}.wp-block-latest-posts__post-author,.wp-block-latest-posts__post-date{display:block;font-size:.8125em}.wp-block-latest-posts__post-excerpt{margin-top:.5em;margin-bottom:1em}.wp-block-latest-posts__featured-image a{display:inline-block}.wp-block-latest-posts__featured-image img{height:auto;width:auto;max-width:100%}.wp-block-latest-posts__featured-image.alignleft{margin-right:1em}.wp-block-latest-posts__featured-image.alignright{margin-left:1em}.wp-block-latest-posts__featured-image.aligncenter{margin-bottom:1em;text-align:center}.block-editor-image-alignment-control__row .components-base-control__field{display:flex;justify-content:space-between;align-items:center}.block-editor-image-alignment-control__row .components-base-control__field .components-base-control__label{margin-bottom:0} \ No newline at end of file +.wp-block-latest-posts.alignleft{margin-right:2em}.wp-block-latest-posts.alignright{margin-left:2em}.wp-block-latest-posts.wp-block-latest-posts__list{list-style:none;padding-right:0}.wp-block-latest-posts.wp-block-latest-posts__list li{clear:both}.wp-block-latest-posts.is-grid{display:flex;flex-wrap:wrap;padding:0}.wp-block-latest-posts.is-grid li{margin:0 0 1.25em 1.25em;width:100%}@media (min-width:600px){.wp-block-latest-posts.columns-2 li{width:calc(50% - .625em)}.wp-block-latest-posts.columns-2 li:nth-child(2n){margin-left:0}.wp-block-latest-posts.columns-3 li{width:calc(33.33333% - .83333em)}.wp-block-latest-posts.columns-3 li:nth-child(3n){margin-left:0}.wp-block-latest-posts.columns-4 li{width:calc(25% - .9375em)}.wp-block-latest-posts.columns-4 li:nth-child(4n){margin-left:0}.wp-block-latest-posts.columns-5 li{width:calc(20% - 1em)}.wp-block-latest-posts.columns-5 li:nth-child(5n){margin-left:0}.wp-block-latest-posts.columns-6 li{width:calc(16.66667% - 1.04167em)}.wp-block-latest-posts.columns-6 li:nth-child(6n){margin-left:0}}.wp-block-latest-posts__post-author,.wp-block-latest-posts__post-date{display:block;font-size:.8125em}.wp-block-latest-posts__post-excerpt{margin-top:.5em;margin-bottom:1em}.wp-block-latest-posts__featured-image a{display:inline-block}.wp-block-latest-posts__featured-image img{height:auto;width:auto;max-width:100%}.wp-block-latest-posts__featured-image.alignleft{margin-right:1em}.wp-block-latest-posts__featured-image.alignright{margin-left:1em}.wp-block-latest-posts__featured-image.aligncenter{margin-bottom:1em;text-align:center} \ No newline at end of file diff --git a/wp-includes/blocks/latest-posts/style.css b/wp-includes/blocks/latest-posts/style.css index bdf99f3c5c..8ce70a257b 100644 --- a/wp-includes/blocks/latest-posts/style.css +++ b/wp-includes/blocks/latest-posts/style.css @@ -161,13 +161,4 @@ .wp-block-latest-posts__featured-image.aligncenter { margin-bottom: 1em; text-align: center; -} - -.block-editor-image-alignment-control__row .components-base-control__field { - display: flex; - justify-content: space-between; - align-items: center; -} -.block-editor-image-alignment-control__row .components-base-control__field .components-base-control__label { - margin-bottom: 0; } \ No newline at end of file diff --git a/wp-includes/blocks/latest-posts/style.min.css b/wp-includes/blocks/latest-posts/style.min.css index b69973da63..4ea10f338f 100644 --- a/wp-includes/blocks/latest-posts/style.min.css +++ b/wp-includes/blocks/latest-posts/style.min.css @@ -1 +1 @@ -.wp-block-latest-posts.alignleft{margin-right:2em}.wp-block-latest-posts.alignright{margin-left:2em}.wp-block-latest-posts.wp-block-latest-posts__list{list-style:none;padding-left:0}.wp-block-latest-posts.wp-block-latest-posts__list li{clear:both}.wp-block-latest-posts.is-grid{display:flex;flex-wrap:wrap;padding:0}.wp-block-latest-posts.is-grid li{margin:0 1.25em 1.25em 0;width:100%}@media (min-width:600px){.wp-block-latest-posts.columns-2 li{width:calc(50% - .625em)}.wp-block-latest-posts.columns-2 li:nth-child(2n){margin-right:0}.wp-block-latest-posts.columns-3 li{width:calc(33.33333% - .83333em)}.wp-block-latest-posts.columns-3 li:nth-child(3n){margin-right:0}.wp-block-latest-posts.columns-4 li{width:calc(25% - .9375em)}.wp-block-latest-posts.columns-4 li:nth-child(4n){margin-right:0}.wp-block-latest-posts.columns-5 li{width:calc(20% - 1em)}.wp-block-latest-posts.columns-5 li:nth-child(5n){margin-right:0}.wp-block-latest-posts.columns-6 li{width:calc(16.66667% - 1.04167em)}.wp-block-latest-posts.columns-6 li:nth-child(6n){margin-right:0}}.wp-block-latest-posts__post-author,.wp-block-latest-posts__post-date{display:block;font-size:.8125em}.wp-block-latest-posts__post-excerpt{margin-top:.5em;margin-bottom:1em}.wp-block-latest-posts__featured-image a{display:inline-block}.wp-block-latest-posts__featured-image img{height:auto;width:auto;max-width:100%}.wp-block-latest-posts__featured-image.alignleft{margin-right:1em}.wp-block-latest-posts__featured-image.alignright{margin-left:1em}.wp-block-latest-posts__featured-image.aligncenter{margin-bottom:1em;text-align:center}.block-editor-image-alignment-control__row .components-base-control__field{display:flex;justify-content:space-between;align-items:center}.block-editor-image-alignment-control__row .components-base-control__field .components-base-control__label{margin-bottom:0} \ No newline at end of file +.wp-block-latest-posts.alignleft{margin-right:2em}.wp-block-latest-posts.alignright{margin-left:2em}.wp-block-latest-posts.wp-block-latest-posts__list{list-style:none;padding-left:0}.wp-block-latest-posts.wp-block-latest-posts__list li{clear:both}.wp-block-latest-posts.is-grid{display:flex;flex-wrap:wrap;padding:0}.wp-block-latest-posts.is-grid li{margin:0 1.25em 1.25em 0;width:100%}@media (min-width:600px){.wp-block-latest-posts.columns-2 li{width:calc(50% - .625em)}.wp-block-latest-posts.columns-2 li:nth-child(2n){margin-right:0}.wp-block-latest-posts.columns-3 li{width:calc(33.33333% - .83333em)}.wp-block-latest-posts.columns-3 li:nth-child(3n){margin-right:0}.wp-block-latest-posts.columns-4 li{width:calc(25% - .9375em)}.wp-block-latest-posts.columns-4 li:nth-child(4n){margin-right:0}.wp-block-latest-posts.columns-5 li{width:calc(20% - 1em)}.wp-block-latest-posts.columns-5 li:nth-child(5n){margin-right:0}.wp-block-latest-posts.columns-6 li{width:calc(16.66667% - 1.04167em)}.wp-block-latest-posts.columns-6 li:nth-child(6n){margin-right:0}}.wp-block-latest-posts__post-author,.wp-block-latest-posts__post-date{display:block;font-size:.8125em}.wp-block-latest-posts__post-excerpt{margin-top:.5em;margin-bottom:1em}.wp-block-latest-posts__featured-image a{display:inline-block}.wp-block-latest-posts__featured-image img{height:auto;width:auto;max-width:100%}.wp-block-latest-posts__featured-image.alignleft{margin-right:1em}.wp-block-latest-posts__featured-image.alignright{margin-left:1em}.wp-block-latest-posts__featured-image.aligncenter{margin-bottom:1em;text-align:center} \ No newline at end of file diff --git a/wp-includes/blocks/legacy-widget.php b/wp-includes/blocks/legacy-widget.php index 0d4e733d4c..c3aa55fdfe 100644 --- a/wp-includes/blocks/legacy-widget.php +++ b/wp-includes/blocks/legacy-widget.php @@ -24,21 +24,9 @@ function render_block_core_legacy_widget( $attributes ) { return ''; } - $id_base = $attributes['idBase']; - if ( method_exists( $wp_widget_factory, 'get_widget_key' ) && method_exists( $wp_widget_factory, 'get_widget_object' ) ) { - $widget_key = $wp_widget_factory->get_widget_key( $id_base ); - $widget_object = $wp_widget_factory->get_widget_object( $id_base ); - } else { - /* - * This file is copied from the published @wordpress/widgets package when WordPress - * Core is built. Because the package is a dependency of both WordPress Core and the - * Gutenberg plugin where the block editor is developed, this fallback condition is - * required until the minimum required version of WordPress for the plugin is raised - * to 5.8. - */ - $widget_key = gutenberg_get_widget_key( $id_base ); - $widget_object = gutenberg_get_widget_object( $id_base ); - } + $id_base = $attributes['idBase']; + $widget_key = $wp_widget_factory->get_widget_key( $id_base ); + $widget_object = $wp_widget_factory->get_widget_object( $id_base ); if ( ! $widget_key || ! $widget_object ) { return ''; diff --git a/wp-includes/blocks/list-item/block.json b/wp-includes/blocks/list-item/block.json new file mode 100644 index 0000000000..ae8009feec --- /dev/null +++ b/wp-includes/blocks/list-item/block.json @@ -0,0 +1,26 @@ +{ + "$schema": "https://schemas.wp.org/trunk/block.json", + "apiVersion": 2, + "name": "core/list-item", + "title": "List item", + "category": "text", + "parent": [ "core/list" ], + "description": "Create a list item.", + "textdomain": "default", + "attributes": { + "placeholder": { + "type": "string" + }, + "content": { + "type": "string", + "source": "html", + "selector": "li", + "default": "", + "__experimentalRole": "content" + } + }, + "supports": { + "className": false, + "__experimentalSelector": "li" + } +} diff --git a/wp-includes/blocks/list/block.json b/wp-includes/blocks/list/block.json index c82710f08d..0d68dbaae5 100644 --- a/wp-includes/blocks/list/block.json +++ b/wp-includes/blocks/list/block.json @@ -1,4 +1,5 @@ { + "$schema": "https://schemas.wp.org/trunk/block.json", "apiVersion": 2, "name": "core/list", "title": "List", @@ -51,7 +52,11 @@ }, "color": { "gradients": true, - "link": true + "link": true, + "__experimentalDefaultControls": { + "background": true, + "text": true + } }, "__unstablePasteTextInline": true, "__experimentalSelector": "ol,ul", diff --git a/wp-includes/blocks/list/style-rtl.css b/wp-includes/blocks/list/style-rtl.css index ef247b64de..a5a2659fb7 100644 --- a/wp-includes/blocks/list/style-rtl.css +++ b/wp-includes/blocks/list/style-rtl.css @@ -76,7 +76,7 @@ */ ol, ul { - overflow-wrap: break-word; + box-sizing: border-box; } ol.has-background, ul.has-background { diff --git a/wp-includes/blocks/list/style-rtl.min.css b/wp-includes/blocks/list/style-rtl.min.css index dd12e339bc..d840bee9c9 100644 --- a/wp-includes/blocks/list/style-rtl.min.css +++ b/wp-includes/blocks/list/style-rtl.min.css @@ -1 +1 @@ -ol,ul{overflow-wrap:break-word}ol.has-background,ul.has-background{padding:1.25em 2.375em} \ No newline at end of file +ol,ul{box-sizing:border-box}ol.has-background,ul.has-background{padding:1.25em 2.375em} \ No newline at end of file diff --git a/wp-includes/blocks/list/style.css b/wp-includes/blocks/list/style.css index ef247b64de..a5a2659fb7 100644 --- a/wp-includes/blocks/list/style.css +++ b/wp-includes/blocks/list/style.css @@ -76,7 +76,7 @@ */ ol, ul { - overflow-wrap: break-word; + box-sizing: border-box; } ol.has-background, ul.has-background { diff --git a/wp-includes/blocks/list/style.min.css b/wp-includes/blocks/list/style.min.css index dd12e339bc..d840bee9c9 100644 --- a/wp-includes/blocks/list/style.min.css +++ b/wp-includes/blocks/list/style.min.css @@ -1 +1 @@ -ol,ul{overflow-wrap:break-word}ol.has-background,ul.has-background{padding:1.25em 2.375em} \ No newline at end of file +ol,ul{box-sizing:border-box}ol.has-background,ul.has-background{padding:1.25em 2.375em} \ No newline at end of file diff --git a/wp-includes/blocks/loginout/block.json b/wp-includes/blocks/loginout/block.json index fa4dd5883c..3db9d0040c 100644 --- a/wp-includes/blocks/loginout/block.json +++ b/wp-includes/blocks/loginout/block.json @@ -1,4 +1,5 @@ { + "$schema": "https://schemas.wp.org/trunk/block.json", "apiVersion": 2, "name": "core/loginout", "title": "Login/out", diff --git a/wp-includes/blocks/media-text/block.json b/wp-includes/blocks/media-text/block.json index 02f2c29430..b86b4ea997 100644 --- a/wp-includes/blocks/media-text/block.json +++ b/wp-includes/blocks/media-text/block.json @@ -1,4 +1,5 @@ { + "$schema": "https://schemas.wp.org/trunk/block.json", "apiVersion": 2, "name": "core/media-text", "title": "Media & Text", @@ -91,7 +92,11 @@ "html": false, "color": { "gradients": true, - "link": true + "link": true, + "__experimentalDefaultControls": { + "background": true, + "text": true + } } }, "editorStyle": "wp-block-media-text-editor", diff --git a/wp-includes/blocks/missing/block.json b/wp-includes/blocks/missing/block.json index 21212b2040..9a44caa248 100644 --- a/wp-includes/blocks/missing/block.json +++ b/wp-includes/blocks/missing/block.json @@ -1,4 +1,5 @@ { + "$schema": "https://schemas.wp.org/trunk/block.json", "apiVersion": 2, "name": "core/missing", "title": "Unsupported", diff --git a/wp-includes/blocks/more/block.json b/wp-includes/blocks/more/block.json index 8b839c806a..25f1df2377 100644 --- a/wp-includes/blocks/more/block.json +++ b/wp-includes/blocks/more/block.json @@ -1,4 +1,5 @@ { + "$schema": "https://schemas.wp.org/trunk/block.json", "apiVersion": 2, "name": "core/more", "title": "More", diff --git a/wp-includes/blocks/navigation-link.php b/wp-includes/blocks/navigation-link.php index aa6a5d57e1..507a4e2068 100644 --- a/wp-includes/blocks/navigation-link.php +++ b/wp-includes/blocks/navigation-link.php @@ -110,15 +110,15 @@ function block_core_navigation_link_build_css_font_sizes( $context ) { * @return string */ function block_core_navigation_link_render_submenu_icon() { - return ''; + return ''; } /** * Renders the `core/navigation-link` block. * - * @param array $attributes The block attributes. - * @param array $content The saved content. - * @param array $block The parsed block. + * @param array $attributes The block attributes. + * @param string $content The saved content. + * @param WP_Block $block The parsed block. * * @return string Returns the post content with the legacy widget added. */ @@ -193,37 +193,26 @@ function render_block_core_navigation_link( $attributes, $content, $block ) { ''; if ( isset( $attributes['label'] ) ) { - $html .= wp_kses( - $attributes['label'], - array( - 'code' => array(), - 'em' => array(), - 'img' => array( - 'scale' => array(), - 'class' => array(), - 'style' => array(), - 'src' => array(), - 'alt' => array(), - ), - 's' => array(), - 'span' => array( - 'style' => array(), - ), - 'strong' => array(), - ) - ); + $html .= wp_kses_post( $attributes['label'] ); } $html .= ''; + // Add description if available. + if ( ! empty( $attributes['description'] ) ) { + $html .= ''; + $html .= wp_kses_post( $attributes['description'] ); + $html .= ''; + } + + $html .= ''; + // End anchor tag content. + if ( isset( $block->context['showSubmenuIcon'] ) && $block->context['showSubmenuIcon'] && $has_submenu ) { // The submenu icon can be hidden by a CSS rule on the Navigation Block. $html .= '' . block_core_navigation_link_render_submenu_icon() . ''; } - $html .= ''; - // End anchor tag content. - if ( $has_submenu ) { $inner_blocks_html = ''; foreach ( $block->inner_blocks as $inner_block ) { diff --git a/wp-includes/blocks/navigation-link/block.json b/wp-includes/blocks/navigation-link/block.json index eac8af0cde..5ce15a970d 100644 --- a/wp-includes/blocks/navigation-link/block.json +++ b/wp-includes/blocks/navigation-link/block.json @@ -1,11 +1,10 @@ { + "$schema": "https://schemas.wp.org/trunk/block.json", "apiVersion": 2, "name": "core/navigation-link", "title": "Custom Link", "category": "design", - "parent": [ - "core/navigation" - ], + "parent": [ "core/navigation" ], "description": "Add a page, link, or another item to your navigation.", "textdomain": "default", "attributes": { @@ -53,6 +52,7 @@ "fontSize", "customFontSize", "showSubmenuIcon", + "maxNestingLevel", "style" ], "supports": { diff --git a/wp-includes/blocks/navigation-link/editor-rtl.css b/wp-includes/blocks/navigation-link/editor-rtl.css index 125b73b444..efbbbda6c7 100644 --- a/wp-includes/blocks/navigation-link/editor-rtl.css +++ b/wp-includes/blocks/navigation-link/editor-rtl.css @@ -111,6 +111,19 @@ margin-right: 16px; } +.wp-block-navigation-link__invalid-item { + color: #000; +} + +.wp-block-navigation-link__missing_text-tooltip { + position: absolute; + width: 1px; + height: 1px; + padding: 0; + margin: -1px; + overflow: hidden; +} + /** * Menu item setup state. Is shown when a menu item has no URL configured. */ diff --git a/wp-includes/blocks/navigation-link/editor-rtl.min.css b/wp-includes/blocks/navigation-link/editor-rtl.min.css index 51327eb048..54071bf74e 100644 --- a/wp-includes/blocks/navigation-link/editor-rtl.min.css +++ b/wp-includes/blocks/navigation-link/editor-rtl.min.css @@ -1 +1 @@ -.wp-block-navigation .has-child{cursor:pointer}.wp-block-navigation .has-child .wp-block-navigation__submenu-container{z-index:28}.wp-block-navigation .has-child:hover .wp-block-navigation__submenu-container{z-index:29}.wp-block-navigation .has-child.has-child-selected>.wp-block-navigation__submenu-container,.wp-block-navigation .has-child.is-selected>.wp-block-navigation__submenu-container{visibility:visible!important;opacity:1!important;min-width:200px!important;height:auto!important;width:auto!important;overflow:visible!important}.wp-block-navigation-item .wp-block-navigation-item__content{cursor:text}.wp-block-navigation-item.is-editing,.wp-block-navigation-item.is-selected{min-width:20px}.wp-block-navigation-item .block-list-appender{margin:16px 16px 16px auto}.wp-block-navigation-link__placeholder{position:relative;text-decoration:none!important;box-shadow:none!important;background-image:none!important}.wp-block-navigation-link__placeholder .wp-block-navigation-link__placeholder-text span{--wp-underline-color:var(--wp-admin-theme-color);background-image:linear-gradient(-45deg,transparent 20%,var(--wp-underline-color) 30%,var(--wp-underline-color) 36%,transparent 46%),linear-gradient(-135deg,transparent 54%,var(--wp-underline-color) 64%,var(--wp-underline-color) 70%,transparent 80%);background-position:100% 100%;background-size:6px 3px;background-repeat:repeat-x;padding-bottom:.1em}.is-dark-theme .wp-block-navigation-link__placeholder .wp-block-navigation-link__placeholder-text span{--wp-underline-color:#fff}.wp-block-navigation-link__placeholder.wp-block-navigation-item__content{cursor:pointer}.link-control-transform{border-top:1px solid #ccc;padding:0 16px 8px}.link-control-transform__subheading{font-size:11px;text-transform:uppercase;font-weight:500;color:#1e1e1e;margin-bottom:1.5em}.link-control-transform__items{display:flex;justify-content:space-between}.link-control-transform__item{flex-basis:33%;flex-direction:column;gap:8px;height:auto} \ No newline at end of file +.wp-block-navigation .has-child{cursor:pointer}.wp-block-navigation .has-child .wp-block-navigation__submenu-container{z-index:28}.wp-block-navigation .has-child:hover .wp-block-navigation__submenu-container{z-index:29}.wp-block-navigation .has-child.has-child-selected>.wp-block-navigation__submenu-container,.wp-block-navigation .has-child.is-selected>.wp-block-navigation__submenu-container{visibility:visible!important;opacity:1!important;min-width:200px!important;height:auto!important;width:auto!important;overflow:visible!important}.wp-block-navigation-item .wp-block-navigation-item__content{cursor:text}.wp-block-navigation-item.is-editing,.wp-block-navigation-item.is-selected{min-width:20px}.wp-block-navigation-item .block-list-appender{margin:16px 16px 16px auto}.wp-block-navigation-link__invalid-item{color:#000}.wp-block-navigation-link__missing_text-tooltip{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden}.wp-block-navigation-link__placeholder{position:relative;text-decoration:none!important;box-shadow:none!important;background-image:none!important}.wp-block-navigation-link__placeholder .wp-block-navigation-link__placeholder-text span{--wp-underline-color:var(--wp-admin-theme-color);background-image:linear-gradient(-45deg,transparent 20%,var(--wp-underline-color) 30%,var(--wp-underline-color) 36%,transparent 46%),linear-gradient(-135deg,transparent 54%,var(--wp-underline-color) 64%,var(--wp-underline-color) 70%,transparent 80%);background-position:100% 100%;background-size:6px 3px;background-repeat:repeat-x;padding-bottom:.1em}.is-dark-theme .wp-block-navigation-link__placeholder .wp-block-navigation-link__placeholder-text span{--wp-underline-color:#fff}.wp-block-navigation-link__placeholder.wp-block-navigation-item__content{cursor:pointer}.link-control-transform{border-top:1px solid #ccc;padding:0 16px 8px}.link-control-transform__subheading{font-size:11px;text-transform:uppercase;font-weight:500;color:#1e1e1e;margin-bottom:1.5em}.link-control-transform__items{display:flex;justify-content:space-between}.link-control-transform__item{flex-basis:33%;flex-direction:column;gap:8px;height:auto} \ No newline at end of file diff --git a/wp-includes/blocks/navigation-link/editor.css b/wp-includes/blocks/navigation-link/editor.css index 772e54e73d..4c4775612f 100644 --- a/wp-includes/blocks/navigation-link/editor.css +++ b/wp-includes/blocks/navigation-link/editor.css @@ -111,6 +111,19 @@ margin-left: 16px; } +.wp-block-navigation-link__invalid-item { + color: #000; +} + +.wp-block-navigation-link__missing_text-tooltip { + position: absolute; + width: 1px; + height: 1px; + padding: 0; + margin: -1px; + overflow: hidden; +} + /** * Menu item setup state. Is shown when a menu item has no URL configured. */ diff --git a/wp-includes/blocks/navigation-link/editor.min.css b/wp-includes/blocks/navigation-link/editor.min.css index 2a93e66d9a..7e33d60f51 100644 --- a/wp-includes/blocks/navigation-link/editor.min.css +++ b/wp-includes/blocks/navigation-link/editor.min.css @@ -1 +1 @@ -.wp-block-navigation .has-child{cursor:pointer}.wp-block-navigation .has-child .wp-block-navigation__submenu-container{z-index:28}.wp-block-navigation .has-child:hover .wp-block-navigation__submenu-container{z-index:29}.wp-block-navigation .has-child.has-child-selected>.wp-block-navigation__submenu-container,.wp-block-navigation .has-child.is-selected>.wp-block-navigation__submenu-container{visibility:visible!important;opacity:1!important;min-width:200px!important;height:auto!important;width:auto!important;overflow:visible!important}.wp-block-navigation-item .wp-block-navigation-item__content{cursor:text}.wp-block-navigation-item.is-editing,.wp-block-navigation-item.is-selected{min-width:20px}.wp-block-navigation-item .block-list-appender{margin:16px auto 16px 16px}.wp-block-navigation-link__placeholder{position:relative;text-decoration:none!important;box-shadow:none!important;background-image:none!important}.wp-block-navigation-link__placeholder .wp-block-navigation-link__placeholder-text span{--wp-underline-color:var(--wp-admin-theme-color);background-image:linear-gradient(45deg,transparent 20%,var(--wp-underline-color) 30%,var(--wp-underline-color) 36%,transparent 46%),linear-gradient(135deg,transparent 54%,var(--wp-underline-color) 64%,var(--wp-underline-color) 70%,transparent 80%);background-position:0 100%;background-size:6px 3px;background-repeat:repeat-x;padding-bottom:.1em}.is-dark-theme .wp-block-navigation-link__placeholder .wp-block-navigation-link__placeholder-text span{--wp-underline-color:#fff}.wp-block-navigation-link__placeholder.wp-block-navigation-item__content{cursor:pointer}.link-control-transform{border-top:1px solid #ccc;padding:0 16px 8px}.link-control-transform__subheading{font-size:11px;text-transform:uppercase;font-weight:500;color:#1e1e1e;margin-bottom:1.5em}.link-control-transform__items{display:flex;justify-content:space-between}.link-control-transform__item{flex-basis:33%;flex-direction:column;gap:8px;height:auto} \ No newline at end of file +.wp-block-navigation .has-child{cursor:pointer}.wp-block-navigation .has-child .wp-block-navigation__submenu-container{z-index:28}.wp-block-navigation .has-child:hover .wp-block-navigation__submenu-container{z-index:29}.wp-block-navigation .has-child.has-child-selected>.wp-block-navigation__submenu-container,.wp-block-navigation .has-child.is-selected>.wp-block-navigation__submenu-container{visibility:visible!important;opacity:1!important;min-width:200px!important;height:auto!important;width:auto!important;overflow:visible!important}.wp-block-navigation-item .wp-block-navigation-item__content{cursor:text}.wp-block-navigation-item.is-editing,.wp-block-navigation-item.is-selected{min-width:20px}.wp-block-navigation-item .block-list-appender{margin:16px auto 16px 16px}.wp-block-navigation-link__invalid-item{color:#000}.wp-block-navigation-link__missing_text-tooltip{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden}.wp-block-navigation-link__placeholder{position:relative;text-decoration:none!important;box-shadow:none!important;background-image:none!important}.wp-block-navigation-link__placeholder .wp-block-navigation-link__placeholder-text span{--wp-underline-color:var(--wp-admin-theme-color);background-image:linear-gradient(45deg,transparent 20%,var(--wp-underline-color) 30%,var(--wp-underline-color) 36%,transparent 46%),linear-gradient(135deg,transparent 54%,var(--wp-underline-color) 64%,var(--wp-underline-color) 70%,transparent 80%);background-position:0 100%;background-size:6px 3px;background-repeat:repeat-x;padding-bottom:.1em}.is-dark-theme .wp-block-navigation-link__placeholder .wp-block-navigation-link__placeholder-text span{--wp-underline-color:#fff}.wp-block-navigation-link__placeholder.wp-block-navigation-item__content{cursor:pointer}.link-control-transform{border-top:1px solid #ccc;padding:0 16px 8px}.link-control-transform__subheading{font-size:11px;text-transform:uppercase;font-weight:500;color:#1e1e1e;margin-bottom:1.5em}.link-control-transform__items{display:flex;justify-content:space-between}.link-control-transform__item{flex-basis:33%;flex-direction:column;gap:8px;height:auto} \ No newline at end of file diff --git a/wp-includes/blocks/navigation-link/style-rtl.css b/wp-includes/blocks/navigation-link/style-rtl.css index ac92f618fb..c44bb769d8 100644 --- a/wp-includes/blocks/navigation-link/style-rtl.css +++ b/wp-includes/blocks/navigation-link/style-rtl.css @@ -77,4 +77,7 @@ .wp-block-navigation .wp-block-navigation-item__label { word-break: normal; overflow-wrap: break-word; +} +.wp-block-navigation .wp-block-navigation-item__description { + display: none; } \ No newline at end of file diff --git a/wp-includes/blocks/navigation-link/style-rtl.min.css b/wp-includes/blocks/navigation-link/style-rtl.min.css index 9b800624b1..868ed6d6b3 100644 --- a/wp-includes/blocks/navigation-link/style-rtl.min.css +++ b/wp-includes/blocks/navigation-link/style-rtl.min.css @@ -1 +1 @@ -.wp-block-navigation .wp-block-navigation-item__label{word-break:normal;overflow-wrap:break-word} \ No newline at end of file +.wp-block-navigation .wp-block-navigation-item__label{word-break:normal;overflow-wrap:break-word}.wp-block-navigation .wp-block-navigation-item__description{display:none} \ No newline at end of file diff --git a/wp-includes/blocks/navigation-link/style.css b/wp-includes/blocks/navigation-link/style.css index ac92f618fb..c44bb769d8 100644 --- a/wp-includes/blocks/navigation-link/style.css +++ b/wp-includes/blocks/navigation-link/style.css @@ -77,4 +77,7 @@ .wp-block-navigation .wp-block-navigation-item__label { word-break: normal; overflow-wrap: break-word; +} +.wp-block-navigation .wp-block-navigation-item__description { + display: none; } \ No newline at end of file diff --git a/wp-includes/blocks/navigation-link/style.min.css b/wp-includes/blocks/navigation-link/style.min.css index 9b800624b1..868ed6d6b3 100644 --- a/wp-includes/blocks/navigation-link/style.min.css +++ b/wp-includes/blocks/navigation-link/style.min.css @@ -1 +1 @@ -.wp-block-navigation .wp-block-navigation-item__label{word-break:normal;overflow-wrap:break-word} \ No newline at end of file +.wp-block-navigation .wp-block-navigation-item__label{word-break:normal;overflow-wrap:break-word}.wp-block-navigation .wp-block-navigation-item__description{display:none} \ No newline at end of file diff --git a/wp-includes/blocks/navigation-submenu.php b/wp-includes/blocks/navigation-submenu.php index 0d58bc0f6f..2eba72bcbc 100644 --- a/wp-includes/blocks/navigation-submenu.php +++ b/wp-includes/blocks/navigation-submenu.php @@ -110,15 +110,15 @@ function block_core_navigation_submenu_build_css_font_sizes( $context ) { * @return string */ function block_core_navigation_submenu_render_submenu_icon() { - return ''; + return ''; } /** * Renders the `core/navigation-submenu` block. * - * @param array $attributes The block attributes. - * @param string $content The saved content. - * @param object $block The parsed block. + * @param array $attributes The block attributes. + * @param string $content The saved content. + * @param WP_Block $block The parsed block. * * @return string Returns the post content with the legacy widget added. */ @@ -167,25 +167,7 @@ function render_block_core_navigation_submenu( $attributes, $content, $block ) { $label = ''; if ( isset( $attributes['label'] ) ) { - $label .= wp_kses( - $attributes['label'], - array( - 'code' => array(), - 'em' => array(), - 'img' => array( - 'scale' => array(), - 'class' => array(), - 'style' => array(), - 'src' => array(), - 'alt' => array(), - ), - 's' => array(), - 'span' => array( - 'style' => array(), - ), - 'strong' => array(), - ) - ); + $label .= wp_kses_post( $attributes['label'] ); } $aria_label = sprintf( @@ -199,9 +181,9 @@ function render_block_core_navigation_submenu( $attributes, $content, $block ) { // If Submenus open on hover, we render an anchor tag with attributes. // If submenu icons are set to show, we also render a submenu button, so the submenu can be opened on click. if ( ! $open_on_click ) { - $item_url = isset( $attributes['url'] ) ? esc_url( $attributes['url'] ) : ''; + $item_url = isset( $attributes['url'] ) ? $attributes['url'] : ''; // Start appending HTML attributes to anchor tag. - $html .= '
  • ' . $title . ''; + $markup .= '' . $title . ''; } if ( isset( $page['children'] ) ) { if ( $is_navigation_child && $show_submenu_icons && ! $open_submenus_on_click ) { - $markup .= ''; } $markup .= '