diff --git a/static/aerbimCSS.css b/static/aerbimCSS.css index 0dd4034..fada971 100644 --- a/static/aerbimCSS.css +++ b/static/aerbimCSS.css @@ -339,8 +339,8 @@ body.n_scroll{ } .service_block_container{ - width: calc(33% - 70px); - margin-right: 70px; + width: 30%; + margin-right: 3%; margin-bottom: 70px; } diff --git a/templates/block_settings/blocks_settings.html b/templates/block_settings/blocks_settings.html index be98845..667784f 100644 --- a/templates/block_settings/blocks_settings.html +++ b/templates/block_settings/blocks_settings.html @@ -1 +1 @@ - style="width: 100%;padding-top: 1px;{% if block.bg_image %} background: url({{ MEDIA_URL }}{{ block.bg_image }}); background-size: cover; background-repeat: no-repeat; background-position: top;{% elif block.bg_color %} background: {{ block.bg_color }}{% endif %}" +style="width: 100%;padding-top: 30px;{% if block.bg_image %} background: url({{ MEDIA_URL }}{{ block.bg_image }}); background-size: cover; background-repeat: no-repeat; background-position: top;{% elif block.bg_color %} background: {{ block.bg_color }}{% endif %}" diff --git a/templates/blocks/b_3d_s_d.html b/templates/blocks/b_3d_s_d.html index fad5e30..4b411cd 100644 --- a/templates/blocks/b_3d_s_d.html +++ b/templates/blocks/b_3d_s_d.html @@ -1,57 +1,59 @@ {% load static %} -
-
-
-
- {% if block.pre_title %} -
{{ block.pre_title }}
- {% endif %} - {% if block.name %} -
{{ block.name }}
- {% endif %} - {% if block.description %} -
- {{ block.description|linebreaksbr }} +
+
+
+
+
+ {% if block.pre_title %} +
{{ block.pre_title }}
+ {% endif %} + {% if block.name %} +
{{ block.name }}
+ {% endif %} + {% if block.description %} +
+ {{ block.description|linebreaksbr }} +
+ {% endif %} + {% if block.but1_title or block.but1_icon %} + + {% endif %} + {% if block.but2_title or block.but2_icon %} + + {% endif %} +
+ {% if block.picture %} +
+
{% endif %} - {% if block.but1_title or block.but1_icon %} - - {% endif %} - {% if block.but2_title or block.but2_icon %} - - {% endif %}
- {% if block.picture %} -
- -
- {% endif %}
\ No newline at end of file diff --git a/templates/blocks/b_faq.html b/templates/blocks/b_faq.html index 56304b3..4758a98 100644 --- a/templates/blocks/b_faq.html +++ b/templates/blocks/b_faq.html @@ -2,29 +2,31 @@ {% load i18n %} {% if page.get_FAQ_items %} -
-
-
- {% if not page.FAQ_title %}ЧАСТО ЗАДАВАЕМЫЕ ВОПРОСЫ{% else %}{{ page.FAQ_title }}{% endif %} -
- {% for FAQ_item in page.get_FAQ_items %} -
-
-
-
-
{{ FAQ_item.question }}
-
- +
+
+
+
+ {% if not page.FAQ_title %}ЧАСТО ЗАДАВАЕМЫЕ ВОПРОСЫ{% else %}{{ page.FAQ_title }}{% endif %} +
+ {% for FAQ_item in page.get_FAQ_items %} +
+
+
+
+
{{ FAQ_item.question }}
+
+ +
+
-
+
+
+ {{ FAQ_item.answer|safe }}
-
- {{ FAQ_item.answer|safe }} -
-
- {% endfor %} + {% endfor %} +
{% endif %} \ No newline at end of file diff --git a/templates/blocks/b_functional_features.html b/templates/blocks/b_functional_features.html index d198d36..74716aa 100644 --- a/templates/blocks/b_functional_features.html +++ b/templates/blocks/b_functional_features.html @@ -1,48 +1,50 @@ {% load static %} -
-
-
-
-
-{# #} - {% if block.picture %} - - {% endif %} -
-
- {% if block.name %} -
- {{ block.name }} -
- {% endif %} - {% if block.description %} -
-
- {{ block.description|safe|linebreaksbr }} +
+
+
+
+
+
+ {# #} + {% if block.picture %} + + {% endif %} +
+
+ {% if block.name %} +
+ {{ block.name }}
-{#
#} -{# Значительно сокращает время проектирования в среде Autodesk Revit#} -{#
#} -{#
#} -{# Значительно сокращает время проектирования в среде Autodesk Revit#} -{#
#} -
- {% endif %} + {% endif %} + {% if block.description %} +
+
+ {{ block.description|safe|linebreaksbr }} +
+ {#
#} + {# Значительно сокращает время проектирования в среде Autodesk Revit#} + {#
#} + {#
#} + {# Значительно сокращает время проектирования в среде Autodesk Revit#} + {#
#} +
+ {% endif %} +
+
+
+ {% for widget in block.get_widgets %} + {% include 'widgets/w_functuional_features_item.html' %} + {% endfor %} + {# {% include 'widgets/w_functuional_features_item.html' %}#} + {# {% include 'widgets/w_functuional_features_item.html' %}#} + {# {% include 'widgets/w_functuional_features_item.html' %}#} + {# {% include 'widgets/w_functuional_features_item.html' %}#} + {# {% include 'widgets/w_functuional_features_item.html' %}#} + {# {% include 'widgets/w_functuional_features_item.html' %}#} + {# {% include 'widgets/w_functuional_features_item.html' %}#} + {# {% include 'widgets/w_functuional_features_item.html' %}#} + {# {% include 'widgets/w_functuional_features_item.html' %}#}
-
-
- {% for widget in block.get_widgets %} - {% include 'widgets/w_functuional_features_item.html' %} - {% endfor %} -{# {% include 'widgets/w_functuional_features_item.html' %}#} -{# {% include 'widgets/w_functuional_features_item.html' %}#} -{# {% include 'widgets/w_functuional_features_item.html' %}#} -{# {% include 'widgets/w_functuional_features_item.html' %}#} -{# {% include 'widgets/w_functuional_features_item.html' %}#} -{# {% include 'widgets/w_functuional_features_item.html' %}#} -{# {% include 'widgets/w_functuional_features_item.html' %}#} -{# {% include 'widgets/w_functuional_features_item.html' %}#} -{# {% include 'widgets/w_functuional_features_item.html' %}#}
diff --git a/templates/blocks/b_how_dev.html b/templates/blocks/b_how_dev.html index d59b769..2e5b275 100644 --- a/templates/blocks/b_how_dev.html +++ b/templates/blocks/b_how_dev.html @@ -1,37 +1,38 @@ {% load static %} {% load base_tags_extra %} - -
-
-
{{ block.name }}
-
- {% for w in block.rel_widgets_for_block.all %} -
-
-
- 0{{ forloop.counter }} {{ w.name }} +
+
+
+
{{ block.name }}
+
+ {% for w in block.rel_widgets_for_block.all %} +
+
+
+ 0{{ forloop.counter }} {{ w.name }} +
+
+ +
-
- +
+ {{ w.description }} +
+
+
+ Участники: +
+
+
    + {% for item_s in w.text|split_string_by_enter %} +
  • {{ item_s }}
    • + {% endfor %} +
-
- {{ w.description }} -
-
-
- Участники:
-
-
    - {% for item_s in w.text|split_string_by_enter %} -
  • {{ item_s }}
    • - {% endfor %} -
-
-
-
- {% endfor %} + {% endfor %} +
\ No newline at end of file diff --git a/templates/blocks/b_photo_n_text.html b/templates/blocks/b_photo_n_text.html index a3e3c1f..c786a5c 100644 --- a/templates/blocks/b_photo_n_text.html +++ b/templates/blocks/b_photo_n_text.html @@ -1,21 +1,23 @@ -
- {% for widget in block.get_widgets %} -
+
+
+ {% for widget in block.get_widgets %}
- {% if widget.name %} -
{{ widget.name }}
- {% endif %} - {% if widget.description %} -
{{ widget.description|safe|linebreaksbr }}
- {% endif %} +
+ {% if widget.name %} +
{{ widget.name }}
+ {% endif %} + {% if widget.description %} +
{{ widget.description|safe|linebreaksbr }}
+ {% endif %} +
+
+ {% if widget.video_url %} +
{{ widget.video_url|safe }}
+ {% elif widget.picture %} + {{ widget.name }} + {% endif %} +
-
- {% if widget.video_url %} -
{{ widget.video_url|safe }}
- {% elif widget.picture %} - {{ widget.name }} - {% endif %} -
-
- {% endfor %} + {% endfor %} +
\ No newline at end of file diff --git a/templates/blocks/b_present_technology.html b/templates/blocks/b_present_technology.html index f7bad80..99692b2 100644 --- a/templates/blocks/b_present_technology.html +++ b/templates/blocks/b_present_technology.html @@ -1,12 +1,14 @@ {% load static %} -
-
-
-
{{ block.description }}
-
{{ block.name }}
-
-
- +
+
+
+
+
{{ block.description }}
+
{{ block.name }}
+
+
+ +
\ No newline at end of file diff --git a/templates/blocks/b_presentation_aerBim.html b/templates/blocks/b_presentation_aerBim.html index e19d72a..689eac6 100644 --- a/templates/blocks/b_presentation_aerBim.html +++ b/templates/blocks/b_presentation_aerBim.html @@ -1,10 +1,12 @@ {% load static %} -
-
-
- {% for section in sections %} - {% include "widgets/w_one_present_aerBim.html" %} - {% endfor %} +
+
+
+
+ {% for section in sections %} + {% include "widgets/w_one_present_aerBim.html" %} + {% endfor %} +
\ No newline at end of file diff --git a/templates/blocks/b_services_2_col_wo_group.html b/templates/blocks/b_services_2_col_wo_group.html index 04759a5..6e8e7cc 100644 --- a/templates/blocks/b_services_2_col_wo_group.html +++ b/templates/blocks/b_services_2_col_wo_group.html @@ -1,23 +1,24 @@ {% load static %} {% load i18n %} - -
-
- {% for service in services %} -
-
- {% if service.picture %} -
- +
+
+
+ {% for service in services %} +
+
+ {% if service.picture %} +
+ +
+ {% endif %} +
+ {{ service.name }}
- {% endif %} -
- {{ service.name }} -
-
+
+
-
- {% endfor %} + {% endfor %} +
\ No newline at end of file diff --git a/templates/blocks/b_services_3cols_w_groups.html b/templates/blocks/b_services_3cols_w_groups.html index a62a61a..79e8162 100644 --- a/templates/blocks/b_services_3cols_w_groups.html +++ b/templates/blocks/b_services_3cols_w_groups.html @@ -1,39 +1,40 @@ {% load static %} {% load i18n %} - -
-
- {% for service in services %} -
-
- {% if service.picture %} -
- +
+
+
+ {% for service in services %} +
+
+ {% if service.picture %} +
+ +
+ {% endif %} +
+ {{ service.name }} +
+
+ {% if service.rel_children_for_service.all %} +
+ {% for sub_serv in service.rel_children_for_service.all %} +
+ {% if sub_serv.picture %} +
+ +
+ {% endif %} +
+ {{ sub_serv.name }} +
+
+
+ {% endfor %}
{% endif %} -
- {{ service.name }}
-
- {% if service.rel_children_for_service.all %} -
- {% for sub_serv in service.rel_children_for_service.all %} -
- {% if sub_serv.picture %} -
- -
- {% endif %} -
- {{ sub_serv.name }} -
-
-
- {% endfor %} -
- {% endif %}
-
- {% endfor %} + {% endfor %} +
\ No newline at end of file