Skip to content
Snippets Groups Projects
Commit 2061f33b authored by Georgi's avatar Georgi
Browse files

[BUGFIX] Bugfixes

parent ead3ef44
No related branches found
Tags 6.0.6
1 merge request!10Feature bugfix release
Hide whitespace changes
Inline Side-by-side
Resources/Private/Language/de.locallang.xlf
+ 4
− 4
View file @ 2061f33b
......@@ -58,8 +58,8 @@
<target><![CDATA[Layout-Art]]></target>
</trans-unit>
<trans-unit id="flexform.layout.description" approved="yes">
<source><![CDATA[If you only embed a single video, it will always be displayed in the layout for individual videos. The playlist layout works from four videos onwards – regardless of the setting, the standard layout will always be used for up to three videos.]]></source>
<target><![CDATA[Wenn Sie nur ein Video einbinden, wird es immer im Layout für einzelne Videos dargestellt. Das Playlistlayout funktioniert ab vier Videos – unabhängig von der Einstellung wird bis drei Videos immer das Standard-Layout genutzt.]]></target>
<source><![CDATA[If you only embed a single video, it will always be displayed in the layout for individual videos. The standard and row layout and work from two videos. The playlist layout works from four videos.]]></source>
<target><![CDATA[Wenn Sie nur ein Video einbinden, wird es immer im Layout für einzelne Videos dargestellt. Das Standard- und das Zeilenlayout und funktionieren ab zwei Videos. Das Playlist-Layout funktioniert ab vier Videos.]]></target>
</trans-unit>
<trans-unit id="flexform.layout.default" approved="yes">
<source><![CDATA[Default]]></source>
......@@ -86,8 +86,8 @@
<target><![CDATA[Videobeschreibungen anzeigen]]></target>
</trans-unit>
<trans-unit id="flexform.showDescription.description" approved="yes">
<source><![CDATA[The description is limited to four lines. The rest of the description can be expanded.]]></source>
<target><![CDATA[Die Beschreibung ist auf vier Zeilen begrenzt. Der Rest der Beschreibung lässt sich aufklappen.]]></target>
<source><![CDATA[The description in the standard and playlist layout is limited to four lines and in the row layout to five lines. The rest of the description can be expanded.]]></source>
<target><![CDATA[Die Beschreibung ist im Standard- und Playlist-Layout auf vier Zeilen und im Zeilenlayout auf fünf Zeilen begrenzt. Der Rest der Beschreibung lässt sich aufklappen.]]></target>
</trans-unit>
<trans-unit id="flexform.showTitle" approved="yes">
<source><![CDATA[Show Video Titles]]></source>
......
Resources/Private/Language/locallang.xlf
+ 2
− 2
View file @ 2061f33b
......@@ -51,7 +51,7 @@
<source><![CDATA[Layout Style]]></source>
</trans-unit>
<trans-unit id="flexform.layout.description" approved="yes">
<source><![CDATA[If you only embed a single video, it will always be displayed in the layout for individual videos. The playlist layout works from four videos onwards – regardless of the setting, the standard layout will always be used for up to three videos.]]></source>
<source><![CDATA[If you only embed a single video, it will always be displayed in the layout for individual videos. The standard and row layout and work from two videos. The playlist layout works from four videos.]]></source>
</trans-unit>
<trans-unit id="flexform.layout.default">
<source><![CDATA[Default]]></source>
......@@ -72,7 +72,7 @@
<source><![CDATA[Show Video Descriptions]]></source>
</trans-unit>
<trans-unit id="flexform.showDescription.description" approved="yes">
<source><![CDATA[The description is limited to four lines. The rest of the description can be expanded.]]></source>
<source><![CDATA[The description in the standard and playlist layout is limited to four lines and in the row layout to five lines. The rest of the description can be expanded.]]></source>
</trans-unit>
<trans-unit id="flexform.showTitle">
<source><![CDATA[Show Video Titles]]></source>
......
Resources/Private/Templates/Youtube/Index.html
+ 3
− 3
View file @ 2061f33b
......@@ -91,7 +91,7 @@
<ul class="sg-video__list sg-video__list--playlist">
<f:for each="{feed}" as="feedItem" iteration="feedIterator">
<f:if condition="!{feedIterator.isFirst}">
<li class="sg-video__list-item {f:if(condition: '{feedCount} === 4', then: 'sg-video__list-item--alt')}">
<li class="sg-video__list-item">
<f:render section="videoItem" arguments="{
feed: feed,
feedItem: feedItem,
......@@ -137,10 +137,10 @@
<span class="sg-video__description">
<f:if condition="{descChars}">
<f:then>
<f:format.crop maxCharacters="{descChars}" respectWordBoundaries="1" append="..."><f:format.htmlentitiesDecode>{feedItem.description}</f:format.htmlentitiesDecode></f:format.crop>
<f:format.crop maxCharacters="{descChars}" respectWordBoundaries="1" append="..."><f:format.nl2br>{feedItem.description}</f:format.nl2br></f:format.crop>
</f:then>
<f:else>
<f:format.htmlentitiesDecode>{feedItem.description}</f:format.htmlentitiesDecode>
<f:format.nl2br>{feedItem.description}</f:format.nl2br>
</f:else>
</f:if>
</span>
......
Resources/Public/JavaScript/Modules/sgVideo.js
+ 1
− 0
View file @ 2061f33b
......@@ -37,6 +37,7 @@ export default class SgVideo {
new SgVideo(item, {
textSelector: '.sg-video__description',
descriptionSelector: '.sg-video__description',
disableMinHeight: true,
});
});
......
Resources/Public/Sass/Modules/_sg-video.scss
+ 5
− 53
View file @ 2061f33b
......@@ -234,62 +234,13 @@ $sg-video-screen-xs-min: $sg-video-screen-xs;
}
}
&--2 {
@media (max-width: $sg-video-screen-sm-max) {
.sg-video__list--playlist {
margin: 0;
display: block;
}
}
&--3 {
.sg-video__list .sg-video__description {
@media (min-width: $sg-video-screen-lg) {
display: none;
}
}
.sg-video__list--playlist {
@media (min-width: $sg-video-screen-sm-min) and (max-width: $sg-video-screen-md-max) {
.sg-video__list-item {
width: 50%;
}
}
@media (max-width: $sg-video-screen-xs-max) {
display: block;
}
}
}
&--4 {
@media (max-width: $sg-video-screen-sm-max) {
.sg-video__list--playlist {
display: block;
}
.sg-video__list .sg-video__description {
display: none;
}
}
@media (min-width: $sg-video-screen-md-min) and (max-width: $sg-video-screen-md-max) {
.sg-video__list-item--alt {
width: 33%;
}
}
@media (min-width: $sg-video-screen-lg) {
.sg-video__list-item--alt .sg-video__image {
height: 100%;
}
}
@media (min-width: $sg-video-screen-md-min) {
.sg-video__list-item--alt {
h3 {
font-size: 1.3em;
margin-bottom: 5px;
}
}
display: none;
}
}
......@@ -369,13 +320,14 @@ $sg-video-screen-xs-min: $sg-video-screen-xs;
}
.sg-video__image {
object-fit: scale-down;
object-fit: contain;
}
@media (min-width: $sg-video-screen-md) {
.sg-video__item {
box-shadow: none;
background-color: transparent;
display: flex;
}
.sg-video__image-container {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment