Skip to content

Commit

Permalink
Merge pull request #323 from DecentralCardGame/advancedcardview-update
Browse files Browse the repository at this point in the history
Advancedcardview update
  • Loading branch information
lxgr-linux authored Nov 1, 2024
2 parents 1d37edb + c80b27a commit 386743e
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 8 deletions.
8 changes: 6 additions & 2 deletions src/components/elements/KeywordComponent.vue
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
<template>
<div>
<div v-if="state.keywordDescriptions.length > 1">
<p
class="font-bold text-2xl">
Used Keywords
</p>
<br>
<div
v-for="(keyword, index) in state.keywordDescriptions"
:key="index"
class="Keywords"
>
<p class="font-bold">
{{ keyword[0] }}
</p>
<p>{{ keyword[1] }}</p>
</div>
Expand Down
11 changes: 7 additions & 4 deletions src/components/modals/CardviewModal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -52,16 +52,19 @@
<br>
</div>
<div>
<p class="font-bold text-2xl">
Used Keywords
</p>
<br>
<KeywordComponent :card="state.card" />
</div>
</div>
<div
class="flex flex-col lg:flex-row justify-center lg:justify-end space-y-6 lg:space-x-6 lg:space-y-0"
>
<router-link :to="{ path: '/cardview/' + props.id }">
<BaseCCButton
:type="Color.RED"
>
Card URL
</BaseCCButton>
</router-link>
<BaseCCButton
v-if="isArtist"
:type="Color.RED"
Expand Down
2 changes: 1 addition & 1 deletion src/components/modals/ModalFrame.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<div class="fixed top-0 flex h-[100vh] w-full bg-black/50">
<div class="fixed top-0 flex h-[100vh] w-full bg-black/50 overflow-scroll">
<ModalInner
:class="['p-10', 'z-100', 'm-auto'].concat(props.class)"
:heading="heading"
Expand Down
2 changes: 1 addition & 1 deletion src/views/AdvancedCardViewPage.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<div class="bg-black text-white flex lg:h-[80vh] p-16 lg:p-8" />
<div class="h-screen bg-black text-white flex lg:h-[80vh] p-16 lg:p-8"/>
<CardviewModal
:id="state.id"
@close="$router.back()"
Expand Down

0 comments on commit 386743e

Please sign in to comment.