diff --git a/core/profiles/demo_umami/themes/umami/README.txt b/core/profiles/demo_umami/themes/umami/README.txt index f141fe9060..ccb9ca25f2 100644 --- a/core/profiles/demo_umami/themes/umami/README.txt +++ b/core/profiles/demo_umami/themes/umami/README.txt @@ -2,7 +2,6 @@ ABOUT UMAMI ----------- Umami is the theme used for the "Umami food magazine" demonstration site. -The Umami theme uses Classy as its base theme. ABOUT DRUPAL THEMING -------------------- diff --git a/core/profiles/demo_umami/themes/umami/css/classy/README.txt b/core/profiles/demo_umami/themes/umami/css/classy/README.txt index 42514f5f0c..edcff5ace9 100644 --- a/core/profiles/demo_umami/themes/umami/css/classy/README.txt +++ b/core/profiles/demo_umami/themes/umami/css/classy/README.txt @@ -2,11 +2,7 @@ WHAT IS THIS DIRECTORY FOR? -------------------------------- This directory is for CSS files previously inherited from the Classy theme. -WHY ARE CLASSY CSS FILES BEING COPIED HERE? +WHY WERE CLASSY CSS FILES COPIED HERE? ------------------------------------------- -Classy will be deprecated during the Drupal 9 lifecycle. To prepare for Classy's -removal, CSS files that would otherwise be inherited from Classy are copied -here. - -CSS files that differ from the Classy versions should not be placed in this -directory or any subdirectory. +Classy was removed in Drupal 10. To prepare for Classy's removal, CSS files that + would otherwise be inherited from Classy were copied here. diff --git a/core/profiles/demo_umami/themes/umami/css/classy/components/ui-dialog.css b/core/profiles/demo_umami/themes/umami/css/classy/components/ui-dialog.css index 476c21ffdb..164ca86b8f 100644 --- a/core/profiles/demo_umami/themes/umami/css/classy/components/ui-dialog.css +++ b/core/profiles/demo_umami/themes/umami/css/classy/components/ui-dialog.css @@ -1,6 +1,6 @@ /** * @file - * Styles for Classy's modal windows. + * Styles for modal windows. */ .ui-dialog--narrow { diff --git a/core/profiles/demo_umami/themes/umami/css/components/fields/field.css b/core/profiles/demo_umami/themes/umami/css/components/fields/field.css index 028a4987ad..77a79ac047 100644 --- a/core/profiles/demo_umami/themes/umami/css/components/fields/field.css +++ b/core/profiles/demo_umami/themes/umami/css/components/fields/field.css @@ -10,6 +10,6 @@ .field--label-inline .field__label, .field--label-inline .field__items { - /* Undo use of floats by classy, switch to flexbox */ + /* Undo use of floats by base styles, switch to flexbox */ float: none; } diff --git a/core/profiles/demo_umami/themes/umami/images/classy/README.txt b/core/profiles/demo_umami/themes/umami/images/classy/README.txt index 9df44f55ec..31904ffea4 100644 --- a/core/profiles/demo_umami/themes/umami/images/classy/README.txt +++ b/core/profiles/demo_umami/themes/umami/images/classy/README.txt @@ -2,11 +2,7 @@ WHAT IS THIS DIRECTORY FOR? -------------------------------- This directory is for image files previously inherited from the Classy theme. -WHY ARE CLASSY IMAGE FILES BEING COPIED HERE? +WHY WERE CLASSY IMAGE FILES COPIED HERE? ------------------------------------------- -Classy will be deprecated during the Drupal 9 lifecycle. To prepare for Classy's -removal, image files that would otherwise be inherited from Classy are copied -here. - -Image files that differ from the Classy versions should not be placed in this -directory or any subdirectory. +Classy was removed in Drupal 10. To prepare for Classy's removal, image files +that would otherwise be inherited from Classy were copied here. diff --git a/core/profiles/demo_umami/themes/umami/js/classy/README.txt b/core/profiles/demo_umami/themes/umami/js/classy/README.txt index efa01cfd10..a370e72477 100644 --- a/core/profiles/demo_umami/themes/umami/js/classy/README.txt +++ b/core/profiles/demo_umami/themes/umami/js/classy/README.txt @@ -2,11 +2,7 @@ WHAT IS THIS DIRECTORY FOR? -------------------------------- This directory is for JS files previously inherited from the Classy theme. -WHY ARE CLASSY JS FILES BEING COPIED HERE? +WHY WERE CLASSY JS FILES COPIED HERE? ------------------------------------------- -Classy will be deprecated during the Drupal 9 lifecycle. To prepare for Classy's -removal, JS files that would otherwise be inherited from Classy are copied -here. - -JS files that differ from the Classy versions should not be placed in this -directory or any subdirectory. +Classy was removed in Drupal 10. To prepare for Classy's removal, JS files that +would otherwise be inherited from Classy were copied here. diff --git a/core/profiles/demo_umami/themes/umami/js/classy/media_embed_ckeditor.theme.es6.js b/core/profiles/demo_umami/themes/umami/js/classy/media_embed_ckeditor.theme.es6.js index a33d18ffcd..a5ba742c50 100644 --- a/core/profiles/demo_umami/themes/umami/js/classy/media_embed_ckeditor.theme.es6.js +++ b/core/profiles/demo_umami/themes/umami/js/classy/media_embed_ckeditor.theme.es6.js @@ -1,6 +1,6 @@ /** * @file - * Classy theme overrides for the Media Embed CKEditor plugin. + *Theme overrides for the Media Embed CKEditor plugin. */ ((Drupal) => { diff --git a/core/profiles/demo_umami/themes/umami/templates/classy/README.txt b/core/profiles/demo_umami/themes/umami/templates/classy/README.txt index 8708a82e74..f3656d2871 100644 --- a/core/profiles/demo_umami/themes/umami/templates/classy/README.txt +++ b/core/profiles/demo_umami/themes/umami/templates/classy/README.txt @@ -2,11 +2,7 @@ WHAT IS THIS DIRECTORY FOR? -------------------------------- This directory is for templates previously inherited from the Classy theme. -WHY ARE CLASSY TEMPLATES BEING COPIED HERE? +WHY WERE CLASSY TEMPLATES COPIED HERE? ------------------------------------------- -Classy will be deprecated during the Drupal 9 lifecycle. To prepare for Classy's -removal, templates that would otherwise be inherited from Classy are copied -here. - -Templates that differ from the Classy versions should not be placed in this -directory or any subdirectory. +Classy was removed in Drupal 10. To prepare for Classy's removal, templates that +would otherwise be inherited from Classy are copied here. diff --git a/core/themes/claro/css/classy/README.txt b/core/themes/claro/css/classy/README.txt index 42514f5f0c..08c8a03177 100644 --- a/core/themes/claro/css/classy/README.txt +++ b/core/themes/claro/css/classy/README.txt @@ -2,11 +2,8 @@ WHAT IS THIS DIRECTORY FOR? -------------------------------- This directory is for CSS files previously inherited from the Classy theme. -WHY ARE CLASSY CSS FILES BEING COPIED HERE? +WHY WERE CLASSY CSS FILES COPIED HERE? ------------------------------------------- -Classy will be deprecated during the Drupal 9 lifecycle. To prepare for Classy's -removal, CSS files that would otherwise be inherited from Classy are copied -here. +Classy was removed in Drupal 10. To prepare for Classy's removal, CSS files that + would otherwise be inherited from Classy were copied here. -CSS files that differ from the Classy versions should not be placed in this -directory or any subdirectory. diff --git a/core/themes/claro/css/classy/components/ui-dialog.css b/core/themes/claro/css/classy/components/ui-dialog.css index 476c21ffdb..164ca86b8f 100644 --- a/core/themes/claro/css/classy/components/ui-dialog.css +++ b/core/themes/claro/css/classy/components/ui-dialog.css @@ -1,6 +1,6 @@ /** * @file - * Styles for Classy's modal windows. + * Styles for modal windows. */ .ui-dialog--narrow { diff --git a/core/themes/claro/css/components/form.pcss.css b/core/themes/claro/css/components/form.pcss.css index 8935516752..3cb9da5bf9 100644 --- a/core/themes/claro/css/components/form.pcss.css +++ b/core/themes/claro/css/components/form.pcss.css @@ -22,7 +22,7 @@ /** * When a table row or a container-inline has a single form item, prevent it * from adding unnecessary extra spacing. - * If it has multiple form items, allow spacing between them, overriding Classy. + * If it has multiple form items, allow spacing between them, overriding core. */ tr .form-item, .container-inline .form-item { diff --git a/core/themes/claro/css/components/tableselect.pcss.css b/core/themes/claro/css/components/tableselect.pcss.css index 1f6a644764..1d633fba29 100644 --- a/core/themes/claro/css/components/tableselect.pcss.css +++ b/core/themes/claro/css/components/tableselect.pcss.css @@ -1,6 +1,6 @@ /** * @file - * Table select — replaces implementation of Classy theme. + * Table select — replaces core implementation. * * @see tableselect.js */ diff --git a/core/themes/claro/images/classy/README.txt b/core/themes/claro/images/classy/README.txt index 9df44f55ec..31904ffea4 100644 --- a/core/themes/claro/images/classy/README.txt +++ b/core/themes/claro/images/classy/README.txt @@ -2,11 +2,7 @@ WHAT IS THIS DIRECTORY FOR? -------------------------------- This directory is for image files previously inherited from the Classy theme. -WHY ARE CLASSY IMAGE FILES BEING COPIED HERE? +WHY WERE CLASSY IMAGE FILES COPIED HERE? ------------------------------------------- -Classy will be deprecated during the Drupal 9 lifecycle. To prepare for Classy's -removal, image files that would otherwise be inherited from Classy are copied -here. - -Image files that differ from the Classy versions should not be placed in this -directory or any subdirectory. +Classy was removed in Drupal 10. To prepare for Classy's removal, image files +that would otherwise be inherited from Classy were copied here. diff --git a/core/themes/claro/js/classy/README.txt b/core/themes/claro/js/classy/README.txt index efa01cfd10..a370e72477 100644 --- a/core/themes/claro/js/classy/README.txt +++ b/core/themes/claro/js/classy/README.txt @@ -2,11 +2,7 @@ WHAT IS THIS DIRECTORY FOR? -------------------------------- This directory is for JS files previously inherited from the Classy theme. -WHY ARE CLASSY JS FILES BEING COPIED HERE? +WHY WERE CLASSY JS FILES COPIED HERE? ------------------------------------------- -Classy will be deprecated during the Drupal 9 lifecycle. To prepare for Classy's -removal, JS files that would otherwise be inherited from Classy are copied -here. - -JS files that differ from the Classy versions should not be placed in this -directory or any subdirectory. +Classy was removed in Drupal 10. To prepare for Classy's removal, JS files that +would otherwise be inherited from Classy were copied here. diff --git a/core/themes/claro/js/classy/media_embed_ckeditor.theme.es6.js b/core/themes/claro/js/classy/media_embed_ckeditor.theme.es6.js index a33d18ffcd..3a6b787693 100644 --- a/core/themes/claro/js/classy/media_embed_ckeditor.theme.es6.js +++ b/core/themes/claro/js/classy/media_embed_ckeditor.theme.es6.js @@ -1,6 +1,7 @@ /** * @file - * Classy theme overrides for the Media Embed CKEditor plugin. + * Theme overrides for the Media Embed CKEditor plugin previously provided by + * the now-removed Classy theme. */ ((Drupal) => { diff --git a/core/themes/claro/templates/classy/README.txt b/core/themes/claro/templates/classy/README.txt index 8708a82e74..f3656d2871 100644 --- a/core/themes/claro/templates/classy/README.txt +++ b/core/themes/claro/templates/classy/README.txt @@ -2,11 +2,7 @@ WHAT IS THIS DIRECTORY FOR? -------------------------------- This directory is for templates previously inherited from the Classy theme. -WHY ARE CLASSY TEMPLATES BEING COPIED HERE? +WHY WERE CLASSY TEMPLATES COPIED HERE? ------------------------------------------- -Classy will be deprecated during the Drupal 9 lifecycle. To prepare for Classy's -removal, templates that would otherwise be inherited from Classy are copied -here. - -Templates that differ from the Classy versions should not be placed in this -directory or any subdirectory. +Classy was removed in Drupal 10. To prepare for Classy's removal, templates that +would otherwise be inherited from Classy are copied here. diff --git a/core/themes/olivero/css/components/form.pcss.css b/core/themes/olivero/css/components/form.pcss.css index b5379d8a5e..b4228533a4 100644 --- a/core/themes/olivero/css/components/form.pcss.css +++ b/core/themes/olivero/css/components/form.pcss.css @@ -26,7 +26,7 @@ /** * When a table row or a container-inline has a single form item, prevent it * from adding unnecessary extra spacing. - * If it has multiple form items, allow spacing between them, overriding Classy. + * If it has multiple form items, allow spacing between them, overriding core. */ tr .form-item, .container-inline .form-item { diff --git a/core/themes/olivero/templates/block/block--search-form-block.html.twig b/core/themes/olivero/templates/block/block--search-form-block.html.twig index c779a6a0cc..c9e10583f1 100644 --- a/core/themes/olivero/templates/block/block--search-form-block.html.twig +++ b/core/themes/olivero/templates/block/block--search-form-block.html.twig @@ -1,8 +1,7 @@ {# /** * @file - * Olivero's theme implementation for a search form block. Based on Classy's - * search form block template. + * Olivero's theme implementation for a search form block. * * Available variables: * - content: The content of this block. diff --git a/core/themes/starterkit_theme/css/components/image-widget.css b/core/themes/starterkit_theme/css/components/image-widget.css index d0594afe4a..72e52a2f4e 100644 --- a/core/themes/starterkit_theme/css/components/image-widget.css +++ b/core/themes/starterkit_theme/css/components/image-widget.css @@ -1,12 +1,6 @@ /** * @file * Image upload widget. - * - * This CSS file is not used in this theme (Classy). It was intended to be used, - * but due to a bug, Drupal 8 shipped with it not being used. To not break - * backwards compatibility, we continue to not load it in Classy. Every - * subtheme of Classy is encouraged to use it, by attaching the - * classy/image-widget asset library in their image-widget.html.twig file. */ .image-preview {