From 17001743e1e36c5e53ae0f7716efc3e525254cab Mon Sep 17 00:00:00 2001 From: Marvin Rabe Date: Mon, 7 May 2018 13:24:48 +0200 Subject: [PATCH] Changed last prop to :last-of-type --- .../components/challenges/challengeDetail.vue | 12 +++++----- website/client/components/groups/group.vue | 22 +++++++++---------- website/client/components/groups/tavern.vue | 2 +- website/client/components/sidebarSection.vue | 7 ++---- 4 files changed, 19 insertions(+), 24 deletions(-) diff --git a/website/client/components/challenges/challengeDetail.vue b/website/client/components/challenges/challengeDetail.vue index 1d0b737d71..70b9ff2c60 100644 --- a/website/client/components/challenges/challengeDetail.vue +++ b/website/client/components/challenges/challengeDetail.vue @@ -70,13 +70,11 @@ button.btn.btn-primary(v-once, @click='exportChallengeCsv()') {{$t('exportChallengeCsv')}} .button-container(v-if='isLeader || isAdmin') button.btn.btn-danger(v-once, @click='closeChallenge()') {{$t('endChallenge')}} - sidebar-section(:title="$t('challengeSummary')") - p(v-markdown='challenge.summary') - sidebar-section( - :title="$t('challengeDescription')" - :last="true" - ) - p(v-markdown='challenge.description') + div + sidebar-section(:title="$t('challengeSummary')") + p(v-markdown='challenge.summary') + sidebar-section(:title="$t('challengeDescription')") + p(v-markdown='challenge.description') .text-center(v-if='isMember') button.btn.btn-danger(v-once, @click='leaveChallenge()') {{$t('leaveChallenge')}} diff --git a/website/client/components/groups/group.vue b/website/client/components/groups/group.vue index 6bcf92922e..474752907b 100644 --- a/website/client/components/groups/group.vue +++ b/website/client/components/groups/group.vue @@ -63,17 +63,17 @@ // @TODO: V2 button.btn.btn-primary(v-once, v-if='!isLeader') {{$t('messageGuildLeader')}} // Suggest making the button visible to the leader too - useful for them to test how the feature works or to send a note to themself. -- Alys .button-container // @TODO: V2 button.btn.btn-primary(v-once, v-if='isMember && !isParty') {{$t('donateGems')}} // Suggest removing the isMember restriction - it's okay if non-members donate to a public guild. Also probably allow it for parties if parties can buy imagery. -- Alys - quest-sidebar-section(:group='group', v-if='isParty') - sidebar-section(:title="$t('guildSummary')", v-if='!isParty') - p(v-markdown='group.summary') - sidebar-section(:title="$t('groupDescription')") - p(v-markdown='group.description') - sidebar-section( - :title="$t('challenges')", - :tooltip="isParty ? $t('challengeDetails') : $t('privateDescription')" - :last="true" - ) - group-challenges(:groupId='searchId') + div + quest-sidebar-section(:group='group', v-if='isParty') + sidebar-section(:title="$t('guildSummary')", v-if='!isParty') + p(v-markdown='group.summary') + sidebar-section(:title="$t('groupDescription')") + p(v-markdown='group.description') + sidebar-section( + :title="$t('challenges')", + :tooltip="isParty ? $t('challengeDetails') : $t('privateDescription')" + ) + group-challenges(:groupId='searchId') div.text-center button.btn.btn-danger(v-if='isMember', @click='clickLeave()') {{ isParty ? $t('leaveParty') : $t('leaveGroup') }} diff --git a/website/client/components/groups/tavern.vue b/website/client/components/groups/tavern.vue index 9fb0924dbf..de390cac93 100644 --- a/website/client/components/groups/tavern.vue +++ b/website/client/components/groups/tavern.vue @@ -138,7 +138,7 @@ li router-link(to="/groups/guild/5481ccf3-5d2d-48a9-a871-70a7380cee5a") {{ $t('askQuestionGuild') }} - sidebar-section(:title="$t('playerTiers')",:last='true') + sidebar-section(:title="$t('playerTiers')") .row .col-12 p(v-once) {{ $t('playerTiersDesc') }} diff --git a/website/client/components/sidebarSection.vue b/website/client/components/sidebarSection.vue index 18bdcc9b5a..24f150ef00 100644 --- a/website/client/components/sidebarSection.vue +++ b/website/client/components/sidebarSection.vue @@ -1,5 +1,5 @@