diff --git a/assets/css/style.scss b/assets/css/style.scss index ac1eba83600f8978799e99dd88009621c6e68b61..5d5a4117f097249d56982a86cf0289ab3ab0c222 100644 --- a/assets/css/style.scss +++ b/assets/css/style.scss @@ -47,6 +47,10 @@ $info: #0a8299; table-layout: fixed; } + & > :not(:first-child) { + border-top: none; + } + &.sortable thead { tr { border-left: 1px solid var(--text-primary-color); diff --git a/components/btn/Clipboard.vue b/components/btn/Clipboard.vue index 8a60f96dfa468d2344f0d803564fd578ffa25047..5c4b56a78126e7554e01f48cf375aac9665b39e1 100644 --- a/components/btn/Clipboard.vue +++ b/components/btn/Clipboard.vue @@ -16,6 +16,8 @@ </template> <script> +import Tooltip from "~/node_modules/bootstrap/js/dist/tooltip" + export default { props: { textContent: { @@ -26,14 +28,16 @@ export default { methods: { copyText() { navigator.clipboard.writeText(this.textContent) - // $("#btncopy").tooltip({ - // title: this.$t("copie") + " !", - // trigger: "manual" - // }) - // $("#btncopy").tooltip("show") - // setTimeout(() => { - // $("#btncopy").tooltip("hide") - // }, 1000) + let btn = document.querySelector("#btncopy") + let tooltip = new Tooltip(btn, { + title: this.$t("copie") + " !", + trigger: "manual" + }) + + tooltip.show() + setTimeout(() => { + tooltip.hide() + }, 1000) } } } diff --git a/components/member/Card.vue b/components/member/Card.vue index 616ddf05b1905af2067bbf35b0bb797ebb2a789d..a0eee30367687ff2f01199593221da83aa5ffe0c 100644 --- a/components/member/Card.vue +++ b/components/member/Card.vue @@ -3,7 +3,7 @@ <div class="card-body"> <div class="uid-wrapper d-flex align-items-center justify-content-between mb-4"> - <h2 class="card-title text-center d-flex align-items-center"> + <h2 class="h3 card-title text-center d-flex align-items-center"> <span class="text-truncate d-inline-block"> {{ hash.uid }} </span> diff --git a/nuxt.config.js b/nuxt.config.js index f2984f2aff02d668b230c7441068945e827ef132..859393e3b430a79d8120f1c877bf4fb284e7b179 100644 --- a/nuxt.config.js +++ b/nuxt.config.js @@ -1,5 +1,4 @@ import i18n from "./i18n" -import webpack from "webpack" import pkg from "./package.json" export default { @@ -31,11 +30,7 @@ export default { css: ["@/assets/css/style.scss"], // Plugins to run before rendering page: https://go.nuxtjs.dev/config-plugins - plugins: [ - "~plugins/favourites.js", - "~plugins/filters.js", - { src: "~/plugins/bootstrap.js", mode: "client" } - ], + plugins: ["~plugins/favourites.js", "~plugins/filters.js"], // Auto import components: https://go.nuxtjs.dev/config-components components: true, diff --git a/pages/previsions/index.vue b/pages/previsions/index.vue index ad3009e57a9a56b4659eb402e3bc8f320f091da2..704b0278c5fb885195d9d6aa241d9738d23144de 100644 --- a/pages/previsions/index.vue +++ b/pages/previsions/index.vue @@ -113,7 +113,7 @@ <td class="p-0"> <div class="list-group rounded-0"> <nuxt-link - class="list-group-item list-group-item-action border-0 d-flex justify-content-between" + class="list-group-item list-group-item-action border-0 d-flex justify-content-between p-3" :to=" localePath('/membre/?hash=' + member.member.hash) " diff --git a/plugins/bootstrap.js b/plugins/bootstrap.js deleted file mode 100644 index af4c79da2707d7edb450607c6cb22012e2b36517..0000000000000000000000000000000000000000 --- a/plugins/bootstrap.js +++ /dev/null @@ -1 +0,0 @@ -import bootstrap from "bootstrap" diff --git a/plugins/favourites.js b/plugins/favourites.js index d140fccc276e69be228a80c680752c792067d1b0..f4c53022674a5c2e5821df84b85a2e11a76a2674 100644 --- a/plugins/favourites.js +++ b/plugins/favourites.js @@ -1,4 +1,5 @@ import Vue from "vue" +import Tooltip from "~/node_modules/bootstrap/js/dist/tooltip" export default (context, inject) => { let liste_favoris = localStorage.favourites @@ -6,20 +7,21 @@ export default (context, inject) => { : [] let toggleFavourite = (uid, e) => { - // $(e.target).tooltip({ - // title: function () { - // return context.$favourites.list.includes(uid) - // ? context.app.i18n.t("favoris.supprime") - // : context.app.i18n.t("favoris.enregistre") - // }, - // html: true, - // trigger: "manual" - // }) + let btn = e.currentTarget + let tooltip = new Tooltip(btn, { + title: function () { + return context.$favourites.list.includes(uid) + ? context.app.i18n.t("favoris.supprime") + : context.app.i18n.t("favoris.enregistre") + }, + html: true, + trigger: "manual" + }) - // $(e.target).tooltip("show") - // setTimeout(() => { - // $(e.target).tooltip("hide") - // }, 600) + tooltip.show() + setTimeout(() => { + tooltip.hide() + }, 1000) if (!context.$favourites.list.includes(uid)) { context.$favourites.list.push(uid)