Merge pull request #40 from CuBoulder/issue/tiamat-theme/524

Resolves configuration conflict for Image Styles causing issues on the Admin Interface
CuBoulder · Oct 31, 2023 · 37ad47c · 37ad47c
2 parents 4f4221e + 4287993
commit 37ad47c
Show file tree

Hide file tree

Showing 14 changed files with 10 additions and 178 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+- ### Resolves configuration conflict for Image Styles causing issues on the Admin Interface
+  Removes conflicting/duplicate `Image Style` configuration from `profile` that already existed in `custom-entities`, which caused the Admin interface to WSOD while trying to update the Image Styles via UI. 
+
+  Includes:
+  - `profile` => [`issue/tiamat-theme/524`](/~https://github.com/CuBoulder/tiamat10-profile/pull/40)
+  - `custom-entities` => [`issue/tiamat-theme/524` ](/~https://github.com/CuBoulder/tiamat-custom-entities/pull/82)
+
+  Resolves /~https://github.com/CuBoulder/tiamat-theme/issues/524
+---
+
 - ### Wide Image Size Adjustment
   Sets the `Wide` image style size to 1500x563px
 

diff --git a/config/install/image.style.large.yml b/config/install/image.style.large.yml
diff --git a/config/install/image.style.large_image_style.yml b/config/install/image.style.large_image_style.yml
diff --git a/config/install/image.style.media_library.yml b/config/install/image.style.media_library.yml
diff --git a/config/install/image.style.medium.yml b/config/install/image.style.medium.yml
diff --git a/config/install/image.style.medium_750px_50_display_size_.yml b/config/install/image.style.medium_750px_50_display_size_.yml
diff --git a/config/install/image.style.small_500px_25_display_size_.yml b/config/install/image.style.small_500px_25_display_size_.yml
diff --git a/config/install/image.style.small_square_image_style.yml b/config/install/image.style.small_square_image_style.yml
diff --git a/config/install/image.style.square_thumbnail_image_style.yml b/config/install/image.style.square_thumbnail_image_style.yml
diff --git a/config/install/image.style.thumbnail.yml b/config/install/image.style.thumbnail.yml
diff --git a/config/install/image.style.wide.yml b/config/install/image.style.wide.yml
diff --git a/config/install/image.style.wide_image_style.yml b/config/install/image.style.wide_image_style.yml
diff --git a/config/optional/image.style.focal_image_square.yml b/config/optional/image.style.focal_image_square.yml
diff --git a/config/optional/image.style.focal_image_wide.yml b/config/optional/image.style.focal_image_wide.yml