content bloc: fix margins and breakpoints

This commit is contained in:
Mathieu Jaumotte 2021-07-14 18:15:14 +02:00
parent 030e71d276
commit d35553a1e2
14 changed files with 34 additions and 29 deletions

View File

@ -7,7 +7,7 @@
{% block content %} {% block content %}
<div class="activity-edit"> <div class="activity-edit">
<div class="row justify-content-center"> <div class="row justify-content-center">
<div class="col-md-10"> <div class="col-md-10 col-xxl">
<div id="activity"></div> {# <=== vue component #} <div id="activity"></div> {# <=== vue component #}
{% include 'ChillActivityBundle:Activity:edit.html.twig' %} {% include 'ChillActivityBundle:Activity:edit.html.twig' %}

View File

@ -23,7 +23,7 @@
{% block personcontent %} {% block personcontent %}
<div class="activity-edit"> <div class="activity-edit">
<div class="row justify-content-center"> <div class="row justify-content-center">
<div class="col-md-10"> <div class="col-md-10 col-xxl">
<div id="activity"></div> {# <=== vue component #} <div id="activity"></div> {# <=== vue component #}
{% include 'ChillActivityBundle:Activity:edit.html.twig' %} {% include 'ChillActivityBundle:Activity:edit.html.twig' %}

View File

@ -7,7 +7,7 @@
{% block content %} {% block content %}
<div class="activity-new"> <div class="activity-new">
<div class="row justify-content-center"> <div class="row justify-content-center">
<div class="col-md-10"> <div class="col-md-10 col-xxl">
<div id="activity"></div> {# <=== vue component #} <div id="activity"></div> {# <=== vue component #}
{% include 'ChillActivityBundle:Activity:new.html.twig' with {'context': 'accompanyingCourse'} %} {% include 'ChillActivityBundle:Activity:new.html.twig' with {'context': 'accompanyingCourse'} %}

View File

@ -7,7 +7,7 @@
{% block personcontent %} {% block personcontent %}
<div class="activity-new"> <div class="activity-new">
<div class="row justify-content-center"> <div class="row justify-content-center">
<div class="col-md-10"> <div class="col-md-10 col-xxl">
<div id="activity"></div> {# <=== vue component #} <div id="activity"></div> {# <=== vue component #}
{% include 'ChillActivityBundle:Activity:new.html.twig' with {'context': 'person'} %} {% include 'ChillActivityBundle:Activity:new.html.twig' with {'context': 'person'} %}

View File

@ -9,7 +9,7 @@
{% block content -%} {% block content -%}
<div class="activity-show"> <div class="activity-show">
<div class="row justify-content-center"> <div class="row justify-content-center">
<div class="col-md-10"> <div class="col-md-10 col-xxl">
{% include 'ChillActivityBundle:Activity:show.html.twig' with {'context': 'accompanyingCourse'} %} {% include 'ChillActivityBundle:Activity:show.html.twig' with {'context': 'accompanyingCourse'} %}

View File

@ -9,7 +9,7 @@
{% block personcontent -%} {% block personcontent -%}
<div class="activity-show"> <div class="activity-show">
<div class="row justify-content-center"> <div class="row justify-content-center">
<div class="col-md-10"> <div class="col-md-10 col-xxl">
{% include 'ChillActivityBundle:Activity:show.html.twig' with {'context': 'person'} %} {% include 'ChillActivityBundle:Activity:show.html.twig' with {'context': 'person'} %}

View File

@ -5,7 +5,7 @@
{% endblock %} {% endblock %}
{% block layout_wvm_content %} {% block layout_wvm_content %}
<div class="mt-3"> <div class="mt-5">
{% block content %}{% endblock %} {% block content %}{% endblock %}
</div> </div>
{% endblock %} {% endblock %}

View File

@ -23,7 +23,7 @@
{% block personcontent %} {% block personcontent %}
<div class="address-new"> <div class="address-new">
<div class="row justify-content-center"> <div class="row justify-content-center">
<div class="col-md-10"> <div class="col-md-10 col-xxl">
{% block content %} {% block content %}

View File

@ -5,7 +5,7 @@
{% endblock %} {% endblock %}
{% block layout_wvm_content %} {% block layout_wvm_content %}
<div class="mt-3"> <div class="mt-5">
{% block content %}{% endblock %} {% block content %}{% endblock %}
</div> </div>
{% endblock %} {% endblock %}

View File

@ -19,8 +19,10 @@
{% block title %}{{ 'Add a person'|trans }}{% endblock title %} {% block title %}{{ 'Add a person'|trans }}{% endblock title %}
{% block content %} {% block content %}
<div class="col-12 mt-3" > <div class="person-new col-12 my-5">
<div class="col-md-10 offset-md-1"> <div class="row justify-content-center">
<div class="col-md-10 col-xxl">
{{ form_start(form) }} {{ form_start(form) }}
<h1>{{ 'Add a person'|trans }}</h1> <h1>{{ 'Add a person'|trans }}</h1>
@ -47,5 +49,7 @@
{{ form_end(form) }} {{ form_end(form) }}
</div> </div>
</div> </div>
</div>
{% endblock content %} {% endblock content %}

View File

@ -19,8 +19,10 @@
{% block title %}{{ 'Alreay existing person'|trans }}{% endblock title %} {% block title %}{{ 'Alreay existing person'|trans }}{% endblock title %}
{% block content %} {% block content %}
<div class="col-12 parent" > <div class="person-new col-12 my-5">
<div class="col-md-10 offset-md-1 parent"> <div class="row justify-content-center">
<div class="col-md-10 col-xxl">
<div class="warning flash_message"> <div class="warning flash_message">
<span> <span>

View File

@ -23,7 +23,7 @@
{% block personcontent %} {% block personcontent %}
<div class="person-edit"> <div class="person-edit">
<div class="row justify-content-center"> <div class="row justify-content-center">
<div class="col-md-10"> <div class="col-md-10 col-xxl">
<h1>{{ 'Update details for %name%'|trans({ '%name%': person.firstName|capitalize ~ ' ' ~ person.lastName|capitalize } ) }}</h1> <h1>{{ 'Update details for %name%'|trans({ '%name%': person.firstName|capitalize ~ ' ' ~ person.lastName|capitalize } ) }}</h1>

View File

@ -23,7 +23,7 @@
{% endblock %} {% endblock %}
{% block layout_wvm_content %} {% block layout_wvm_content %}
<div class="mt-3"> <div class="mt-5">
{% block personcontent %}{# block personcontent empty #}{% endblock %} {% block personcontent %}{# block personcontent empty #}{% endblock %}
</div> </div>
{% endblock %} {% endblock %}

View File

@ -38,7 +38,7 @@ This view should receive those arguments:
{% block personcontent %} {% block personcontent %}
<div class="person-view"> <div class="person-view">
<div class="row justify-content-center"> <div class="row justify-content-center">
<div class="col-md-10"> <div class="col-md-10 col-xxl">
<div class="row"> <div class="row">
{% if person.memo is not empty and chill_person.fields.memo == 'visible' %} {% if person.memo is not empty and chill_person.fields.memo == 'visible' %}
@ -230,7 +230,7 @@ This view should receive those arguments:
</div> </div>
{%- endif -%} {%- endif -%}
</div> </div>
{% if cFGroup and (cFGroup.getActiveCustomFields|length > 0) %} {% if cFGroup and (cFGroup.getActiveCustomFields|length > 0) %}
<div class="row"> <div class="row">
<div class="col-12 custom-fields"> <div class="col-12 custom-fields">
@ -239,23 +239,22 @@ This view should receive those arguments:
</figure> </figure>
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<figure class="person-details"></figure> <figure class="person-details"></figure>
</div> </div>
{% endif %} {% endif %}
{% if is_granted('CHILL_PERSON_UPDATE', person) %}
<ul class="sticky-form-buttons record_actions">
<li>
<a class="btn btn-update" href="{{ path('chill_person_general_edit', { 'person_id': person.id }) }}">
{{ 'Edit'|trans }}
</a>
</li>
</ul>
{% endif %}
</div> </div>
{% if is_granted('CHILL_PERSON_UPDATE', person) %}
<ul class="col-md-10 sticky-form-buttons record_actions ">
<li>
<a class="btn btn-update" href="{{ path('chill_person_general_edit', { 'person_id': person.id }) }}">
{{ 'Edit'|trans }}
</a>
</li>
</ul>
{% endif %}
</div> </div>
</div> </div>