Skip to content

Commit

Permalink
Alignement champ de saisi et bouton lecture sans entete dans la question
Browse files Browse the repository at this point in the history
  • Loading branch information
marouria authored and cprodhomme committed Apr 25, 2022
1 parent 0939fcd commit 731ba1b
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 9 deletions.
1 change: 0 additions & 1 deletion src/situations/cafe_de_la_place/data/defis.js
Original file line number Diff line number Diff line change
Expand Up @@ -888,7 +888,6 @@ const APlc20 = {

const configurationNormale = {
series: [
{ cartes: [ APlc1, APlc2, APlc3, APlc4, APlc5, APlc6, APlc7, APlc8, APlc9, APlc10, APlc11, APlc12, APlc13, APlc14, APlc15, APlc16, APlc17, APlc18, APlc19, APlc20 ] },
{ cartes: [ sousConsigneALrd1, sousConsigneALrd2 ] },
{
texteCliquable: listeChansons,
Expand Down
6 changes: 6 additions & 0 deletions src/situations/commun/styles/defi.scss
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,12 @@
&-contenu {
flex-grow: 2;
margin-top: 0.5rem;

&--centre {
display: flex;
flex-direction: column;
justify-content: center;
}
}

&-label {
Expand Down
1 change: 1 addition & 0 deletions src/situations/commun/styles/defi/champ_saisie.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
&--decale {
margin-left: 2.25rem;
}

.bouton-lecture--avec-texte {
margin-top: 1.5rem;
}
Expand Down
23 changes: 15 additions & 8 deletions src/situations/commun/vues/defi.vue
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,19 @@
>
<slot />
<question-entete
:question="question"
ref="questionEntete"
:question="question"
ref="questionEntete"
/>
<div class="question-contenu">
<div
class="question-contenu"
:class="{'question-contenu--centre': questionSansEntete }"
>
<component
v-if="composantContenu"
:is="composantContenu"
:question="question"
v-model="reponse"
ref="composantContenu"
v-if="composantContenu"
:is="composantContenu"
:question="question"
v-model="reponse"
ref="composantContenu"
/>
</div>
<video-question :nomTechnique="question.nom_technique"/>
Expand Down Expand Up @@ -109,6 +112,10 @@ export default {
texteBouton () {
return this.question.type == 'sous-consigne' ? 'defi.suivant' : 'defi.valider';
},
questionSansEntete () {
return (!this.question.intitule && !this.question.description && !this.question.modalite_reponse);
}
},
Expand Down

0 comments on commit 731ba1b

Please sign in to comment.