diff --git a/components/member/Card.vue b/components/member/Card.vue index fc0e575d45705e3b220189a2ca788638263f475c..213468f2cd5536b32a6c8e4bc5dc6cf38ec378dd 100644 --- a/components/member/Card.vue +++ b/components/member/Card.vue @@ -1,11 +1,11 @@ <template> <div class="card member"> <div class="card-body"> - <h2 class="card-title"> + <h2 class="card-title text-center"> {{ hash.uid }} <BadgeStatus :membre="hash" /> </h2> - <div class="card-subtitle mb-2 text-muted">{{ hash.pubkey }}</div> + <div class="card-subtitle mb-2 text-muted text-center">{{ hash.pubkey }}</div> <table class="table table-sm table-borderless" v-if="hash.status != 'REVOKED'"> <tbody> <tr v-if="hash.status == 'MEMBER'"> @@ -73,4 +73,8 @@ export default { .member th text-align: right + +.table + width: auto + margin: auto </style> \ No newline at end of file diff --git a/components/navigation/Bar.vue b/components/navigation/Bar.vue index f149664e1d788c8bdc472e6574f7fd73e3a730cd..5b02697e9d5aca3e229dcafb9b639c2395b2ef15 100644 --- a/components/navigation/Bar.vue +++ b/components/navigation/Bar.vue @@ -29,7 +29,7 @@ export default { }, mounted() { this.isOpen = localStorage.getItem("menu-open") - if (this.isOpen) { + if (this.isOpen == 'true') { document.querySelector('.app').classList.add('open') } } diff --git a/components/navigation/menu/Sidebar.vue b/components/navigation/menu/Sidebar.vue index 0d1b09ca854db54a29c1cccb7f9e2530e3c93050..6677dc0dffd40519ea06dd0d4b5bf1c110dff1e0 100644 --- a/components/navigation/menu/Sidebar.vue +++ b/components/navigation/menu/Sidebar.vue @@ -1,13 +1,10 @@ <template> <aside class="menu shadow position-fixed"> <div class="nav_header pb-3 mb-5"> - - <nuxt-link :to="localePath('/')" class="d-flex"> <div><img src="@/assets/img/logo.png" alt="Accueil" class="logo"></div> <div><h1 class="h2">Wotwizard</h1><small class="text-muted">{{ $t('slogan') }}</small></div> </nuxt-link> - <button type="button" class="close position-absolute d-xl-none" aria-label="Close" @click="toggleMenu"> <span aria-hidden="true">×</span> </button> diff --git a/pages/index.vue b/pages/index.vue index 982266404118d7cc7894a781f27f1c1c51241687..edb0d8ef3e70f1acd6c40da1215e011bc35cbb2c 100644 --- a/pages/index.vue +++ b/pages/index.vue @@ -8,11 +8,11 @@ <transition name="fade"> <div class="result" v-if="newMembers"> <div class="row text-center"> - <div class="col-lg-4"> + <div class="col-md-6 col-lg-4"> <h2 class="h4 text-success">{{ $t('bienvenue') }}</h2> <MemberList :members="newMembers['entrees']" :displayPubkey="false" :displayHead="false" /> </div> - <div class="col-lg-4"> + <div class="col-md-6 col-lg-4"> <h2 class="h4 text-danger">{{ $t('aurevoir') }}</h2> <MemberList :members="newMembers['sorties']" :displayPubkey="false" :displayHead="false" /> </div> diff --git a/pages/membres/_hash.vue b/pages/membres/_hash.vue index 382e85114889750fe80513961768d607f1c05ec7..b190a0fbf40e8de60f8e1697e37bbd536dfd8b39 100644 --- a/pages/membres/_hash.vue +++ b/pages/membres/_hash.vue @@ -7,13 +7,13 @@ <transition name="fade"> <div v-if="idFromHash"> <div class="row"> - <div class="col-md-10 col-lg-8 col-xl-6 mx-auto mt-3"> + <div class="mx-auto mt-3"> <MemberCard :hash="idFromHash" /> </div> </div> <div class="row mt-3" v-if="idFromHash.status != 'REVOKED'"> - <div class="col-sm-8 col-lg-5 mb-3 mx-auto"> - <h3 class="h4" :class="{ + <div class="col-md-8 col-lg-5 mb-3 mx-auto"> + <h3 class="h4 text-center" :class="{ 'text-success' : ['NEWCOMER','MISSING'].includes(idFromHash.status) && idFromHash.received_certifications.certifications.length>=5, 'text-danger' : ['NEWCOMER','MISSING'].includes(idFromHash.status) && idFromHash.received_certifications.certifications.length<5, }">{{ $t('certifications.recues') }} ({{ idFromHash.received_certifications.certifications.length }}) @@ -21,8 +21,8 @@ </h3> <CertifList :certifs="idFromHash.received_certifications.certifications" type="received" /> </div> - <div class="col-sm-8 col-lg-5 mx-auto" v-if="['MISSING','MEMBER'].includes(idFromHash.status)"> - <h3 class="h4">{{ $t('certifications.envoyees') }} ({{ idFromHash.sent_certifications.length }})</h3> + <div class="col-md-8 col-lg-5 mx-auto" v-if="['MISSING','MEMBER'].includes(idFromHash.status)"> + <h3 class="h4 text-center">{{ $t('certifications.envoyees') }} ({{ idFromHash.sent_certifications.length }})</h3> <CertifList :certifs="idFromHash.sent_certifications" type="sent" /> </div> </div> diff --git a/pages/previsions/futurs_membres.vue b/pages/previsions/futurs_membres.vue index 8108d35592238f03d9f785f0c2e598cf2f036023..db844e892a387465d3511192080176bb377b82d3 100644 --- a/pages/previsions/futurs_membres.vue +++ b/pages/previsions/futurs_membres.vue @@ -41,8 +41,8 @@ </th> <td class="p-0"> <div class="d-flex justify-content-between p-3" v-for="date in forecast.forecasts" :key="date.date"> - <div>{{ $d(new Date(date.date*1000), 'long') }} {{ $t('time.a') }} {{ $d(new Date(date.date*1000), 'hour') }}</div> - <div>{{ date.proba * 100 }} %</div> + <div class="forecast_date mr-3">{{ $d(new Date(date.date*1000), 'short') }} {{ $t('time.a') }} {{ $d(new Date(date.date*1000), 'hour').replace(" ", " ") }}</div> + <div>{{ date.proba * 100 }} %</div> </div> </td> </tr> @@ -56,12 +56,12 @@ <table class="table table-striped"> <tbody> <tr v-for="forecast in wwResult.forecastsByDates" :key="forecast.date"> - <th scope="row">{{ $d(new Date(forecast.date*1000), 'long') }} {{ $t('time.a') }} {{ $d(new Date(forecast.date*1000), 'hour') }}</th> + <th scope="row" class="forecast_date">{{ $d(new Date(forecast.date*1000), 'short') }} {{ $t('time.a') }} {{ $d(new Date(forecast.date*1000), 'hour') }}</th> <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" :to="localePath('/membres/' + member.member.hash)" v-for="member in forecast.forecasts" :key="member.member.uid"> - <div>{{ member.member.uid }} <BadgeStatus :membre="member.member" /></div> - <div>{{ member.proba * 100 }} %</div> + <div class="mr-3">{{ member.member.uid }} <BadgeStatus :membre="member.member" /></div> + <div>{{ member.proba * 100 }} %</div> </nuxt-link> </div> </td> @@ -190,4 +190,8 @@ export default { color: var(--text-primary-color); } } + +.forecast_date { + min-width: 150px; +} </style> \ No newline at end of file