diff --git a/djangocms_forms/templates/djangocms_forms/form_template/default.html b/djangocms_forms/templates/djangocms_forms/form_template/default.html index 9ab2aa5..cdba209 100644 --- a/djangocms_forms/templates/djangocms_forms/form_template/default.html +++ b/djangocms_forms/templates/djangocms_forms/form_template/default.html @@ -20,10 +20,13 @@ + {% if field|is_textarea %} +
{{ field.help_text|safe }}
+ {% endif %} {% if not field|is_checkbox %}

{{ field }}

{% endif %} - {% if field.help_text %} + {% if not field|is_textarea and field.help_text %}
{{ field.help_text|safe }}
{% endif %} diff --git a/djangocms_forms/templatetags/djangocms_forms_tags.py b/djangocms_forms/templatetags/djangocms_forms_tags.py index 87aefe5..937d214 100755 --- a/djangocms_forms/templatetags/djangocms_forms_tags.py +++ b/djangocms_forms/templatetags/djangocms_forms_tags.py @@ -11,6 +11,9 @@ register = template.Library() def is_checkbox(field): return isinstance(field.field.widget, forms.CheckboxInput) +@register.filter +def is_textarea(field): + return isinstance(field.field.widget, forms.Textarea) @register.filter def is_password(field): diff --git a/zsite/static/less/about.less b/zsite/static/less/about.less index 118fa9b..f7d18aa 100644 --- a/zsite/static/less/about.less +++ b/zsite/static/less/about.less @@ -90,3 +90,8 @@ } } +.contacts-address-description { + font-size: 12px; + margin-top: -12px; +} + diff --git a/zsite/static/less/service.less b/zsite/static/less/service.less index 981d7e2..0e71dd7 100644 --- a/zsite/static/less/service.less +++ b/zsite/static/less/service.less @@ -1,28 +1,85 @@ -.service-timeline { - h4 { - margin: 0 + +.service-timeline h4 { + margin: 0; +} + +.service-timeline p { + opacity: .8; +} + +.service-timeline .arrow { + font-size: 33px; + vertical-align: text-bottom; +} + +.service-finish p { + font-size: 16px; +} + +.service-finish .contacts { + margin-top: 60px; +} + +.service-finish .address { + margin-top: 20px; +} + +.bill { + font-size: 12px; + background: url('/static/imgs/bill.png'); + width: 299px; + height: 240px; + padding-left: 43px; + margin-left: -71px; + padding-right: 13px; + padding-top: 15px; + + h5 { + font-weight: 700; } - p { - opacity: .8; + table { + width: 100%; + .price { + font-weight: 700; + } + td { + vertical-align: top; + padding-bottom: 5px; + } + .total td { + font-size: 14px; + padding-top: 50px; + font-weight: 700; + } } +} - .arrow { - font-size: 33px; - vertical-align: text-bottom; +.textinput, +.emailinput, +.telephoneinput, +.textarea { + input, textarea { + width: 60%; + font-size: 16px; + } + textarea { + height: 71px; } } .field-wrapper { margin: 10px 0; - + ul { list-style: none; margin: 0; padding: 0; - label { - font-weight: 100; - } } -} \ No newline at end of file + + label { + margin: 0; + } + +}