From 8fc1a35c07ea8161b230201eac2b91fa635faba5 Mon Sep 17 00:00:00 2001 From: paidge <paidge_cs@hotmail.com> Date: Mon, 14 Feb 2022 11:58:06 +0100 Subject: [PATCH] deletion of small tags on badges --- assets/css/style.scss | 2 +- components/badge/Dispo.vue | 34 ++++++++++++++++------------------ components/badge/Quality.vue | 18 ++++++++---------- components/badge/Status.vue | 8 +++----- components/certif/List.vue | 6 +++--- components/member/Card.vue | 2 +- 6 files changed, 32 insertions(+), 38 deletions(-) diff --git a/assets/css/style.scss b/assets/css/style.scss index e12c4b9..3432e1c 100644 --- a/assets/css/style.scss +++ b/assets/css/style.scss @@ -77,7 +77,7 @@ $info: #0a8299; } .td-date { - width: 160px; + width: 165px; } } diff --git a/components/badge/Dispo.vue b/components/badge/Dispo.vue index 0a434bc..885d99e 100644 --- a/components/badge/Dispo.vue +++ b/components/badge/Dispo.vue @@ -1,22 +1,20 @@ <template> - <small> - <span - class="badge" - :class="{ - 'badge-success': isDispo, - 'badge-danger': !isDispo - }"> - {{ - isDispo - ? $t("membre.dispo") - : "â± " + - nbPendingCertifs + - " ( " + - $d(new Date(dateDispo * 1000), "short") + - ")" - }} - </span> - </small> + <span + class="badge" + :class="{ + 'badge-success': isDispo, + 'badge-danger': !isDispo + }"> + {{ + isDispo + ? $t("membre.dispo") + : "â± " + + nbPendingCertifs + + " ( " + + $d(new Date(dateDispo * 1000), "short") + + ")" + }} + </span> </template> <script> diff --git a/components/badge/Quality.vue b/components/badge/Quality.vue index 0f9c000..58584e4 100644 --- a/components/badge/Quality.vue +++ b/components/badge/Quality.vue @@ -1,14 +1,12 @@ <template> - <small> - <span - class="badge" - :class="{ - 'badge-success': quality >= 80, - 'badge-warning': quality < 80 - }"> - {{ Math.round(quality * 100) / 100 }} - </span> - </small> + <span + class="badge" + :class="{ + 'badge-success': quality >= 80, + 'badge-warning': quality < 80 + }"> + {{ Math.round(quality * 100) / 100 }} + </span> </template> <script> diff --git a/components/badge/Status.vue b/components/badge/Status.vue index 086493d..98cf50f 100644 --- a/components/badge/Status.vue +++ b/components/badge/Status.vue @@ -1,9 +1,7 @@ <template> - <small> - <span class="badge" :class="this.displayStatus(membre).class"> - {{ this.displayStatus(membre).str }} - </span> - </small> + <span class="badge" :class="this.displayStatus(membre).class"> + {{ this.displayStatus(membre).str }} + </span> </template> <script> diff --git a/components/certif/List.vue b/components/certif/List.vue index 3e4b242..7c9e328 100644 --- a/components/certif/List.vue +++ b/components/certif/List.vue @@ -54,9 +54,9 @@ </th> <td class="text-right py-1"> <BadgeDate :date="certif.expires_on" styleDate="short" /> - <small class="d-block" v-if="certif.pending"> - <span class="badge badge-secondary">{{ $t("traitement") }}</span> - </small> + <span class="badge badge-secondary" v-if="certif.pending">{{ + $t("traitement") + }}</span> </td> </tr> </tbody> diff --git a/components/member/Card.vue b/components/member/Card.vue index b6979e4..b128a13 100644 --- a/components/member/Card.vue +++ b/components/member/Card.vue @@ -7,7 +7,7 @@ <span class="text-truncate d-inline-block"> {{ hash.uid }} </span> - <BadgeStatus class="ml-2" :membre="hash" /> + <small><BadgeStatus class="ml-2" :membre="hash" /></small> </h2> <button id="favori" -- GitLab