Merge branch 'dev' into feat#130

locale.xml

@@ -417,8 +417,8 @@
             <en><![CDATA[A simple image slider. The slider is displayed next to the text (optionally on the left or right).]]></en>
         </locale>
         <locale name="brick.control.basicSlider.mediaFolder">
-            <de><![CDATA[Images folder]]></de>
-            <en><![CDATA[Media-Ordner auswählen]]></en>
+            <de><![CDATA[Media-Ordner auswählen]]></de>
+            <en><![CDATA[Images folder]]></en>
         </locale>
         <locale name="brick.control.basicSlider.settings.delay">
             <de><![CDATA[Zeit zum nächsten Slide (Verzögerung)]]></de>

src/QUI/Bricks/Controls/Slider/BasicSlider.css

@@ -31,7 +31,6 @@
 }
 
 .basic-slider-content {
-    padding-right: 20px;
     display: flex;
 }
 
@@ -40,9 +39,15 @@
     flex-direction: row-reverse;
 }
 
-.basic-slider__imageLeft .basic-slider-content{
-    padding-right: 0;
-    padding-left: 20px;
+@media screen and (min-width: 768px) {
+    .basic-slider-content {
+        padding-right: 20px;
+    }
+
+    .basic-slider__imageLeft .basic-slider-content{
+        padding-right: 0;
+        padding-left: 20px;
+    }
 }
 
 @media screen and (max-width: 768px) {

src/QUI/Bricks/Controls/Slider/BasicSlider.html

@@ -12,16 +12,18 @@
 
 <div class="basic-slider-wrapper {if $imgLeft} basic-slider__imageLeft {/if}">
     <div class="basic-slider-content" style="align-items: {$textPosition};">
-        {$sliderContent}
+        <div class="basic-slider-content-container">
+            {$sliderContent}
+        </div>
     </div>
 
     <div class="basic-slider-image-wrapper">
         <ul class="basic-slider-images">
             {assign var=showFirstImage value=true}
             {foreach from=$images item=Image}
-                <li data-image="{image image=$Image onlysrc=1 width=$maxImageWidth}">
+                <li data-image="{image image=$Image onlysrc=1 width="$maxImageWidth"}">
                     {if $showFirstImage}
-                        {image image=$Image width="{$maxImageWidth}"}
+                        {image image=$Image width="$maxImageWidth"}
                         {assign var=showFirstImage value=false}
                     {/if}
                 </li>

src/QUI/Bricks/Controls/Slider/BasicSlider.php

@@ -38,9 +38,6 @@ public function __construct($attributes = [])
         $this->addCSSFile(
             \dirname(__FILE__) . '/BasicSlider.css'
         );
-
-        $this->addCSSClass('grid-100');
-        $this->addCSSClass('mobile-grid-100');
     }