From c77e1025fb6aae7ef36a494656b480c61f958199 Mon Sep 17 00:00:00 2001
From: Henning Leutz <leutz@pcsg.de>
Date: Fri, 26 Feb 2016 13:24:19 +0100
Subject: [PATCH] Slider height fix, promoslider update -> better effects
---
bin/Controls/Slider/Promoslider.js | 10 +++++-----
src/QUI/Bricks/Controls/Children/Slider.css | 6 +++---
src/QUI/Bricks/Controls/Children/Slider.html | 2 +-
src/QUI/Bricks/Controls/Children/Slider.php | 7 ++++++-
4 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/bin/Controls/Slider/Promoslider.js b/bin/Controls/Slider/Promoslider.js
index 8c7fbf7..6070565 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 ab494bb..810b6c3 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 9e39940..352951f 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 91eb24d..d67abfa 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()
--
GitLab