Merge branch 'fix' into main

asset/css/carousel.css

@@ -3,9 +3,10 @@
 	flex-wrap: nowrap !important;
 }
 .siema {
-	margin: 0;
+	/*margin: 1rem 0;*/
 	background-color: #000;
 	position: relative;
+	margin: 0;
 }
 
 .siema-img {

src/Site/BlockLayout/Carousel.php

@@ -92,10 +92,9 @@ class Carousel extends AbstractBlockLayout
 				}
 			}
 		}
-
+    $wrap = $block->dataValue('wrapStyle') . 'height:'.$block->dataValue('height').';';
 		return $view->partial('common/block-layout/simple-carousel', [
       'carousel_id' => 'ic_' . ++$id,
-			'height' => $block->dataValue('height'),
 			'duration' => $block->dataValue('duration'),
 			'perPage' => $block->dataValue('perPage'),
 			'loop' => $block->dataValue('loop'),
@@ -104,7 +103,7 @@ class Carousel extends AbstractBlockLayout
       'images' => $images,
 			'autoSlide' => $block->dataValue('autoSlide'),
 			'autoSlideInt' => $block->dataValue('autoSlideInt'),
-			'wrapStyle' => $block->dataValue('wrapStyle'),
+			'wrapStyle' => $wrap,
 			'imgStyle' => $block->dataValue('imgStyle'),
 			'ui_background' => $block->dataValue('ui_background'),
       'renderSourceLink' => $block->dataValue('renderSourceLink'),

view/common/block-layout/simple-carousel.phtml

@@ -7,7 +7,9 @@
 ?>
 
 <style>
-/* styles placed in carousel.css */
+	#siema-ui {
+		/* background-color: <?php echo $ui_background ?>; */
+	}
 </style>
 
 <div class="archive-item-block archive-carousel">