From 731ba1b77bd4976183258fd9efeeb4e59d93ecbe Mon Sep 17 00:00:00 2001 From: Marie Leuliette Date: Mon, 25 Apr 2022 17:56:37 +0200 Subject: [PATCH] Alignement champ de saisi et bouton lecture sans entete dans la question --- src/situations/cafe_de_la_place/data/defis.js | 1 - src/situations/commun/styles/defi.scss | 6 +++++ .../commun/styles/defi/champ_saisie.scss | 1 + src/situations/commun/vues/defi.vue | 23 ++++++++++++------- 4 files changed, 22 insertions(+), 9 deletions(-) diff --git a/src/situations/cafe_de_la_place/data/defis.js b/src/situations/cafe_de_la_place/data/defis.js index 2807b4e3a..32e48cbf0 100644 --- a/src/situations/cafe_de_la_place/data/defis.js +++ b/src/situations/cafe_de_la_place/data/defis.js @@ -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, diff --git a/src/situations/commun/styles/defi.scss b/src/situations/commun/styles/defi.scss index 2f7df1e63..1a4bcd67f 100644 --- a/src/situations/commun/styles/defi.scss +++ b/src/situations/commun/styles/defi.scss @@ -53,6 +53,12 @@ &-contenu { flex-grow: 2; margin-top: 0.5rem; + + &--centre { + display: flex; + flex-direction: column; + justify-content: center; + } } &-label { diff --git a/src/situations/commun/styles/defi/champ_saisie.scss b/src/situations/commun/styles/defi/champ_saisie.scss index e29954458..962414b33 100644 --- a/src/situations/commun/styles/defi/champ_saisie.scss +++ b/src/situations/commun/styles/defi/champ_saisie.scss @@ -4,6 +4,7 @@ &--decale { margin-left: 2.25rem; } + .bouton-lecture--avec-texte { margin-top: 1.5rem; } diff --git a/src/situations/commun/vues/defi.vue b/src/situations/commun/vues/defi.vue index eb400c2cc..72286ade1 100644 --- a/src/situations/commun/vues/defi.vue +++ b/src/situations/commun/vues/defi.vue @@ -13,16 +13,19 @@ > -
+
@@ -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); } },