diff --git a/Classes/Utility/ImageVariantsUtility.php b/Classes/Utility/ImageVariantsUtility.php index a5e2526b2..4e685139a 100644 --- a/Classes/Utility/ImageVariantsUtility.php +++ b/Classes/Utility/ImageVariantsUtility.php @@ -67,12 +67,12 @@ public static function getImageVariants(?array $variants = null, ?array $multipl $variants = $variants !== null ? $variants : []; $variants = self::processVariants($variants); $variants = self::processResolutions($variants); - if ($gutters !== null) { - $variants = self::removeGutters($variants, $gutters); - } if ($multiplier !== null) { $variants = self::processMultiplier($variants, $multiplier); } + if ($gutters !== null) { + $variants = self::removeGutters($variants, $gutters); + } if ($corrections !== null) { $variants = self::processCorrections($variants, $corrections); } @@ -178,7 +178,7 @@ protected static function removeGutters(array $variants, array $gutters): array { foreach ($gutters as $variant => $value) { if (is_numeric($value) && $value > 0 && isset($variants[$variant]['width'])) { - $variants[$variant]['width'] = (int) ceil($variants[$variant]['width'] - (float) $value); + $variants[$variant]['width'] = (int) ceil($variants[$variant]['width'] - ((float) $value / 2)); } } return $variants; diff --git a/Resources/Public/JavaScript/Src/bootstrap.cookieconsent.js b/Resources/Public/JavaScript/Src/bootstrap.cookieconsent.js index 44cf68004..03cb79cc5 100644 --- a/Resources/Public/JavaScript/Src/bootstrap.cookieconsent.js +++ b/Resources/Public/JavaScript/Src/bootstrap.cookieconsent.js @@ -140,8 +140,10 @@ window.addEventListener('DOMContentLoaded', function () { }; // Initialize - cookieConsentOptions.container = document.getElementById('cookieconsent'); - window.cookieconsent.initialise(cookieConsentOptions); + if (typeof window.cookieconsent.initialise === "function") { + cookieConsentOptions.container = document.getElementById('cookieconsent'); + window.cookieconsent.initialise(cookieConsentOptions); + } } });