Skip to content

Commit

Permalink
Merge pull request #1477 from NicoPennec/fix/markdown
Browse files Browse the repository at this point in the history
Improve UI
  • Loading branch information
NicoPennec authored Jul 4, 2024
2 parents 7051968 + b693217 commit eade789
Show file tree
Hide file tree
Showing 21 changed files with 201 additions and 218 deletions.
154 changes: 77 additions & 77 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@
"@fullcalendar/multimonth": "6.1.14",
"@fullcalendar/vue": "6.1.14",
"@google/model-viewer": "3.5.0",
"@sentry/vue": "8.13.0",
"@sentry/vue": "8.14.0",
"async": "3.2.5",
"bowser": "2.11.0",
"chart.js": "2.9.4",
"color-hash": "2.0.2",
"color-string": "1.9.1",
"fabric": "cgwire/fabric.js",
"marked": "4.3.0",
"marked": "13.0.2",
"marked-emoji": "1.4.1",
"moment": "2.30.1",
"moment-timezone": "0.5.45",
Expand Down Expand Up @@ -62,7 +62,7 @@
"vuejs-datepicker": "1.6.2",
"vuex": "3.6.2",
"vuex-router-sync": "5.0.0",
"wavesurfer.js": "7.8.0"
"wavesurfer.js": "7.8.1"
},
"devDependencies": {
"@types/vue-feather-icons": "5.0.8",
Expand All @@ -81,7 +81,7 @@
"localStorage": "1.0.4",
"prettier": "3.3.2",
"sass": "1.77.6",
"vite": "5.3.2",
"vite": "5.3.3",
"vitest": "0.34.6",
"vitest-localstorage-mock": "0.1.2",
"vue-template-compiler": "2.7.16"
Expand Down
8 changes: 8 additions & 0 deletions src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -1901,6 +1901,14 @@ tbody:last-child .empty-line:last-child {
background: var(--background-tag);
border-left: 0.4em solid var(--background-hover);
}
table tr:hover {
background: var(--background-hover);
}
table thead th {
color: inherit;
}
}
.playlist-column .video-player-box .video-js {
Expand Down
10 changes: 4 additions & 6 deletions src/components/cells/DescriptionCell.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
<template v-if="full">
<div
class="description-shorten-text"
v-html="compileMarkdown(entry.description)"
v-html="renderMarkdown(entry.description)"
></div>
</template>
<template v-else>
<div class="c-mask" v-if="isOpen"></div>
<span
class="description-shorten-text selectable"
v-html="
compileMarkdown(shortenText(entry.description, 20), {
renderMarkdown(shortenText(entry.description, 20), {
allowedLinkTag: false
})
"
Expand All @@ -26,7 +26,7 @@
<div
class="tooltip-text"
@keyup.esc="onClick"
v-html="compileMarkdown(entry.description)"
v-html="renderMarkdown(entry.description)"
v-if="!isEditing"
></div>
<textarea
Expand Down Expand Up @@ -74,9 +74,7 @@ export default {
},
methods: {
compileMarkdown(input, options) {
return renderMarkdown(input, options)
},
renderMarkdown,
shortenText: stringHelpers.shortenText,
Expand Down
Loading

0 comments on commit eade789

Please sign in to comment.