Merge branch 'fix' into main

This commit is contained in:
buttle 2021-09-13 13:51:11 +02:00
commit 9603db5929
3 changed files with 8 additions and 6 deletions

View File

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

View File

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

View File

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