diff --git a/core/modules/outside_in/outside_in.libraries.yml.orig b/core/modules/outside_in/outside_in.libraries.yml.orig deleted file mode 100644 index 06e24a8291..0000000000 --- a/core/modules/outside_in/outside_in.libraries.yml.orig +++ /dev/null @@ -1,45 +0,0 @@ -drupal.outside_in: - version: VERSION - js: - js/outside_in.js: {} - css: - component: - css/outside_in.module.css: {} - css/outside_in.motion.css: {} - css/outside_in.toolbar.css: {} - theme: - # @todo Set the group higher than CSS_AGGREGATE_THEME so that it overrides - # both jQuery UI and Classy's dialog.css, remove in - # https://www.drupal.org/node/1945262. - css/outside_in.theme.css: { group: 200 } - dependencies: - - core/jquery - - core/drupal - - core/jquery.once - - core/drupal.ajax -drupal.off_canvas: - version: VERSION - js: - js/off-canvas.js: {} - css: - base: - css/off-canvas.reset.css: {} - css/off-canvas.base.css: {} - css/off-canvas.css: {} - css/off-canvas.theme.css: { group: 200 } - component: - css/off-canvas.motion.css: {} - css/off-canvas.button.css: {} - css/off-canvas.form.css: {} - css/off-canvas.table.css: {} - css/off-canvas.details.css: {} - css/off-canvas.tabledrag.css: {} - css/off-canvas.dropbutton.css: {} - - dependencies: - - core/jquery - - core/drupal - - core/drupal.ajax - - core/drupal.announce - - core/drupal.dialog - - core/drupal.dialog.ajax diff --git a/core/modules/outside_in/outside_in.libraries.yml.rej b/core/modules/outside_in/outside_in.libraries.yml.rej deleted file mode 100644 index 1d071b93c7..0000000000 --- a/core/modules/outside_in/outside_in.libraries.yml.rej +++ /dev/null @@ -1,20 +0,0 @@ -*************** -*** 20,33 **** - - core/drupal - - core/jquery.once - - core/drupal.ajax -- drupal.off_canvas: -- version: VERSION -- js: -- js/off-canvas.js: {} -- dependencies: -- - core/jquery -- - core/drupal -- - core/drupal.ajax -- - core/drupal.announce -- - core/drupal.dialog -- - core/drupal.dialog.ajax ---- 20,22 ---- - - core/drupal - - core/jquery.once - - core/drupal.ajax diff --git a/core/themes/stable/stable.info.yml b/core/themes/stable/stable.info.yml index 3735ae19a9..1e437f9d4c 100644 --- a/core/themes/stable/stable.info.yml +++ b/core/themes/stable/stable.info.yml @@ -60,18 +60,18 @@ libraries-override: core/drupal.dialog.off_canvas: css: base: - misc/dialog/css/off-canvas.reset.css: css/core/dialog/off-canvas.reset.css - misc/dialog/css/off-canvas.base.css: css/core/dialog/off-canvas.base.css - misc/dialog/css/off-canvas.css: css/core/dialog/off-canvas.css - misc/dialog/css/off-canvas.theme.css: css/core/dialog/off-canvas.theme.css + misc/dialog/off-canvas.reset.css: css/core/dialog/off-canvas.reset.css + misc/dialog/off-canvas.base.css: css/core/dialog/off-canvas.base.css + misc/dialog/off-canvas.css: css/core/dialog/off-canvas.css + misc/dialog/off-canvas.theme.css: css/core/dialog/off-canvas.theme.css component: - misc/dialog/css/off-canvas.motion.css: css/core/dialog/off-canvas.motion.css - misc/dialog/css/off-canvas.button.css: css/core/dialog/off-canvas.button.css - misc/dialog/css/off-canvas.form.css: css/core/dialog/off-canvas.form.css - misc/dialog/css/off-canvas.table.css: css/core/dialog/off-canvas.table.css - misc/dialog/css/off-canvas.details.css: css/core/dialog/off-canvas.details.css - misc/dialog/css/off-canvas.tabledrag.css: css/core/dialog/off-canvas.tabledrag.css - misc/dialog/css/off-canvas.dropbutton.css: css/core/dialog/off-canvas.dropbutton.css + misc/dialog/off-canvas.motion.css: css/core/dialog/off-canvas.motion.css + misc/dialog/off-canvas.button.css: css/core/dialog/off-canvas.button.css + misc/dialog/off-canvas.form.css: css/core/dialog/off-canvas.form.css + misc/dialog/off-canvas.table.css: css/core/dialog/off-canvas.table.css + misc/dialog/off-canvas.details.css: css/core/dialog/off-canvas.details.css + misc/dialog/off-canvas.tabledrag.css: css/core/dialog/off-canvas.tabledrag.css + misc/dialog/off-canvas.dropbutton.css: css/core/dialog/off-canvas.dropbutton.css core/drupal.dropbutton: css: