From 18b0650cc5235f482aff35b99fea696d206fb900 Mon Sep 17 00:00:00 2001 From: paidge <paidge_cs@hotmail.com> Date: Tue, 15 Feb 2022 03:22:25 +0100 Subject: [PATCH] correcting bootstrap styles --- assets/css/style.scss | 4 ++-- components/btn/Clipboard.vue | 16 +++++++--------- components/member/Card.vue | 32 ++++++++++++++------------------ 3 files changed, 23 insertions(+), 29 deletions(-) diff --git a/assets/css/style.scss b/assets/css/style.scss index 246da3b..ac1eba8 100644 --- a/assets/css/style.scss +++ b/assets/css/style.scss @@ -38,8 +38,8 @@ $info: #0a8299; @import "font"; @import "bootstrap"; -.btn:disabled { - cursor: not-allowed; +.badge.bg-warning { + color: var(--bs-dark); } .table { diff --git a/components/btn/Clipboard.vue b/components/btn/Clipboard.vue index 1ccd7c1..8a60f96 100644 --- a/components/btn/Clipboard.vue +++ b/components/btn/Clipboard.vue @@ -1,14 +1,12 @@ <template> <div class="clipboard input-group mb-3 mx-auto"> - <div class="input-group-prepend"> - <button - id="btncopy" - class="btn btn-info px-4 py-1" - type="button" - @click="copyText"> - <outline-clipboard-copy-icon class="icon" /> - </button> - </div> + <button + id="btncopy" + class="btn btn-info px-4 py-1" + type="button" + @click="copyText"> + <outline-clipboard-copy-icon class="icon" /> + </button> <input type="text" class="form-control text-truncate" diff --git a/components/member/Card.vue b/components/member/Card.vue index 055aac0..616ddf0 100644 --- a/components/member/Card.vue +++ b/components/member/Card.vue @@ -31,8 +31,8 @@ <th scope="row">{{ $t("membre.referent.title") }} :</th> <td :class="{ - 'list-group-item-success': hash.sentry, - 'list-group-item-warning': !hash.sentry + 'table-success': hash.sentry, + 'table-warning': !hash.sentry }"> {{ hash.sentry ? $t("oui") : $t("non") }} </td> @@ -41,8 +41,8 @@ <th scope="row">{{ $t("membre.qualite.title") }} :</th> <td :class="{ - 'list-group-item-success': hash.quality.ratio >= 80, - 'list-group-item-warning': hash.quality.ratio < 80 + 'table-success': hash.quality.ratio >= 80, + 'table-warning': hash.quality.ratio < 80 }"> {{ Math.round(hash.quality.ratio * 100) / 100 }} </td> @@ -51,11 +51,11 @@ <th scope="row">{{ $t("membre.distance.title") }} :</th> <td :class="{ - 'list-group-item-success': + 'table-success': hash.status != 'NEWCOMER' ? hash.distance.dist_ok : hash.distanceE.dist_ok, - 'list-group-item-danger': + 'table-danger': hash.status != 'NEWCOMER' ? !hash.distance.dist_ok : !hash.distanceE.dist_ok @@ -78,9 +78,8 @@ <td :class=" hash.status != 'MISSING' - ? 'list-group-item-' + - $options.filters.dateStatus(hash.limitDate) - : 'list-group-item-danger' + ? 'table-' + $options.filters.dateStatus(hash.limitDate) + : 'table-danger' "> {{ $d(new Date(hash.limitDate * 1000), "long") }} </td> @@ -89,8 +88,7 @@ <th scope="row">{{ $t("membre.datemanquecertifs") }} :</th> <td :class=" - 'list-group-item-' + - $options.filters.dateStatus(hash.certsLimit) + 'table-' + $options.filters.dateStatus(hash.certsLimit) "> {{ $d(new Date(hash.certsLimit * 1000), "long") }} </td> @@ -99,8 +97,8 @@ <th scope="row">{{ $t("membre.dispocertif") }} :</th> <td :class="{ - 'list-group-item-success': hash.minDatePassed, - 'list-group-item-danger': !hash.minDatePassed + 'table-success': hash.minDatePassed, + 'table-danger': !hash.minDatePassed }"> {{ hash.minDatePassed ? $t("oui") : $t("non") }} <small v-if="!hash.minDatePassed" @@ -112,11 +110,9 @@ <th scope="row">{{ $t("membre.nb_certifs") }} :</th> <td :class="{ - 'list-group-item-success': - hash.sent_certifications.length <= 80, - 'list-group-item-warning': - hash.sent_certifications.length > 80, - 'list-group-item-danger': hash.sent_certifications.length > 90 + 'table-success': hash.sent_certifications.length <= 80, + 'table-warning': hash.sent_certifications.length > 80, + 'table-danger': hash.sent_certifications.length > 90 }"> {{ 100 - hash.sent_certifications.length }} </td> -- GitLab