diff --git a/bin/Controls/Slider/Promoslider.js b/bin/Controls/Slider/Promoslider.js index 8c7fbf7e877a62bd9cc4b653660354484f7eed21..607056546ac79db33c5825b21997f68601df72bc 100644 --- a/bin/Controls/Slider/Promoslider.js +++ b/bin/Controls/Slider/Promoslider.js @@ -34,7 +34,7 @@ define('package/quiqqer/bricks/bin/Controls/Slider/Promoslider', [ options: { delay : 5000, - effectduration: 200, + effectduration: 400, autostart : true, touch : true }, @@ -203,10 +203,10 @@ define('package/quiqqer/bricks/bin/Controls/Slider/Promoslider', [ '.quiqqer-bricks-promoslider-slide:display(inline)' ); - self.$hideSheetToLeft(Current).then(function () { - return self.$showSheetFromRight(Slide); - - }).then(function () { + Promise.all([ + self.$hideSheetToLeft(Current), + self.$showSheetFromRight(Slide) + ]).then(function () { resolve(); this.$running = false; diff --git a/src/QUI/Bricks/Controls/Children/Slider.css b/src/QUI/Bricks/Controls/Children/Slider.css index ab494bb6e672e51531a894e9d46c5827af2a02b2..810b6c359696003360da7fa62404288b5d7223d3 100644 --- a/src/QUI/Bricks/Controls/Children/Slider.css +++ b/src/QUI/Bricks/Controls/Children/Slider.css @@ -1,6 +1,5 @@ .quiqqer-bricks-children-slider { float: left; - height: 180px; position: relative; width: 100%; } @@ -25,7 +24,7 @@ .quiqqer-bricks-children-slider-container-slide { display: inline-block; - float: none; + height: calc(100% - 22px); position: relative; white-space: nowrap; @@ -39,14 +38,15 @@ .quiqqer-bricks-children-slider-child-display { border: 1px solid #dfe4e4; + display: block; height: 100%; overflow: hidden; margin: 0 10px; + padding: 0; text-align: center; } .quiqqer-bricks-children-slider-child-display img { - height: 100%; transition: all 1s ease; -webkit-transition: all 1s ease; width: auto; diff --git a/src/QUI/Bricks/Controls/Children/Slider.html b/src/QUI/Bricks/Controls/Children/Slider.html index 9e3994043819bbb8b7e063e3d99619049fc712be..352951fa2710edac9e385243114e816377d8b1a8 100644 --- a/src/QUI/Bricks/Controls/Children/Slider.html +++ b/src/QUI/Bricks/Controls/Children/Slider.html @@ -15,7 +15,7 @@ </header> {$Child->getAttribute('short')} {else} - {image src=$Child->getAttribute('image_site') maxwidth="280"} + {image src=$Child->getAttribute('image_site') height=$this->getAttribute('height')} {/if} </a> </article> diff --git a/src/QUI/Bricks/Controls/Children/Slider.php b/src/QUI/Bricks/Controls/Children/Slider.php index 91eb24d3da03ff54664e33e95908ad44ace1bfa9..d67abfa48bd33810e5797c6486dc15d7944e481a 100644 --- a/src/QUI/Bricks/Controls/Children/Slider.php +++ b/src/QUI/Bricks/Controls/Children/Slider.php @@ -26,7 +26,8 @@ public function __construct($attributes = array()) 'nodeName' => 'section', 'site' => '', 'order' => false, - 'data-qui' => 'package/quiqqer/bricks/bin/Controls/Children/Slider' + 'data-qui' => 'package/quiqqer/bricks/bin/Controls/Children/Slider', + 'height' => 200 )); $this->addCSSFile( @@ -45,6 +46,10 @@ public function getBody() { $Engine = QUI::getTemplateManager()->getEngine(); + if (!$this->getAttribute('height')) { + $this->setAttribute('height', 200); + } + $Engine->assign(array( 'this' => $this, 'children' => $this->getChildren()