diff --git a/app/client/views/autoform/afFormGroup_tight-horizontal.coffee b/app/client/views/autoform/afFormGroup_tight-horizontal.coffee
index c0eadbc..fb1fc57 100644
--- a/app/client/views/autoform/afFormGroup_tight-horizontal.coffee
+++ b/app/client/views/autoform/afFormGroup_tight-horizontal.coffee
@@ -1,48 +1,50 @@
Template['afFormGroup_tight-horizontal'].helpers
afFieldInputAtts: ->
atts = _.omit(@afFieldInputAtts or {}, 'input-col-class')
# We have a special template for check boxes, but otherwise we
# want to use the same as those defined for bootstrap3 template.
if AutoForm.getInputType(@afFieldInputAtts) == 'boolean-checkbox'
atts.template = 'bootstrap3-horizontal'
else
atts.template = 'bootstrap3'
atts
afFieldLabelAtts: ->
atts = _.clone(@afFieldLabelAtts or {})
# Add bootstrap class
atts = AutoForm.Utility.addClass(atts, 'control-label')
atts
rightColumnClass: ->
atts = @afFieldInputAtts or {}
atts['input-col-class'] or ''
skipLabel: ->
self = this
type = AutoForm.getInputType(self.afFieldInputAtts)
self.skipLabel or type == 'boolean-checkbox' and !self.afFieldInputAtts.leftLabel
reallySkipLabel: ->
reallySkipLabel = false
- if @name.indexOf('choices') > -1 or @name.indexOf('subquestions') > -1
+ if @name.indexOf('choices') > -1 or @name.indexOf('subquestions') > -1
if @name.indexOf('.0.') is -1
reallySkipLabel = true
reallySkipLabel
myFormGroupClass: ->
if @name.indexOf('choices') > -1
if @name.indexOf('label') > -1
- "col-md-9"
+ "col-md-8"
else if @name.indexOf('variable') > -1
"col-md-3"
else if @name.indexOf('value') > -1
"col-md-3 choice-value"
- else if @name.indexOf('subquestions') > -1
+ else if @name.indexOf('conditional') > -1
+ "col-md-1"
+ else if @name.indexOf('subquestions') > -1
if @name.indexOf('code') > -1
"col-md-2 subquestion-code"
else if @name.indexOf('label') > -1
"col-md-10"
else if @name.indexOf('minLabel') > -1
"col-md-5"
else if @name.indexOf('maxLabel') > -1
"col-md-5"
else
""
diff --git a/app/client/views/autoform/afFormGroup_tight-horizontal.html b/app/client/views/autoform/afFormGroup_tight-horizontal.html
index e774d1c..87df75a 100644
--- a/app/client/views/autoform/afFormGroup_tight-horizontal.html
+++ b/app/client/views/autoform/afFormGroup_tight-horizontal.html
@@ -1,16 +1,16 @@
{{#unless reallySkipLabel}}
{{#if skipLabel}}
{{! We include the empty label as the easiest way to keep proper field alignment}}
{{else}}
{{/if}}
{{/unless}}