batch replace grid- (scratch) by col- (bootstrap)

hand replace
* push- by offset-
* no-gutter by g-0

add breakpoints md- and sm-
This commit is contained in:
Mathieu Jaumotte 2021-07-08 15:04:44 +02:00
parent b10012f4da
commit ccee105efb
34 changed files with 55 additions and 55 deletions

View File

@ -2,10 +2,10 @@
<teleport to="#social-issues-acc"> <teleport to="#social-issues-acc">
<div class="container"> <div class="container">
<div class="grid-4 clear"> <div class="col-4 clear">
<label>{{ $t('activity.social_issues') }}</label> <label>{{ $t('activity.social_issues') }}</label>
</div> </div>
<div class="grid-8"> <div class="col-8">
<check-social-issue <check-social-issue
v-for="issue in socialIssuesList" v-for="issue in socialIssuesList"
@ -42,10 +42,10 @@
</div> </div>
<div class="container"> <div class="container">
<div class="grid-4 clear"> <div class="col-4 clear">
<label>{{ $t('activity.social_actions') }}</label> <label>{{ $t('activity.social_actions') }}</label>
</div> </div>
<div class="grid-8"> <div class="col-8">
<div v-if="actionIsLoading === true"> <div v-if="actionIsLoading === true">
<i class="chill-green fa fa-circle-o-notch fa-spin fa-lg"></i> <i class="chill-green fa fa-circle-o-notch fa-spin fa-lg"></i>

View File

@ -97,7 +97,7 @@
</tbody> </tbody>
</table> </table>
{{ form_start(create_field_form) }} {{ form_start(create_field_form) }}
<div class="grid-4"> <div class="col-4">
{{ form_widget(create_field_form.type) }} {{ form_widget(create_field_form.type) }}
</div> </div>
{{ form_widget(create_field_form.submit, { 'attr': { 'class': 'btn btn-create' }, 'label': 'Add a new field' } ) }} {{ form_widget(create_field_form.submit, { 'attr': { 'class': 'btn btn-create' }, 'label': 'Add a new field' } ) }}
@ -107,7 +107,7 @@
{{ 'Any field is currently associated with this group'|trans }} {{ 'Any field is currently associated with this group'|trans }}
</p> </p>
{{ form_start(create_field_form) }} {{ form_start(create_field_form) }}
<div class="grid-4"> <div class="col-4">
{{ form_widget(create_field_form.type) }} {{ form_widget(create_field_form.type) }}
</div> </div>
{{ form_widget(create_field_form.submit, { 'attr': { 'class': 'btn btn-create' }, 'label': 'Create a new field' } ) }} {{ form_widget(create_field_form.submit, { 'attr': { 'class': 'btn btn-create' }, 'label': 'Create a new field' } ) }}

View File

@ -118,7 +118,7 @@
</ul> </ul>
<div style="margin-bottom: 10em;"> <div style="margin-bottom: 10em;">
<div class="grid-8"> <div class="col-8">
{{ form_start(form_add_participation_by_person) }} {{ form_start(form_add_participation_by_person) }}
<div class="input-group"> <div class="input-group">
{{ form_widget(form_add_participation_by_person.person_id, { 'attr' : { {{ form_widget(form_add_participation_by_person.person_id, { 'attr' : {
@ -133,7 +133,7 @@
{{ form_end(form_add_participation_by_person) }} {{ form_end(form_add_participation_by_person) }}
</div> </div>
<div class="grid-4"> <div class="col-4">
{{ form_start(form_export, {'attr': {'id': 'export_tableur'}}) }} {{ form_start(form_export, {'attr': {'id': 'export_tableur'}}) }}
<div class="input-group"> <div class="input-group">
{{ form_widget(form_export.format, { 'attr' : { 'class': 'custom-select' } }) }} {{ form_widget(form_export.format, { 'attr' : { 'class': 'custom-select' } }) }}

View File

@ -33,7 +33,7 @@
{% block content %} {% block content %}
{% block admin_content %}<!-- block personcontent empty --> {% block admin_content %}<!-- block personcontent empty -->
<div class="container-fluid"> <div class="container-fluid">
<div class="grid-10 push-1"> <div class="col-10 push-1">
<h2>{{ 'Welcome to the admin section !'|trans }}</h2> <h2>{{ 'Welcome to the admin section !'|trans }}</h2>
</div> </div>
</div> </div>

View File

@ -1,4 +1,4 @@
<div class="{% block crud_content_main_div_class %}grid-10 centered{% endblock %}"> <div class="{% block crud_content_main_div_class %}col-10 centered{% endblock %}">
{% block crud_content_header %} {% block crud_content_header %}
<h1>{{ ('crud.'~crud_name~'.title_delete')|trans({ '%as_string%': entity|chill_entity_render_string }) }}</h1> <h1>{{ ('crud.'~crud_name~'.title_delete')|trans({ '%as_string%': entity|chill_entity_render_string }) }}</h1>
{% endblock crud_content_header %} {% endblock crud_content_header %}

View File

@ -1,4 +1,4 @@
<div class="{% block crud_content_main_div_class %}grid-10 centered{% endblock %}"> <div class="{% block crud_content_main_div_class %}col-10 centered{% endblock %}">
{% block crud_content_header %} {% block crud_content_header %}
<h1>{{ ('crud.'~crud_name~'.title_edit')|trans }}</h1> <h1>{{ ('crud.'~crud_name~'.title_edit')|trans }}</h1>
{% endblock crud_content_header %} {% endblock crud_content_header %}

View File

@ -1,4 +1,4 @@
<div class="grid-10 centered"> <div class="col-10 centered">
{% block index_header %} {% block index_header %}
<h1>{{ ('crud.' ~ crud_name ~ '.index.title')|trans({'%crud_name%': crud_name}) }}</h1> <h1>{{ ('crud.' ~ crud_name ~ '.index.title')|trans({'%crud_name%': crud_name}) }}</h1>

View File

@ -1,4 +1,4 @@
<div class="{% block crud_content_main_div_class %}grid-10 centered{% endblock %}"> <div class="{% block crud_content_main_div_class %}col-10 centered{% endblock %}">
{% block crud_content_header %} {% block crud_content_header %}
<h1>{{ ('crud.' ~ crud_name ~ '.title_new')|trans({'%crud_name%' : crud_name }) }}</h1> <h1>{{ ('crud.' ~ crud_name ~ '.title_new')|trans({'%crud_name%' : crud_name }) }}</h1>
{% endblock crud_content_header %} {% endblock crud_content_header %}

View File

@ -1,4 +1,4 @@
<div class="{% block crud_content_main_div_class %}grid-10 centered{% endblock %}"> <div class="{% block crud_content_main_div_class %}col-10 centered{% endblock %}">
{% block crud_content_header %} {% block crud_content_header %}
<h1>{{ 'crud.%crud_name%.title_view'|trans({'%crud_name%' : crud_name }) }}</h1> <h1>{{ 'crud.%crud_name%.title_view'|trans({'%crud_name%' : crud_name }) }}</h1>
{% endblock crud_content_header %} {% endblock crud_content_header %}

View File

@ -25,7 +25,7 @@
{% if attr.class is defined and ('cf-title' in attr.class or 'cf-fields' in attr.class ) %} {% if attr.class is defined and ('cf-title' in attr.class or 'cf-fields' in attr.class ) %}
col-12 col-12
{% elseif attr.class is defined and 'multiple-cf-inline' in attr.class %} {% elseif attr.class is defined and 'multiple-cf-inline' in attr.class %}
col-2 col-mobile-4 col-tablet-4 mobile-clear tablet-clear col-2 col-md-4 clear
{% else %} {% else %}
col-4 clear col-4 clear
{% endif %} {% endif %}
@ -40,7 +40,7 @@
{% elseif attr.class is defined and 'cf-fields' in attr.class %} {% elseif attr.class is defined and 'cf-fields' in attr.class %}
col-12 parent col-12 parent
{% elseif attr.class is defined and 'multiple-cf-inline' in attr.class %} {% elseif attr.class is defined and 'multiple-cf-inline' in attr.class %}
col-2 col-mobile-8 col-tablet-8 multiple-cf-inline col-2 col-md-8 multiple-cf-inline
{% else %} {% else %}
col-8 col-8
{% endif %} {% endif %}
@ -85,14 +85,14 @@
</div> </div>
{%- else -%} {%- else -%}
<div class="container-fluid"> <div class="container-fluid">
<div class="row"> <div class="row g-0">
<div class="col-6 col-tablet-12 gid-mobile-12 no-gutter"> <div class="col-md-6">
<span class="inline-choice"> <span class="inline-choice">
{{ form_widget(child) }} {{ form_widget(child) }}
{{ form_label(child, '', {'label_attr': { 'class' : 'inline'} }) }} {{ form_label(child, '', {'label_attr': { 'class' : 'inline'} }) }}
</span> </span>
</div> </div>
<div class="col-6 col-tablet-12 gid-mobile-12 no-gutter"> <div class="col-md-6">
{{ form_widget(form._other, {'attr': {'class': 'input-text-other-value'} }) }} {{ form_widget(form._other, {'attr': {'class': 'input-text-other-value'} }) }}
</div> </div>
</div> </div>

View File

@ -23,7 +23,7 @@
{% block title %}{{"Change my password"|trans}}{% endblock %} {% block title %}{{"Change my password"|trans}}{% endblock %}
{% block content %} {% block content %}
<div class="grid-10 grid-mobile-10 grid-tablet-10 centered"> <div class="col-10 centered">
<h1>{{ 'Change my password'|trans }}</h1> <h1>{{ 'Change my password'|trans }}</h1>

View File

@ -30,8 +30,8 @@
<body> <body>
<header class="navigation container-fluid"> <header class="navigation container-fluid">
<div class="grid-4 hide-tablet hide-mobile parent"> <div class="col-4 d-md-none parent">
<div class="grid-10 push-2 grid-tablet-12 grid-mobile-12 push-tablet-0 grid-mobile-0 logo-container"> <div class="col-10 col-md-12 offset-2 logo-container">
<a href="{{ path('chill_main_homepage') }}"> <a href="{{ path('chill_main_homepage') }}">
<img class="logo" src="{{ asset('build/images/logo-chill-sans-slogan_white.png') }}"> <img class="logo" src="{{ asset('build/images/logo-chill-sans-slogan_white.png') }}">
</a> </a>

View File

@ -3,7 +3,7 @@
{% block title %}{{ "New password set"|trans }}{% endblock %} {% block title %}{{ "New password set"|trans }}{% endblock %}
{% block content %} {% block content %}
<div class="grid-10 grid-mobile-10 grid-tablet-10 centered"> <div class="col-10 centered">
<h1>{{ "New password set"|trans }}</h1> <h1>{{ "New password set"|trans }}</h1>

View File

@ -5,7 +5,7 @@
{% block title %}{{ title }}{% endblock %} {% block title %}{{ title }}{% endblock %}
{% block content %} {% block content %}
<div class="grid-10 grid-mobile-10 grid-tablet-10 centered"> <div class="col-10 centered">
<h1>{{ title }}</h1> <h1>{{ title }}</h1>

View File

@ -23,7 +23,7 @@
{% block title %}{{"Recover password"|trans}}{% endblock %} {% block title %}{{"Recover password"|trans}}{% endblock %}
{% block content %} {% block content %}
<div class="grid-10 grid-mobile-10 grid-tablet-10 centered"> <div class="col-10 centered">
<h1>{{ 'Recover password'|trans }}</h1> <h1>{{ 'Recover password'|trans }}</h1>

View File

@ -4,7 +4,7 @@
{% block content %} {% block content %}
<div class="grid-10 grid-mobile-10 grid-tablet-10 centered"> <div class="col-10 centered">
<h1>{{ 'Check your email'|trans }}</h1> <h1>{{ 'Check your email'|trans }}</h1>

View File

@ -20,6 +20,6 @@
{% block content %} {% block content %}
<p class="grid-8 centered error">{{ message }}</p> <p class="col-8 centered error">{{ message }}</p>
{% endblock %} {% endblock %}

View File

@ -22,8 +22,8 @@
{% block content %} {% block content %}
<div class="grid-12 parent" > <div class="col-12 parent" >
<div class="grid-10 push-1 parent"> <div class="col-10 push-1 parent">
{% for result in results %} {% for result in results %}
{{ result|raw }} {{ result|raw }}
{% endfor %} {% endfor %}

View File

@ -2,7 +2,7 @@
{% block content %} {% block content %}
<div id="container content"> <div id="container content">
<div class="grid-8 centered"> <div class="col-8 centered">
<h1>{{ 'Global timeline'|trans }}</h1> <h1>{{ 'Global timeline'|trans }}</h1>
{{ timeline|raw }} {{ timeline|raw }}

View File

@ -43,7 +43,7 @@
</teleport> </teleport>
<teleport to="#header-accompanying_course-details #banner-social-issues"> <teleport to="#header-accompanying_course-details #banner-social-issues">
<div class="grid-12"> <div class="col-12">
<social-issue <social-issue
v-for="issue in accompanyingCourse.socialIssues" v-for="issue in accompanyingCourse.socialIssues"
v-bind:key="issue.id" v-bind:key="issue.id"

View File

@ -8,7 +8,7 @@
{% block content %} {% block content %}
{% if 'DRAFT' == accompanyingCourse.step %} {% if 'DRAFT' == accompanyingCourse.step %}
<div class="grid-8 centered error flash_message"> <div class="col-8 centered error flash_message">
<span> <span>
{{ 'This accompanying course is still a draft'|trans }} {{ 'This accompanying course is still a draft'|trans }}
<a href="{{ path('chill_person_accompanying_course_edit', { 'accompanying_period_id': accompanyingCourse.id } ) }}"> <a href="{{ path('chill_person_accompanying_course_edit', { 'accompanying_period_id': accompanyingCourse.id } ) }}">

View File

@ -25,7 +25,7 @@
{% endblock %} {% endblock %}
{% block layout_wvm_content %} {% block layout_wvm_content %}
<div class="grid-12 centered"> <div class="col-12 centered">
<h1>{{ 'Configuration of person bundle' |trans }}</h1> <h1>{{ 'Configuration of person bundle' |trans }}</h1>
<p>{{ 'person_admin.What would you like to configure ?'|trans }}</p> <p>{{ 'person_admin.What would you like to configure ?'|trans }}</p>

View File

@ -4,8 +4,8 @@
{% block title 'household.Edit household members'|trans %} {% block title 'household.Edit household members'|trans %}
{% block content %} {% block content %}
<div class="grid-12 parent"> <div class="col-12 parent">
<div class="grid-10 push-1 parent"> <div class="col-10 push-1 parent">
<h1>{{ block('title') }}</h1> <h1>{{ block('title') }}</h1>
<div id="household_members_editor"></div> <div id="household_members_editor"></div>
</div> </div>

View File

@ -19,8 +19,8 @@
{% block title %}{{ 'Add a person'|trans }}{% endblock title %} {% block title %}{{ 'Add a person'|trans }}{% endblock title %}
{% block content %} {% block content %}
<div class="grid-12 parent" > <div class="col-12 parent" >
<div class="grid-10 push-1 grid-mobile-12 grid-tablet-12 push-mobile-0 push-tablet-0 parent"> <div class="col-md-10 offset-md-1 parent">
{{ form_start(form) }} {{ form_start(form) }}
<h1>{{ 'Add a person'|trans }}</h1> <h1>{{ 'Add a person'|trans }}</h1>
@ -46,4 +46,4 @@
{{ form_end(form) }} {{ form_end(form) }}
</div> </div>
</div> </div>
{% endblock content %} {% endblock content %}

View File

@ -19,8 +19,8 @@
{% block title %}{{ 'Alreay existing person'|trans }}{% endblock title %} {% block title %}{{ 'Alreay existing person'|trans }}{% endblock title %}
{% block content %} {% block content %}
<div class="grid-12 parent" > <div class="col-12 parent" >
<div class="grid-10 push-1 grid-mobile-12 grid-tablet-12 push-mobile-0 push-tablet-0 parent"> <div class="col-md-10 offset-md-1 parent">
<div class="warning flash_message"> <div class="warning flash_message">
<span> <span>
@ -89,4 +89,4 @@
</div> </div>
</div> </div>
</div> </div>
{% endblock content %} {% endblock content %}

View File

@ -25,7 +25,7 @@
<h1>{{ 'Merge duplicate persons folders'|trans }}</h1> <h1>{{ 'Merge duplicate persons folders'|trans }}</h1>
<div class="grid-6 grid-tablet-12 gid-mobile-12"> <div class="col-md-6">
<p><b>{{ 'Old person'|trans }}</b>: <p><b>{{ 'Old person'|trans }}</b>:
{{ 'Old person explain'|trans }} {{ 'Old person explain'|trans }}
</p> </p>
@ -43,7 +43,7 @@
</div> </div>
</div> </div>
<div class="grid-6 grid-tablet-12 gid-mobile-12"> <div class="col-md-6">
<p><b>{{ 'New person'|trans }}</b>: <p><b>{{ 'New person'|trans }}</b>:
{{ 'New person explain'|trans }} {{ 'New person explain'|trans }}
</p> </p>
@ -63,19 +63,19 @@
{{ form_start(form) }} {{ form_start(form) }}
<div class="grid-4 grid-tablet-12 gid-mobile-12 centered"> <div class="col-md-4 centered">
<div class="container-fluid" style="padding-top: 1em;"> <div class="container-fluid" style="padding-top: 1em;">
<div class="grid-1 clear" style="padding-top: 10px;"> <div class="col-1 clear" style="padding-top: 10px;">
{{ form_widget(form.confirm) }} {{ form_widget(form.confirm) }}
</div> </div>
<div class="grid-11"> <div class="col-11">
{{ form_label(form.confirm) }} {{ form_label(form.confirm) }}
</div> </div>
</div> </div>
</div> </div>
<ul class="grid-12 record_actions"> <ul class="col-12 record_actions">
<li class="cancel"> <li class="cancel">
<a href="{{ app.request.headers.get('referer') }}" class="btn btn-chill-gray center margin-5"> <a href="{{ app.request.headers.get('referer') }}" class="btn btn-chill-gray center margin-5">
{{ 'Return'|trans }} {{ 'Return'|trans }}

View File

@ -13,7 +13,7 @@
{{ form_start(form) }} {{ form_start(form) }}
{{ form_rest(form) }} {{ form_rest(form) }}
<ul class="grid-12 record_actions "> <ul class="col-12 record_actions ">
<li class="cancel"> <li class="cancel">
<a href="{{ path('chill_person_duplicate_view', {'person_id' : person.id}) }}" class="btn btn-cancel"> <a href="{{ path('chill_person_duplicate_view', {'person_id' : person.id}) }}" class="btn btn-cancel">
{{ 'Return'|trans }} {{ 'Return'|trans }}

View File

@ -3,7 +3,7 @@
under the customFields variable, with the custom field slug as key. under the customFields variable, with the custom field slug as key.
#} #}
{% import 'ChillPersonBundle:Person:macro.html.twig' as person %} {% import 'ChillPersonBundle:Person:macro.html.twig' as person %}
<div class="grid-8 centered"> <div class="col-8 centered">
<h2>{{ 'Accompanyied people'|trans }}</h2> <h2>{{ 'Accompanyied people'|trans }}</h2>
<table> <table>
<tbody> <tbody>

View File

@ -95,7 +95,7 @@
</div> </div>
{%- if chill_person.fields.nationality == 'visible' -%} {%- if chill_person.fields.nationality == 'visible' -%}
<div class="col-sm-3"> <div class="col-sm-auto">
<span class="open_sansbold"> <span class="open_sansbold">
{{ 'Nationality'|trans|upper}} &nbsp; : {{ 'Nationality'|trans|upper}} &nbsp; :
</span> </span>

View File

@ -35,7 +35,7 @@
{% endblock %} {% endblock %}
{% else %} {% else %}
{% block content %} {% block content %}
<div class="grid-8 push-1 grid-mobile-9 grid-tablet-9 push-mobile-0 push-tablet-0"> <div class="col-8 col-md-9 offset-md-1">
{% include 'ChillTaskBundle:SingleTask:_list.html.twig' %} {% include 'ChillTaskBundle:SingleTask:_list.html.twig' %}
</div> </div>
{% endblock %} {% endblock %}

View File

@ -3,7 +3,7 @@
{% block title 'List of third parties'|trans %} {% block title 'List of third parties'|trans %}
{% block content %} {% block content %}
<div class="grid-10 centered"> <div class="col-10 centered">
<h1>{{ 'List of third parties'|trans }}</h1> <h1>{{ 'List of third parties'|trans }}</h1>
{% if third_parties|length == 0 %} {% if third_parties|length == 0 %}

View File

@ -3,7 +3,7 @@
{% block title 'Create third party'|trans %} {% block title 'Create third party'|trans %}
{% block content %} {% block content %}
<div class="grid-10 centered"> <div class="col-10 centered">
<h1>{{ 'Create third party'|trans }}</h1> <h1>{{ 'Create third party'|trans }}</h1>
{{ form_start(form) }} {{ form_start(form) }}

View File

@ -7,7 +7,7 @@
{% block title title_ %} {% block title title_ %}
{% block content %} {% block content %}
<div class="grid-10 centered"> <div class="col-10 centered">
<h1> <h1>
{{ title_ }} {{ title_ }}
<span class="chill__box {{ thirdParty.active ? 'green' : 'red' }}">{{ (thirdParty.active ? 'Active, shown to users' : 'Inactive, not shown to users')|trans }}</span> <span class="chill__box {{ thirdParty.active ? 'green' : 'red' }}">{{ (thirdParty.active ? 'Active, shown to users' : 'Inactive, not shown to users')|trans }}</span>

View File

@ -3,7 +3,7 @@
{% block title 'Update third party %name%'|trans({ '%name%': thirdParty.name }) %} {% block title 'Update third party %name%'|trans({ '%name%': thirdParty.name }) %}
{% block content %} {% block content %}
<div class="grid-10 centered"> <div class="col-10 centered">
<h1> <h1>
{{ 'Update third party %name%'|trans({ '%name%': thirdParty.name }) }} {{ 'Update third party %name%'|trans({ '%name%': thirdParty.name }) }}
<span class="chill__box {{ thirdParty.active ? 'green' : 'red' }}">{{ (thirdParty.active ? 'Active, shown to users' : 'Inactive, not shown to users')|trans }}</span> <span class="chill__box {{ thirdParty.active ? 'green' : 'red' }}">{{ (thirdParty.active ? 'Active, shown to users' : 'Inactive, not shown to users')|trans }}</span>