Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Advancedcardview update #323

Merged
merged 3 commits into from
Nov 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
Loading