badge classes updated from badge-... to bg-...

This commit is contained in:
Julie Lenaerts 2021-07-05 12:29:52 +02:00
parent d016f9be86
commit a44b26da6c
19 changed files with 32 additions and 32 deletions

View File

@ -1,6 +1,6 @@
<template> <template>
<li> <li>
<span class="badge badge-primary" :title="person.text"> <span class="badge bg-primary" :title="person.text">
<span class="chill_denomination"> <span class="chill_denomination">
{{ textCutted }} {{ textCutted }}
</span> </span>

View File

@ -59,7 +59,7 @@
{% for item in bloc.items %} {% for item in bloc.items %}
<li> <li>
<a href="{{ _self.href(bloc.path, bloc.key, item.id) }}"> <a href="{{ _self.href(bloc.path, bloc.key, item.id) }}">
<span class="badge badge-primary"> <span class="badge bg-primary">
{{ item|chill_entity_render_box({'only_denomination': true}) }} {{ item|chill_entity_render_box({'only_denomination': true}) }}
</span> </span>
</a> </a>
@ -83,7 +83,7 @@
{% for item in bloc.items %} {% for item in bloc.items %}
<li> <li>
<a href="{{ _self.href(bloc.path, bloc.key, item.id) }}"> <a href="{{ _self.href(bloc.path, bloc.key, item.id) }}">
<span class="badge badge-primary"> <span class="badge bg-primary">
{{ item|chill_entity_render_box({'only_denomination': true}) }} {{ item|chill_entity_render_box({'only_denomination': true}) }}
</span> </span>
</a> </a>

View File

@ -128,7 +128,7 @@
<span class="chill-no-data-statement">{{ 'No social actions associated'|trans }}</span> <span class="chill-no-data-statement">{{ 'No social actions associated'|trans }}</span>
{%- else -%} {%- else -%}
{% for r in activity.socialActions %} {% for r in activity.socialActions %}
<span class="badge badge-primary">{{ r.title|localize_translatable_string }}</span> <span class="badge bg-primary">{{ r.title|localize_translatable_string }}</span>
{% endfor %} {% endfor %}
{%- endif -%} {%- endif -%}
</li> </li>

View File

@ -4,7 +4,7 @@
<h1> <h1>
{{ "Activity"|trans }} {{ "Activity"|trans }}
{%- if t.emergencyVisible and entity.emergency -%} {%- if t.emergencyVisible and entity.emergency -%}
<span class="badge badge-secondary"> <span class="badge bg-secondary">
{{- 'Emergency'|trans -}} {{- 'Emergency'|trans -}}
</span> </span>
{%- endif -%} {%- endif -%}

View File

@ -20,13 +20,13 @@
<teleport to="#header-accompanying_course-name #banner-status"> <teleport to="#header-accompanying_course-name #banner-status">
<div v-if="accompanyingCourse.step === 'DRAFT'"> <div v-if="accompanyingCourse.step === 'DRAFT'">
<span class="badge badge-secondary"> <span class="badge bg-secondary">
{{ $t('course.step.draft') }} {{ $t('course.step.draft') }}
</span> </span>
</div> </div>
<div v-else> <div v-else>
<div> <div>
<span class="badge badge-primary"> <span class="badge bg-primary">
{{ $t('course.step.active') }} {{ $t('course.step.active') }}
</span> </span>
</div> </div>

View File

@ -1,5 +1,5 @@
<template> <template>
<span class="badge badge-secondary">{{ issue.text }}</span> <span class="badge bg-secondary">{{ issue.text }}</span>
</template> </template>
<script> <script>

View File

@ -7,11 +7,11 @@
<div> <div>
<p> <p>
{{ $t('confirm.text_draft') }} {{ $t('confirm.text_draft') }}
<span class="badge badge-secondary">{{ $t('course.step.draft') }}</span> <span class="badge bg-secondary">{{ $t('course.step.draft') }}</span>
</p> </p>
<p> <p>
{{ $t('confirm.text_active') }} {{ $t('confirm.text_active') }}
<span class="badge badge-primary">{{ $t('course.step.active') }}</span> <span class="badge bg-primary">{{ $t('course.step.active') }}</span>
</p> </p>
<ul class="record_actions"> <ul class="record_actions">

View File

@ -57,7 +57,7 @@
<p>Motifs, objectifs et dispositifs disponibles pour ajout&nbsp;:</p> <p>Motifs, objectifs et dispositifs disponibles pour ajout&nbsp;:</p>
<ul class="list-objectives"> <ul class="list-objectives">
<li v-for="g in availableForCheckGoal" @click="addGoal(g)" class="badge badge-primary"> <li v-for="g in availableForCheckGoal" @click="addGoal(g)" class="badge bg-primary">
<i class="fa fa-plus"></i> <i class="fa fa-plus"></i>
{{ g.title.fr }} {{ g.title.fr }}
</li> </li>

View File

@ -4,12 +4,12 @@
Aucun résultat associé Aucun résultat associé
</p> </p>
<ul class="list-results"> <ul class="list-results">
<li v-for="r in pickedResults" @click="removeResult(r)" class="badge badge-primary"> <li v-for="r in pickedResults" @click="removeResult(r)" class="badge bg-primary">
<i class="fa fa-times"></i> <i class="fa fa-times"></i>
{{ r.title.fr }} {{ r.title.fr }}
</li> </li>
<template v-if="isExpanded"> <template v-if="isExpanded">
<li v-for="r in availableForCheckResults" @click="addResult(r)" class="badge badge-primary"> <li v-for="r in availableForCheckResults" @click="addResult(r)" class="badge bg-primary">
<i class="fa fa-plus"></i> <i class="fa fa-plus"></i>
{{ r.title.fr }} {{ r.title.fr }}
</li> </li>

View File

@ -4,7 +4,7 @@
<div class="item-col box-person"> <div class="item-col box-person">
<div> <div>
<person :person="conc.person"></person> <person :person="conc.person"></person>
<span v-if="isHolder" class="badge badge-primary holder"> <span v-if="isHolder" class="badge bg-primary holder">
{{ $t('household_members_editor.holder') }} {{ $t('household_members_editor.holder') }}
</span> </span>
</div> </div>

View File

@ -16,7 +16,7 @@
<template v-for="(m, index) in currentMembers()" :key="m.id"> <template v-for="(m, index) in currentMembers()" :key="m.id">
<person :person="m.person"></person> <person :person="m.person"></person>
<span v-if="m.holder"> <span v-if="m.holder">
&nbsp;<span class="badge badge-primary">{{ $t('holder') }}</span> &nbsp;<span class="badge bg-primary">{{ $t('holder') }}</span>
</span> </span>
<span v-if="index != (currentMembersLength() - 1)">, </span> <span v-if="index != (currentMembersLength() - 1)">, </span>
</template> </template>

View File

@ -55,7 +55,7 @@
<p class="title_label">{{ 'accompanying_course_work.results'|trans }}</p> <p class="title_label">{{ 'accompanying_course_work.results'|trans }}</p>
<ul class="result_list"> <ul class="result_list">
{% for r in w.results %} {% for r in w.results %}
<li class="badge badge-primary">{{ r.title|localize_translatable_string }}</li> <li class="badge bg-primary">{{ r.title|localize_translatable_string }}</li>
{% endfor %} {% endfor %}
</ul> </ul>
</div> </div>
@ -77,7 +77,7 @@
<p class="title_label">{{ 'accompanying_course_work.results'|trans }}</p> <p class="title_label">{{ 'accompanying_course_work.results'|trans }}</p>
<ul class="result_list"> <ul class="result_list">
{% for r in g.results %} {% for r in g.results %}
<li class="badge badge-primary">{{ r.title|localize_translatable_string }}</li> <li class="badge bg-primary">{{ r.title|localize_translatable_string }}</li>
{% endfor %} {% endfor %}
</ul> </ul>
{% endif %} {% endif %}

View File

@ -8,23 +8,23 @@
{{'period'|trans}} <b>#{{ accompanying_period.id }}</b> {{'period'|trans}} <b>#{{ accompanying_period.id }}</b>
{% if accompanying_period.emergency %} {% if accompanying_period.emergency %}
&nbsp; &nbsp;
<span class="badge badge-primary"> <span class="badge bg-primary">
{{- 'Emergency'|trans|upper -}} {{- 'Emergency'|trans|upper -}}
</span> </span>
{% endif %} {% endif %}
{% if accompanying_period.confidential %} {% if accompanying_period.confidential %}
&nbsp; &nbsp;
<span class="badge badge-primary"> <span class="badge bg-primary">
{{- 'Confidential'|trans|upper -}} {{- 'Confidential'|trans|upper -}}
</span> </span>
{% endif %} {% endif %}
{% if accompanying_period.step == 'DRAFT' %} {% if accompanying_period.step == 'DRAFT' %}
&nbsp; &nbsp;
<span class="badge badge-primary"> <span class="badge bg-primary">
{{- 'Draft'|trans|upper -}} {{- 'Draft'|trans|upper -}}
</span> </span>
{% else %} {% else %}
<span class="badge badge-primary"> <span class="badge bg-primary">
{{- 'Confirmed'|trans|upper -}} {{- 'Confirmed'|trans|upper -}}
</span> </span>
{% endif %} {% endif %}

View File

@ -1,6 +1,6 @@
{% set reversed_parents = parents|reverse %} {% set reversed_parents = parents|reverse %}
<span class="chill-entity chill-entity__social-action"> <span class="chill-entity chill-entity__social-action">
<span class="{% if not options['no-badge'] %}badge badge-primary{% endif %}"> <span class="{% if not options['no-badge'] %}badge bg-primary{% endif %}">
{%- for p in reversed_parents %} {%- for p in reversed_parents %}
<span class="chill-entity__social-action__parent--{{ loop.revindex0 }}"> <span class="chill-entity__social-action__parent--{{ loop.revindex0 }}">
{{ p.title|localize_translatable_string }}{{ options['default.separator'] }} {{ p.title|localize_translatable_string }}{{ options['default.separator'] }}

View File

@ -1,6 +1,6 @@
{% set reversed_parents = parents|reverse %} {% set reversed_parents = parents|reverse %}
<span class="chill-entity chill-entity__social-issue"> <span class="chill-entity chill-entity__social-issue">
<span class="badge badge-primary"> <span class="badge bg-primary">
{%- for p in reversed_parents %} {%- for p in reversed_parents %}
<span class="chill-entity__social-issue__parent--{{ loop.revindex0 }}"> <span class="chill-entity__social-issue__parent--{{ loop.revindex0 }}">
{{ p.title|localize_translatable_string }}{{ options['default.separator'] }} {{ p.title|localize_translatable_string }}{{ options['default.separator'] }}

View File

@ -45,7 +45,7 @@
class="badge-member{%- if m.holder %} holder{% endif -%}{%- if m.position.ordering >= 2 %} child{% endif -%}" class="badge-member{%- if m.holder %} holder{% endif -%}{%- if m.position.ordering >= 2 %} child{% endif -%}"
title="{{ m.position.label.fr }}"> title="{{ m.position.label.fr }}">
{%- if m.holder %} {%- if m.holder %}
<span class="badge badge-secondary"> <span class="badge bg-secondary">
{{ 'household.holder'|trans }} {{ 'household.holder'|trans }}
</span> </span>
{% endif -%} {% endif -%}

View File

@ -76,7 +76,7 @@
<div> <div>
{{ m.person|chill_entity_render_box({'addLink': true}) }} {{ m.person|chill_entity_render_box({'addLink': true}) }}
{% if m.holder %} {% if m.holder %}
<span class="badge badge-primary">{{ 'household.holder'|trans }}</span> <span class="badge bg-primary">{{ 'household.holder'|trans }}</span>
{% endif %} {% endif %}
</div> </div>
<div> <div>
@ -140,7 +140,7 @@
<div> <div>
{{ m.person|chill_entity_render_box({'addLink': true}) }} {{ m.person|chill_entity_render_box({'addLink': true}) }}
{% if m.holder %} {% if m.holder %}
<span class="badge badge-primary">{{ 'household.holder'|trans }}</span> <span class="badge bg-primary">{{ 'household.holder'|trans }}</span>
{% endif %} {% endif %}
</div> </div>
<div> <div>

View File

@ -90,7 +90,7 @@
<div> <div>
{{ m.person|chill_entity_render_box({'addLink': true}) }} {{ m.person|chill_entity_render_box({'addLink': true}) }}
{% if m.holder %} {% if m.holder %}
<span class="badge badge-primary">{{ 'household.holder'|trans }}</span> <span class="badge bg-primary">{{ 'household.holder'|trans }}</span>
{% endif %} {% endif %}
</div> </div>
<div> <div>
@ -176,7 +176,7 @@
<div> <div>
{{ m.person|chill_entity_render_box({'addLink': true}) }} {{ m.person|chill_entity_render_box({'addLink': true}) }}
{% if m.holder %} {% if m.holder %}
<span class="badge badge-primary">{{ 'household.holder'|trans }}</span> <span class="badge bg-primary">{{ 'household.holder'|trans }}</span>
{% endif %} {% endif %}
</div> </div>
<div> <div>

View File

@ -78,7 +78,7 @@
{{ 'household.Household number'|trans({'household_num': p.household.id }) }} {{ 'household.Household number'|trans({'household_num': p.household.id }) }}
</a> </a>
</p> </p>
<p>{{ p.position.label|localize_translatable_string }} {% if p.holder %}<span class="badge badge-primary">{{ 'household.holder'|trans }}</span>{% endif %} <p>{{ p.position.label|localize_translatable_string }} {% if p.holder %}<span class="badge bg-primary">{{ 'household.holder'|trans }}</span>{% endif %}
</div> </div>
<div> <div>
{% set simultaneous = p.household.getMembersDuringMembership(p) %} {% set simultaneous = p.household.getMembersDuringMembership(p) %}
@ -90,7 +90,7 @@
{{ 'household.Members at same time'|trans }}: {{ 'household.Members at same time'|trans }}:
{% for p in simultaneous -%} {% for p in simultaneous -%}
{{- p.person|chill_entity_render_box({'addLink': true }) -}} {{- p.person|chill_entity_render_box({'addLink': true }) -}}
{%- if p.holder %} <span class="badge badge-primary">{{'household.holder'|trans }}</span> {% endif %} {%- if p.holder %} <span class="badge bg-primary">{{'household.holder'|trans }}</span> {% endif %}
{%- if not loop.last %}, {% endif -%} {%- if not loop.last %}, {% endif -%}
{%- endfor -%} {%- endfor -%}
{% endif %} {% endif %}
@ -164,7 +164,7 @@
{{ 'household.Household number'|trans({'household_num': p.household.id }) }} {{ 'household.Household number'|trans({'household_num': p.household.id }) }}
</a> </a>
</p> </p>
<p>{{ p.position.label|localize_translatable_string }} {% if p.holder %}<span class="badge badge-primary">{{ 'household.holder'|trans }}</span>{% endif %} <p>{{ p.position.label|localize_translatable_string }} {% if p.holder %}<span class="badge bg-primary">{{ 'household.holder'|trans }}</span>{% endif %}
</div> </div>
<div> <div>
{% set simultaneous = p.household.getMembersDuringMembership(p) %} {% set simultaneous = p.household.getMembersDuringMembership(p) %}
@ -176,7 +176,7 @@
{{ 'household.Members at same time'|trans }}: {{ 'household.Members at same time'|trans }}:
{% for p in simultaneous -%} {% for p in simultaneous -%}
{{- p.person|chill_entity_render_box({'addLink': true }) -}} {{- p.person|chill_entity_render_box({'addLink': true }) -}}
{%- if p.holder %} <span class="badge badge-primary">{{'household.holder'|trans }}</span> {% endif %} {%- if p.holder %} <span class="badge bg-primary">{{'household.holder'|trans }}</span> {% endif %}
{%- if not loop.last %}, {% endif -%} {%- if not loop.last %}, {% endif -%}
{%- endfor -%} {%- endfor -%}
{% endif %} {% endif %}