diff --git a/core/core.libraries.yml b/core/core.libraries.yml index 01becf613e..1bb0ab5326 100644 --- a/core/core.libraries.yml +++ b/core/core.libraries.yml @@ -910,18 +910,18 @@ drupal.dialog.off_canvas: misc/dialog/off-canvas.js: {} css: base: - misc/dialog/css/off-canvas.reset.css: {} - misc/dialog/css/off-canvas.base.css: {} - misc/dialog/css/off-canvas.css: {} - misc/dialog/css/off-canvas.theme.css: { group: 200 } + misc/dialog/off-canvas.reset.css: {} + misc/dialog/off-canvas.base.css: {} + misc/dialog/off-canvas.css: {} + misc/dialog/off-canvas.theme.css: { group: 200 } component: - misc/dialog/css/off-canvas.motion.css: {} - misc/dialog/css/off-canvas.button.css: {} - misc/dialog/css/off-canvas.form.css: {} - misc/dialog/css/off-canvas.table.css: {} - misc/dialog/css/off-canvas.details.css: {} - misc/dialog/css/off-canvas.tabledrag.css: {} - misc/dialog/css/off-canvas.dropbutton.css: {} + misc/dialog/off-canvas.motion.css: {} + misc/dialog/off-canvas.button.css: {} + misc/dialog/off-canvas.form.css: {} + misc/dialog/off-canvas.table.css: {} + misc/dialog/off-canvas.details.css: {} + misc/dialog/off-canvas.tabledrag.css: {} + misc/dialog/off-canvas.dropbutton.css: {} dependencies: - core/jquery diff --git a/core/misc/dialog/css/off-canvas.base.css b/core/misc/dialog/off-canvas.base.css similarity index 100% rename from core/misc/dialog/css/off-canvas.base.css rename to core/misc/dialog/off-canvas.base.css diff --git a/core/misc/dialog/css/off-canvas.button.css b/core/misc/dialog/off-canvas.button.css similarity index 100% rename from core/misc/dialog/css/off-canvas.button.css rename to core/misc/dialog/off-canvas.button.css diff --git a/core/misc/dialog/css/off-canvas.css b/core/misc/dialog/off-canvas.css similarity index 100% rename from core/misc/dialog/css/off-canvas.css rename to core/misc/dialog/off-canvas.css diff --git a/core/misc/dialog/css/off-canvas.details.css b/core/misc/dialog/off-canvas.details.css similarity index 100% rename from core/misc/dialog/css/off-canvas.details.css rename to core/misc/dialog/off-canvas.details.css diff --git a/core/misc/dialog/css/off-canvas.dropbutton.css b/core/misc/dialog/off-canvas.dropbutton.css similarity index 100% rename from core/misc/dialog/css/off-canvas.dropbutton.css rename to core/misc/dialog/off-canvas.dropbutton.css diff --git a/core/misc/dialog/css/off-canvas.form.css b/core/misc/dialog/off-canvas.form.css similarity index 100% rename from core/misc/dialog/css/off-canvas.form.css rename to core/misc/dialog/off-canvas.form.css diff --git a/core/misc/dialog/css/off-canvas.reset.css b/core/misc/dialog/off-canvas.reset.css similarity index 100% rename from core/misc/dialog/css/off-canvas.reset.css rename to core/misc/dialog/off-canvas.reset.css diff --git a/core/misc/dialog/css/off-canvas.table.css b/core/misc/dialog/off-canvas.table.css similarity index 100% rename from core/misc/dialog/css/off-canvas.table.css rename to core/misc/dialog/off-canvas.table.css diff --git a/core/misc/dialog/css/off-canvas.tabledrag.css b/core/misc/dialog/off-canvas.tabledrag.css similarity index 100% rename from core/misc/dialog/css/off-canvas.tabledrag.css rename to core/misc/dialog/off-canvas.tabledrag.css diff --git a/core/misc/dialog/css/off-canvas.theme.css b/core/misc/dialog/off-canvas.theme.css similarity index 100% rename from core/misc/dialog/css/off-canvas.theme.css rename to core/misc/dialog/off-canvas.theme.css diff --git a/core/modules/outside_in/templates/outside-in-page-wrapper.html.twig b/core/modules/system/templates/off-canvas-page-wrapper.html.twig similarity index 100% rename from core/modules/outside_in/templates/outside-in-page-wrapper.html.twig rename to core/modules/system/templates/off-canvas-page-wrapper.html.twig diff --git a/core/themes/stable/templates/layout/off-canvas-page-wrapper.html.twig b/core/themes/stable/templates/layout/off-canvas-page-wrapper.html.twig new file mode 100644 index 0000000000..8ed6ad27a4 --- /dev/null +++ b/core/themes/stable/templates/layout/off-canvas-page-wrapper.html.twig @@ -0,0 +1,20 @@ +{# +/** + * @file + * Theme override for a page wrapper. + * + * For consistent wrapping to {{ page }} render in all themes. The + * "data-off-canvas-main-canvas" attribute is required by the off-canvas dialog. + * It cannot be removed without breaking the off-canvas dialog functionality. + * + * Available variables: + * - children: Contains the child elements of the page. + * + * @ingroup themeable + */ +#} +{% if children %} +
+ {{ children }} +
+{% endif %}