diff --git a/core/core.libraries.yml b/core/core.libraries.yml index ee26a43989..4bdf5cb4be 100644 --- a/core/core.libraries.yml +++ b/core/core.libraries.yml @@ -913,6 +913,8 @@ drupal.dialog.off_canvas: misc/dialog/off-canvas.reset.css: {} misc/dialog/off-canvas.base.css: {} misc/dialog/off-canvas.css: {} + # Add group setting to make sure this CSS load before any jQuery UI Dialog + # CSS. misc/dialog/off-canvas.theme.css: { group: 200 } component: misc/dialog/off-canvas.motion.css: {} diff --git a/core/lib/Drupal/Core/Ajax/OpenOffCanvasDialogCommand.php b/core/lib/Drupal/Core/Ajax/OpenOffCanvasDialogCommand.php index 24663e726e..da6a26e35a 100644 --- a/core/lib/Drupal/Core/Ajax/OpenOffCanvasDialogCommand.php +++ b/core/lib/Drupal/Core/Ajax/OpenOffCanvasDialogCommand.php @@ -6,8 +6,6 @@ * Defines an AJAX command to open content in a dialog in a off-canvas dialog. * * @ingroup ajax - * - * @internal */ class OpenOffCanvasDialogCommand extends OpenDialogCommand { diff --git a/core/misc/dialog/off-canvas.base.css b/core/misc/dialog/off-canvas.base.css index 4263886b24..e43f607768 100644 --- a/core/misc/dialog/off-canvas.base.css +++ b/core/misc/dialog/off-canvas.base.css @@ -1,6 +1,6 @@ /* * @file - * Set base styles for the settings tray. + * Set base styles for the off-canvas dialog. */ /* Set some global attributes. */ diff --git a/core/misc/dialog/off-canvas.button.css b/core/misc/dialog/off-canvas.button.css index 4f7987aa7c..e37b7ac4e0 100644 --- a/core/misc/dialog/off-canvas.button.css +++ b/core/misc/dialog/off-canvas.button.css @@ -1,7 +1,7 @@ /** - * Visual styling for buttons in the off canvas tray. + * Visual styling for buttons in the off-canvas dialog. * - * See seven/css/components/buttons.css + * @see seven/css/components/buttons.css */ #drupal-off-canvas button, diff --git a/core/misc/dialog/off-canvas.css b/core/misc/dialog/off-canvas.css index d7f3258b26..2f20771614 100644 --- a/core/misc/dialog/off-canvas.css +++ b/core/misc/dialog/off-canvas.css @@ -1,8 +1,6 @@ /** * @file * CSS for off-canvas dialog. - * - * @todo Move CSS into core dialog library https://www.drupal.org/node/2784443. */ /* Position the off-canvas dialog container outside the right of the viewport. */ @@ -23,14 +21,14 @@ text-align: right; } -/* Position the dialog-off-canvas tray container outside the right of the viewport. */ +/* Position the off-canvas dialog container outside the right of the viewport. */ .ui-dialog-off-canvas { box-sizing: border-box; height: 100%; overflow: visible; } -/* Wrap the form that's inside the dialog-off-canvas tray. */ +/* Wrap the form that's inside the off-canvas dialog. */ .ui-dialog-off-canvas #drupal-off-canvas { padding: 0 20px; /* Prevent horizontal scrollbar. */ diff --git a/core/misc/dialog/off-canvas.details.css b/core/misc/dialog/off-canvas.details.css index dcac6a5b04..9495d62cd2 100644 --- a/core/misc/dialog/off-canvas.details.css +++ b/core/misc/dialog/off-canvas.details.css @@ -1,6 +1,6 @@ /** * @file - * Visual styling for summary and details in the Settings Tray module's off canvas tray. + * Visual styling for summary and details in the Settings Tray module's off-canvas dialog. */ #drupal-off-canvas details, diff --git a/core/misc/dialog/off-canvas.dropbutton.css b/core/misc/dialog/off-canvas.dropbutton.css index e467a4f341..463f334526 100644 --- a/core/misc/dialog/off-canvas.dropbutton.css +++ b/core/misc/dialog/off-canvas.dropbutton.css @@ -1,6 +1,6 @@ /** * @file - * Styles for dropbuttons in the off-canvas tray. + * Styles for dropbuttons in the off-canvas dialog. */ #drupal-off-canvas .dropbutton-wrapper, diff --git a/core/misc/dialog/off-canvas.es6.js b/core/misc/dialog/off-canvas.es6.js index 86502adf29..9273dfef5a 100644 --- a/core/misc/dialog/off-canvas.es6.js +++ b/core/misc/dialog/off-canvas.es6.js @@ -2,10 +2,6 @@ * @file * Drupal's off-canvas library. * - * @todo This functionality should extracted into a new core library or a part - * of the current drupal.dialog.ajax library. - * https://www.drupal.org/node/2784443 - * * @private */ diff --git a/core/misc/dialog/off-canvas.form.css b/core/misc/dialog/off-canvas.form.css index 8e95b78c6d..f59400a507 100644 --- a/core/misc/dialog/off-canvas.form.css +++ b/core/misc/dialog/off-canvas.form.css @@ -1,6 +1,6 @@ /** * @file - * Visual styling for forms in the Settings Tray module's off canvas tray. + * Visual styling for forms in the Settings Tray module's off-canvas dialog. */ #drupal-off-canvas form { diff --git a/core/misc/dialog/off-canvas.motion.css b/core/misc/dialog/off-canvas.motion.css index e8df8dbbd2..335bd2fe5a 100644 --- a/core/misc/dialog/off-canvas.motion.css +++ b/core/misc/dialog/off-canvas.motion.css @@ -4,10 +4,6 @@ * * Motion effects are in a separate file so that they can be easily turned off * to improve performance if desired. - * - * @todo Move motion effects file into a core Off-Canvas library and add a - * configuration option for browser rendering performance to disable this - * file: https://www.drupal.org/node/2784443. */ .dialog-off-canvas__main-canvas { diff --git a/core/misc/dialog/off-canvas.table.css b/core/misc/dialog/off-canvas.table.css index 3a6e749757..fdc889e199 100644 --- a/core/misc/dialog/off-canvas.table.css +++ b/core/misc/dialog/off-canvas.table.css @@ -1,6 +1,6 @@ /** * @file - * Visual styling for tables in the Settings Tray module's off canvas tray. + * Visual styling for tables in the Settings Tray module's off-canvas dialog. */ #drupal-off-canvas table * { diff --git a/core/misc/dialog/off-canvas.tabledrag.css b/core/misc/dialog/off-canvas.tabledrag.css index 4f6f9bee5e..02e757e0cd 100644 --- a/core/misc/dialog/off-canvas.tabledrag.css +++ b/core/misc/dialog/off-canvas.tabledrag.css @@ -1,6 +1,6 @@ /** * @file - * Table drag behavior for Settings Tray module. + * Table drag behavior for off-canvas dialog. * * @see tabledrag.js */ diff --git a/core/misc/dialog/off-canvas.theme.css b/core/misc/dialog/off-canvas.theme.css index 47bdcfbbcf..2004acb803 100644 --- a/core/misc/dialog/off-canvas.theme.css +++ b/core/misc/dialog/off-canvas.theme.css @@ -10,7 +10,7 @@ z-index: 501; } -/* Style the tray header. */ +/* Style the off-canvas dialog header. */ .ui-dialog.ui-dialog-off-canvas .ui-dialog-titlebar { padding: 1em; background: #2d2d2d; diff --git a/core/modules/system/templates/off-canvas-page-wrapper.html.twig b/core/modules/system/templates/off-canvas-page-wrapper.html.twig index 550da57ecb..f448bfde75 100644 --- a/core/modules/system/templates/off-canvas-page-wrapper.html.twig +++ b/core/modules/system/templates/off-canvas-page-wrapper.html.twig @@ -5,10 +5,10 @@ * * For consistent wrapping to {{ page }} render in all themes. The * "data-off-canvas-main-canvas" attribute is required by the off-canvas dialog. - * This is used by the outside_in/drupal.off_canvas library to select the + * This is used by the core/drupal.off_canvas library to select the * "main canvas" page element as opposed to the "off canvas" which is the tray * itself. The "main canvas" element must be resized according to the width of - * the "off canvas" tray so that no portion of the "main canvas" is obstructed + * the "off canvas" dialog so that no portion of the "main canvas" is obstructed * by the tray. The tray can vary in width when opened and can be resized by the * user. The "data-off-canvas-main-canvas" attribute cannot be removed without * breaking the off-canvas dialog functionality. diff --git a/core/themes/stable/css/core/dialog/off-canvas.button.css b/core/themes/stable/css/core/dialog/off-canvas.button.css index 4f7987aa7c..cfe1dd9869 100644 --- a/core/themes/stable/css/core/dialog/off-canvas.button.css +++ b/core/themes/stable/css/core/dialog/off-canvas.button.css @@ -1,5 +1,5 @@ /** - * Visual styling for buttons in the off canvas tray. + * Visual styling for buttons in the off-canvas dialog. * * See seven/css/components/buttons.css */ diff --git a/core/themes/stable/css/core/dialog/off-canvas.css b/core/themes/stable/css/core/dialog/off-canvas.css index d7f3258b26..2f20771614 100644 --- a/core/themes/stable/css/core/dialog/off-canvas.css +++ b/core/themes/stable/css/core/dialog/off-canvas.css @@ -1,8 +1,6 @@ /** * @file * CSS for off-canvas dialog. - * - * @todo Move CSS into core dialog library https://www.drupal.org/node/2784443. */ /* Position the off-canvas dialog container outside the right of the viewport. */ @@ -23,14 +21,14 @@ text-align: right; } -/* Position the dialog-off-canvas tray container outside the right of the viewport. */ +/* Position the off-canvas dialog container outside the right of the viewport. */ .ui-dialog-off-canvas { box-sizing: border-box; height: 100%; overflow: visible; } -/* Wrap the form that's inside the dialog-off-canvas tray. */ +/* Wrap the form that's inside the off-canvas dialog. */ .ui-dialog-off-canvas #drupal-off-canvas { padding: 0 20px; /* Prevent horizontal scrollbar. */ diff --git a/core/themes/stable/css/core/dialog/off-canvas.details.css b/core/themes/stable/css/core/dialog/off-canvas.details.css index dcac6a5b04..9495d62cd2 100644 --- a/core/themes/stable/css/core/dialog/off-canvas.details.css +++ b/core/themes/stable/css/core/dialog/off-canvas.details.css @@ -1,6 +1,6 @@ /** * @file - * Visual styling for summary and details in the Settings Tray module's off canvas tray. + * Visual styling for summary and details in the Settings Tray module's off-canvas dialog. */ #drupal-off-canvas details, diff --git a/core/themes/stable/css/core/dialog/off-canvas.dropbutton.css b/core/themes/stable/css/core/dialog/off-canvas.dropbutton.css index e467a4f341..463f334526 100644 --- a/core/themes/stable/css/core/dialog/off-canvas.dropbutton.css +++ b/core/themes/stable/css/core/dialog/off-canvas.dropbutton.css @@ -1,6 +1,6 @@ /** * @file - * Styles for dropbuttons in the off-canvas tray. + * Styles for dropbuttons in the off-canvas dialog. */ #drupal-off-canvas .dropbutton-wrapper, diff --git a/core/themes/stable/css/core/dialog/off-canvas.form.css b/core/themes/stable/css/core/dialog/off-canvas.form.css index 8e95b78c6d..f59400a507 100644 --- a/core/themes/stable/css/core/dialog/off-canvas.form.css +++ b/core/themes/stable/css/core/dialog/off-canvas.form.css @@ -1,6 +1,6 @@ /** * @file - * Visual styling for forms in the Settings Tray module's off canvas tray. + * Visual styling for forms in the Settings Tray module's off-canvas dialog. */ #drupal-off-canvas form { diff --git a/core/themes/stable/css/core/dialog/off-canvas.motion.css b/core/themes/stable/css/core/dialog/off-canvas.motion.css index e8df8dbbd2..335bd2fe5a 100644 --- a/core/themes/stable/css/core/dialog/off-canvas.motion.css +++ b/core/themes/stable/css/core/dialog/off-canvas.motion.css @@ -4,10 +4,6 @@ * * Motion effects are in a separate file so that they can be easily turned off * to improve performance if desired. - * - * @todo Move motion effects file into a core Off-Canvas library and add a - * configuration option for browser rendering performance to disable this - * file: https://www.drupal.org/node/2784443. */ .dialog-off-canvas__main-canvas { diff --git a/core/themes/stable/css/core/dialog/off-canvas.table.css b/core/themes/stable/css/core/dialog/off-canvas.table.css index 3a6e749757..fdc889e199 100644 --- a/core/themes/stable/css/core/dialog/off-canvas.table.css +++ b/core/themes/stable/css/core/dialog/off-canvas.table.css @@ -1,6 +1,6 @@ /** * @file - * Visual styling for tables in the Settings Tray module's off canvas tray. + * Visual styling for tables in the Settings Tray module's off-canvas dialog. */ #drupal-off-canvas table * { diff --git a/core/themes/stable/css/core/dialog/off-canvas.tabledrag.css b/core/themes/stable/css/core/dialog/off-canvas.tabledrag.css index 4f6f9bee5e..02e757e0cd 100644 --- a/core/themes/stable/css/core/dialog/off-canvas.tabledrag.css +++ b/core/themes/stable/css/core/dialog/off-canvas.tabledrag.css @@ -1,6 +1,6 @@ /** * @file - * Table drag behavior for Settings Tray module. + * Table drag behavior for off-canvas dialog. * * @see tabledrag.js */ diff --git a/core/themes/stable/css/core/dialog/off-canvas.theme.css b/core/themes/stable/css/core/dialog/off-canvas.theme.css index 47bdcfbbcf..2004acb803 100644 --- a/core/themes/stable/css/core/dialog/off-canvas.theme.css +++ b/core/themes/stable/css/core/dialog/off-canvas.theme.css @@ -10,7 +10,7 @@ z-index: 501; } -/* Style the tray header. */ +/* Style the off-canvas dialog header. */ .ui-dialog.ui-dialog-off-canvas .ui-dialog-titlebar { padding: 1em; background: #2d2d2d; diff --git a/core/themes/stable/templates/content/off-canvas-page-wrapper.html.twig b/core/themes/stable/templates/content/off-canvas-page-wrapper.html.twig index 83a67f4b1e..690371e6de 100644 --- a/core/themes/stable/templates/content/off-canvas-page-wrapper.html.twig +++ b/core/themes/stable/templates/content/off-canvas-page-wrapper.html.twig @@ -5,10 +5,10 @@ * * For consistent wrapping to {{ page }} render in all themes. The * "data-off-canvas-main-canvas" attribute is required by the off-canvas dialog. - * This is used by the outside_in/drupal.off_canvas library to select the + * This is used by the core/drupal.off_canvas library to select the * "main canvas" page element as opposed to the "off canvas" which is the tray * itself. The "main canvas" element must be resized according to the width of - * the "off canvas" tray so that no portion of the "main canvas" is obstructed + * the "off canvas" dialog so that no portion of the "main canvas" is obstructed * by the tray. The tray can vary in width when opened and can be resized by the * user. The "data-off-canvas-main-canvas" attribute cannot be removed without * breaking the off-canvas dialog functionality.