Merge branch 'bootstrap5_replacing_scratch_mat' into bootstrap5_replacing_scratch

This commit is contained in:
2021-07-06 13:50:17 +02:00
166 changed files with 693 additions and 537 deletions

View File

@@ -30,10 +30,10 @@
<ul class="record_actions">
<li>
<button type="submit" class="sc-button bt-save">{{ $t('action.save') }}</button>
<button type="submit" class="btn btn-save">{{ $t('action.save') }}</button>
</li>
<li v-if="initialComment !== null">
<a class="sc-button bt-delete"
<a class="btn btn-delete"
@click="removeComment">
{{ $t('action.delete') }}
</a>

View File

@@ -16,7 +16,7 @@
<ul class="record_actions">
<li>
<button class="sc-button bt-save" @click="modal.showModal = true">
<button class="btn btn-save" @click="modal.showModal = true">
{{ $t('confirm.ok') }}
</button>
</li>
@@ -32,7 +32,7 @@
<p>{{ $t('confirm.sure_description') }}</p>
</template>
<template v-slot:footer>
<button class="sc-button red" @click="confirmCourse">
<button class="btn btn-danger" @click="confirmCourse">
{{ $t('confirm.ok') }}
</button>
</template>

View File

@@ -27,18 +27,18 @@
</on-the-fly>
</li>
<!--li>
<button class="sc-button bt-delete"
<button class="btn btn-delete"
:title="$t('action.delete')"
@click.prevent="$emit('remove', participation)">
</button>
</li-->
<li>
<button v-if="!participation.endDate"
class="sc-button bt-remove"
class="btn btn-remove"
v-bind:title="$t('action.remove')"
@click.prevent="$emit('close', participation)">
</button>
<button v-else class="sc-button bt-remove disabled"></button>
<button v-else class="btn btn-remove disabled"></button>
</li>
</ul>
</td>

View File

@@ -22,7 +22,7 @@
<ul class="record_actions">
<li>
<button
class="sc-button bt-create"
class="btn btn-create"
type="button"
name="button"
@click="assignMe">

View File

@@ -58,7 +58,7 @@
</div>
<ul class="record_actions">
<li>
<button class="sc-button bt-remove"
<button class="btn btn-remove"
:title="$t('action.remove')"
@click="removeRequestor">
{{ $t('action.remove') }}

View File

@@ -36,7 +36,7 @@
</li>
<li>
<button
class="sc-button bt-remove"
class="btn btn-remove"
v-bind:title="$t('action.remove')"
@click.prevent="$emit('remove', resource)">
</button>

View File

@@ -5,12 +5,12 @@
<!-- Modal -->
<ul class="record_actions">
<li>
<button class="sc-button bt-create" @click="modal1.showModal = true">
<button class="btn btn-create" @click="modal1.showModal = true">
{{ $t('action.show_modal') }}
</button>
</li>
<li>
<button class="sc-button bt-create" @click="modal2.showModal = true">
<button class="btn btn-create" @click="modal2.showModal = true">
Ouvrir une seconde modale
</button>
</li>
@@ -30,7 +30,7 @@
<p>Quisque non erat tincidunt, lacinia justo ut, pulvinar nisl. Nunc id enim ut sem pretium interdum consectetur eu quam. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia curae; Etiam posuere erat eget augue finibus luctus. Maecenas auctor, tortor non luctus ultrices, neque neque porttitor ex, nec lacinia lorem ligula et elit. Sed tempor nulla vitae lorem sollicitudin dictum. Vestibulum nec arcu eget elit pulvinar pretium. Phasellus facilisis metus sed diam luctus, feugiat scelerisque velit dignissim.</p>
</template>
<template v-slot:footer>
<button class="sc-button green" @click="modal1.showModal = false; modal2.showModal = true">
<button class="btn btn-create" @click="modal1.showModal = false; modal2.showModal = true">
{{ $t('action.next')}}</button>
</template>
</modal>
@@ -45,7 +45,7 @@
<p>modal 2</p>
</template>
<template v-slot:footer>
<button class="sc-button green" @click="modal2.showModal = false">
<button class="btn btn-create" @click="modal2.showModal = false">
{{ $t('action.save')}}</button>
</template>
</modal>

View File

@@ -62,16 +62,16 @@
<div>
<ul class="record_actions">
<li class="cancel">
<a href="#" class="sc-button bt-cancel">
<li class="btn btn-cancel">
<a href="#" class="btn btn-cancel">
{{ $t('action.cancel') }}
</a>
</li>
<li v-if="hasSocialActionPicked">
<button class="sc-button bt-save" v-show="!isPostingWork" @click="submit">
<button class="btn btn-save" v-show="!isPostingWork" @click="submit">
{{ $t('action.save') }}
</button>
<button class="sc-button bt-save" v-show="isPostingWork" disabled>
<button class="btn btn-save" v-show="isPostingWork" disabled>
{{ $t('Save') }}
</button>
</li>

View File

@@ -65,7 +65,7 @@
</div>
<ul class="record_actions">
<li>
<button @click="toggleAddObjective" class="sc-button bt-create">
<button @click="toggleAddObjective" class="btn btn-create">
Ajouter un objectif
</button>
</li>
@@ -115,7 +115,7 @@
<ul class="record_actions">
<li>
<button class="sc-button bt-delete" @click="removeHandlingThirdParty">
<button class="btn btn-delete" @click="removeHandlingThirdParty">
Supprimer le tiers traitant
</button>
</li>
@@ -139,7 +139,7 @@
<show-address :address="t.address"></show-address>
<ul class="record_actions">
<button class="sc-button bt-delete" @click="removeThirdParty(t)"></button>
<button class="btn btn-delete" @click="removeThirdParty(t)"></button>
</ul>
</li>
</ul>
@@ -170,7 +170,7 @@
<ul class="record_actions sticky-form-buttons">
<li v-if="!isPosting">
<button
class="sc-button bt-save"
class="btn btn-save"
@click="submit"
>
{{ $t('action.save') }}
@@ -178,7 +178,7 @@
</li>
<li v-if="isPosting">
<button
class="sc-button bt-save"
class="btn btn-save"
disabled
>
{{ $t('action.save') }}

View File

@@ -17,13 +17,13 @@
</ul>
<ul class="record_actions">
<li v-if="isExpanded">
<button @click="toggleSelect" class="sc-button bt-hide" >
<button @click="toggleSelect" class="btn btn-hide" >
<i class="fa fa-eye-slash"></i>
Masquer résultats et orientations disponibles
</button>
</li>
<li v-else>
<button @click="toggleSelect" class="sc-button bt-show">
<button @click="toggleSelect" class="btn btn-show">
Afficher résultats et orientations disponibles
</button>
</li>

View File

@@ -33,11 +33,11 @@
</div>
<div>
<ul class="record_actions sticky-form-buttons">
<li class="cancel">
<a :href=backUrl class="sc-button bt-cancel">{{ $t('back_to_the_list') }}</a>
<li class="btn btn-cancel">
<a :href=backUrl class="btn btn-cancel">{{ $t('back_to_the_list') }}</a>
</li>
<li>
<button type="submit" class="sc-button bt-update centered" @click="addToHousehold">
<button type="submit" class="btn btn-update centered" @click="addToHousehold">
{{ $t('add_an_address_to_household') }}
</button>
</li>

View File

@@ -60,7 +60,7 @@
</template>
<button v-if="conc.allowRemove" @click="removeConcerned(conc)" class="btn bt-primary">
<button v-if="conc.allowRemove" @click="removeConcerned(conc)" class="btn btn-primary">
{{ $t('household_members_editor.remove_concerned') }}
</button>
</div>

View File

@@ -19,7 +19,7 @@
<ul class="record_actions sticky-form-buttons">
<li>
<button class="sc-button bt-save" :disabled="hasWarnings" @click="confirm">
<button class="btn btn-save" :disabled="hasWarnings" @click="confirm">
{{ $t('household_members_editor.confirmation.save') }}
</button>
</li>

View File

@@ -16,7 +16,7 @@
<ul v-if="allowChangeHousehold" class="record_actions">
<li v-if="!showHouseholdSuggestion">
<button
class="sc-button"
class="btn"
@click="toggleHouseholdSuggestion"
>
{{ $tc('household_members_editor.show_household_suggestion',
@@ -25,24 +25,24 @@
</li>
<li v-if="showHouseholdSuggestion">
<button
class="sc-button"
class="btn"
@click="toggleHouseholdSuggestion"
>
{{ $t('household_members_editor.hide_household_suggestion') }}
</button>
</li>
<li v-if="allowHouseholdCreate">
<button class="sc-button bt-create" @click="createHousehold">
<button class="btn btn-create" @click="createHousehold">
{{ $t('household_members_editor.household.create_household') }}
</button>
</li>
<li v-if="allowHouseholdSearch">
<button class="sc-button">
<button class="btn">
<i class="fa fa-search"></i>{{ $t('household_members_editor.household.search_household') }}
</button>
</li>
<li v-if="allowLeaveWithoutHousehold" >
<button @click="forceLeaveWithoutHousehold" class="sc-button bt-orange">
<button @click="forceLeaveWithoutHousehold" class="btn btn-orange">
<i class="fa fa-sign-out"></i>{{ $t('household_members_editor.household.leave_without_household') }}
</button>
</li>
@@ -60,7 +60,7 @@
<ul class="record_actions">
<li>
<button class="sc-button" @click="selectHousehold(h)">
<button class="btn" @click="selectHousehold(h)">
{{ $t('household_members_editor.select_household') }}
</button>
</li>

View File

@@ -1,7 +1,7 @@
<template>
<ul class="record_actions">
<li class="add-persons">
<a class="sc-button bt-create" @click="openModal">
<a class="btn btn-create" @click="openModal">
{{ $t(buttonTitle) }}
</a>
</li>
@@ -77,9 +77,9 @@
</template>
<template v-slot:footer>
<button class="sc-button green"
<button class="btn btn-create"
@click.prevent="$emit('addNewPersons', { selected, modal })">
<i class="fa fa-plus fa-fw"></i>{{ $t('action.add')}}
{{ $t('action.add')}}
</button>
</template>

View File

@@ -90,7 +90,8 @@ export default {
margin-left: 0.5em;
align-self: baseline;
}
a.sc-button {
a.btn {
border: 1px solid lightgrey;
font-size: 70%;
padding: 4px;