[TASK] add condition to check if frame_class != default

t3kit · Apr 10, 2017 · 1d81b8f · 1d81b8f
1 parent d75852d
commit 1d81b8f
Showing 1 changed file with 20 additions and 20 deletions.
diff --git a/Resources/Private/Layouts/FluidStyledContent/Default.html b/Resources/Private/Layouts/FluidStyledContent/Default.html
@@ -2,31 +2,31 @@
 <f:spaceless>
 
 	<f:comment><!-- ### Wrapper class===frame_class||Margin Top===space_before_class||Margin Bottom===space_after_class ### --></f:comment>
-	<f:if condition="{data.frame_class} || {data.space_before_class} || {data.space_after_class}">
+	<f:if condition="({data.frame_class} && ({data.frame_class} != 'defaultr')) || {data.space_before_class} || {data.space_after_class}">
 		<div class="{data.frame_class} {data.space_before_class} {data.space_after_class}">
 	</f:if>
 
-		<f:comment><!-- ### element body ### --></f:comment>
-		<div id="c{data.uid}" class="frame frame-type-{data.CType} {f:if(condition: data.layout, then: ' {data.layout}')} {alignClass}">
-			<f:if condition="{data._LOCALIZED_UID}">
-				<a id="c{data._LOCALIZED_UID}"></a>
-			</f:if>
-			<f:render section="Before" optional="true">
-				<f:render partial="DropIn/Before/All" arguments="{_all}" />
-			</f:render>
-			<f:render section="Header" optional="true">
-				<f:render partial="Header/All" arguments="{_all}" />
-			</f:render>
+	<f:comment><!-- ### element body ### --></f:comment>
+	<div id="c{data.uid}" class="frame frame-type-{data.CType} {layoutClass} {f:if(condition: data.layout, then: ' frame-layout-{data.layout}')} {alignClass}">
+		<f:if condition="{data._LOCALIZED_UID}">
+			<a id="c{data._LOCALIZED_UID}"></a>
+		</f:if>
+		<f:render section="Before" optional="true">
+			<f:render partial="DropIn/Before/All" arguments="{_all}" />
+		</f:render>
+		<f:render section="Header" optional="true">
+			<f:render partial="Header/All" arguments="{_all}" />
+		</f:render>
 
-			<f:render section="Main" optional="true" />
+		<f:render section="Main" optional="true" />
 
-			<f:render section="Footer" optional="true">
-				<f:render partial="Footer/All" arguments="{_all}" />
-			</f:render>
-			<f:render section="After" optional="true">
-				<f:render partial="DropIn/After/All" arguments="{_all}" />
-			</f:render>
-		</div>
+		<f:render section="Footer" optional="true">
+			<f:render partial="Footer/All" arguments="{_all}" />
+		</f:render>
+		<f:render section="After" optional="true">
+			<f:render partial="DropIn/After/All" arguments="{_all}" />
+		</f:render>
+	</div>
 
 	<f:comment><!-- ### Wrapper class===frame_class||Margin Top===space_before_class||Margin Bottom===space_after_class ### --></f:comment>
 	<f:if condition="{data.frame_class} || {data.space_before_class} || {data.space_after_class}">