Merge branch 'hotfix-2032' into live

USEPA · Feb 16, 2023 · f479fb8 · f479fb8
2 parents c7b0206 + ce066ce
commit f479fb8
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 8 deletions.
diff --git a/services/drupal/web/themes/epa_theme/epa_theme.libraries.yml b/services/drupal/web/themes/epa_theme/epa_theme.libraries.yml
@@ -112,12 +112,7 @@ boxes:
   version: VERSION
   css:
     theme:
-      css/box.css: {}      
-definition:
-  version: VERSION
-  css:
-    theme:
-      css/definition.css: {}         
+      css/box.css: {}          
 document:
   version: VERSION
   css:

diff --git a/.../05-components/definition/definition.scss → ...05-components/definition/_definition.scss b/.../05-components/definition/definition.scss → ...05-components/definition/_definition.scss
diff --git a/...ces/drupal/web/themes/epa_theme/source/_patterns/05-components/definition/definition.twig b/...ces/drupal/web/themes/epa_theme/source/_patterns/05-components/definition/definition.twig
@@ -1,5 +1,3 @@
-{{ attach_library('epa_theme/definition') }}
-
 <span class="definition js-definition">
   <button class="definition__trigger js-definition__trigger">
     {{ term }}

diff --git a/services/drupal/web/themes/epa_theme/source/core.scss b/services/drupal/web/themes/epa_theme/source/core.scss
@@ -70,6 +70,7 @@
 @forward '_patterns/05-components/button/button';
 @forward '_patterns/05-components/button/button--danger/button--danger';
 @forward '_patterns/05-components/button-group';
+@forward '_patterns/05-components/definition/definition';
 @forward '_patterns/05-components/external-link/external-link';
 @forward '_patterns/05-components/external-link/external-link--image/external-link--image';
 @forward '_patterns/05-components/external-link/external-link--inverse/external-link--inverse';