Merge pull request #281 from glucka/patch-1

Spalten zeigen falsche Inhalte an
bootstraptheme-for-typo3 · Nov 9, 2015 · 9744d79 · 9744d79
2 parents 3321a9b + 661b0b0
commit 9744d79
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/Resources/Private/Templates/Content/SixColumn.html b/Resources/Private/Templates/Content/SixColumn.html
@@ -96,10 +96,10 @@ <h3><v:l key="flux.grid6.label.customize.column.settings"/>:</h3>
 						<flux:content.render area="column4" />
 					</div>
 					<div class="{settings.grid6.col5width} {settings.grid6.col5CSS} {f:if(condition: settings.grid6.eqh, then: 'equal-height')} {f:if(condition: settings.grid6.col5hide, then: 'hidden-xs')}">
-						<flux:content.render area="column4" />
+						<flux:content.render area="column5" />
 					</div>
 					<div class="{settings.grid6.col6width} {settings.grid6.col6CSS} {f:if(condition: settings.grid6.eqh, then: 'equal-height')} {f:if(condition: settings.grid6.col6hide, then: 'hidden-xs')}">
-						<flux:content.render area="column4" />
+						<flux:content.render area="column6" />
 					</div>
 				</f:then>
 				<f:else>
@@ -116,10 +116,10 @@ <h3><v:l key="flux.grid6.label.customize.column.settings"/>:</h3>
 						<flux:content.render area="column4" />
 					</div>
 					<div class="col-sm-2 {settings.grid6.col5CSS} {f:if(condition: settings.grid6.eqh, then: 'equal-height')} {f:if(condition: settings.grid6.col5hide, then: 'hidden-xs')}">
-						<flux:content.render area="column4" />
+						<flux:content.render area="column5" />
 					</div>
 					<div class="col-sm-2 {settings.grid6.col6CSS} {f:if(condition: settings.grid6.eqh, then: 'equal-height')} {f:if(condition: settings.grid6.col6hide, then: 'hidden-xs')}">
-						<flux:content.render area="column4" />
+						<flux:content.render area="column6" />
 					</div>
 				</f:else>
 			</f:if>