Skip to content

Commit

Permalink
Merge branch 'develop' into pass-description
Browse files Browse the repository at this point in the history
  • Loading branch information
hungfnt authored Apr 24, 2024
2 parents 644169e + 0d834cc commit 356784a
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 6 deletions.
13 changes: 12 additions & 1 deletion components/Markdown.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<!-- eslint-disable vue/no-v-html -->
<div class="prose" v-html="sanitizedDescription" />
<div class="prose max-w-none text-justify word-wrap" v-html="sanitizedDescription" />
</template>

<script setup lang="ts">
Expand Down Expand Up @@ -44,5 +44,16 @@ async function sanitizeDescription () {
</script>

<style scoped>
.word-wrap {
-ms-word-break: break-all;
word-break: break-all;
/* Non standard for webkit */
word-break: break-word;
-webkit-hyphens: auto;
-moz-hyphens: auto;
-ms-hyphens: auto;
hyphens: auto;
}
</style>
2 changes: 1 addition & 1 deletion components/torrent/TorrentCommentTab.vue
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</button>
</div>
<template v-if="!collapsed">
<div class="flex flex-col w-full h-full p-6 grow bg-base-100 rounded-2xl break-words">
<div class="flex flex-col w-full h-full p-6 grow bg-base-100 rounded-2xl">
<template v-if="torrent.comment">
<Markdown :source="torrent.comment" />
</template>
Expand Down
2 changes: 1 addition & 1 deletion components/torrent/TorrentCreatedByTab.vue
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</button>
</div>
<template v-if="!collapsed">
<div class="flex flex-col w-full h-full p-6 grow bg-base-100 rounded-2xl break-words">
<div class="flex flex-col w-full h-full p-6 grow bg-base-100 rounded-2xl">
<template v-if="torrent.created_by">
<Markdown :source="torrent.created_by" />
</template>
Expand Down
2 changes: 1 addition & 1 deletion components/torrent/TorrentCreationDateTab.vue
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</button>
</div>
<template v-if="!collapsed">
<div class="flex flex-col w-full h-full p-6 grow bg-base-100 rounded-2xl break-words">
<div class="flex flex-col w-full h-full p-6 grow bg-base-100 rounded-2xl">
<template v-if="torrent.creation_date">
<Markdown :source="formattedDateFromTimestamp" />
</template>
Expand Down
2 changes: 1 addition & 1 deletion components/torrent/TorrentDescriptionTab.vue
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</button>
</div>
<template v-if="!collapsed">
<div class="flex flex-col w-full h-full p-6 grow bg-base-100 rounded-2xl break-words">
<div class="flex flex-col w-full h-full p-6 grow bg-base-100 rounded-2xl">
<template v-if="torrent.description">
<Markdown :source="torrent.description" />
</template>
Expand Down
2 changes: 1 addition & 1 deletion components/torrent/TorrentEncodingTab.vue
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</button>
</div>
<template v-if="!collapsed">
<div class="flex flex-col w-full h-full p-6 grow bg-base-100 rounded-2xl break-words">
<div class="flex flex-col w-full h-full p-6 grow bg-base-100 rounded-2xl">
<template v-if="torrent.encoding">
<Markdown :source="torrent.encoding" />
</template>
Expand Down

0 comments on commit 356784a

Please sign in to comment.