Merge remote-tracking branch 'origin/master' into features/household-editor

This commit is contained in:
2021-06-09 16:27:03 +02:00
111 changed files with 4828 additions and 5415 deletions

View File

@@ -44,7 +44,6 @@ div.list-household-members--summary {
}
}
}
.chill-entity__person {
.chill-entity__person__first-name,
.chill-entity__person__last-name,
@@ -55,5 +54,3 @@ div.list-household-members--summary {
}
}
}

View File

@@ -1,9 +1,9 @@
<template>
<div>
<a @click="toggleIntensity" class="flag-toggle">
{{ $t('course.occasional') }}
<span :class="{ 'on': !isRegular }">{{ $t('course.occasional') }}</span>
<i class="fa" :class="{ 'fa-toggle-on': isRegular, 'fa-toggle-on fa-flip-horizontal': !isRegular }"></i>
{{ $t('course.regular') }}
<span :class="{ 'on': isRegular }">{{ $t('course.regular') }}</span>
</a>
</div>
@@ -76,6 +76,9 @@ export default {
i {
margin: auto 0.4em;
}
span.on {
font-weight: bolder;
}
}
button.badge {
margin-left: 0.8em;

View File

@@ -56,7 +56,6 @@
</li>
</ul>
</div>
<ul class="record_actions">
<li>
<button class="sc-button bt-remove"
@@ -66,7 +65,6 @@
</button>
</li>
</ul>
</div>
<div v-else>
<label>{{ $t('requestor.counter') }}</label>
@@ -147,7 +145,6 @@ div.flex-table {
}
div.item-bloc {
background-color: white !important;
border: 1px solid #000;
padding: 1em;
margin-top: 1em;
.content-bloc {

View File

@@ -13,7 +13,7 @@
track-by="id"
label="text"
:multiple="true"
:searchable="false"
:searchable="true"
:placeholder="$t('social_issue.label')"
@update:model-value="updateSocialIssues"
:model-value="value"
@@ -75,6 +75,6 @@ export default {
<style src="vue-multiselect/dist/vue-multiselect.css"></style>
<style lang="scss">
span.multiselect__tag {
background: #e2793d;
background: var(--chill-orange);
}
</style>

View File

@@ -1,9 +1,9 @@
<template>
<ul class="record_actions">
<li>
<button class="sc-button bt-create" @click="openModal">
<li class="add-persons">
<a class="sc-button bt-create" @click="openModal">
{{ $t(buttonTitle) }}
</button>
</a>
</li>
</ul>
@@ -220,6 +220,11 @@ export default {
</script>
<style lang="scss">
li.add-persons {
a {
cursor: pointer;
}
}
div.body-head {
overflow-y: unset;
div.modal-body:first-child {