Skip to content

Commit

Permalink
Merge branch 'development'
Browse files Browse the repository at this point in the history
  • Loading branch information
mjbullman committed Jan 11, 2025
2 parents f0c3694 + 072f292 commit 12fd1a9
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 9 deletions.
2 changes: 0 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '3.8'

services:
db:
image: postgres:16-alpine
Expand Down
8 changes: 1 addition & 7 deletions frontend/components/cards/ProjectCard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,7 @@

</v-card-subtitle>

<v-card-text class="text-subtitle-1">

<div>

{{ project.text }}

</div>
<v-card-text class="text-subtitle-1" v-html="project.text">

</v-card-text>

Expand Down
2 changes: 2 additions & 0 deletions frontend/eslint.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,12 @@ export default createConfigForNuxt({

.override('nuxt/vue/rules', {
rules: {
'vue/no-v-html': 'off',
'vue/html-self-closing': 'off',
'vue/block-tag-newline': 'off',
'vue/first-attribute-line-break': 'off',
'vue/html-closing-bracket-newline': 'off',
'vue/no-v-text-v-html-on-component': 'off',
'vue/multiline-html-element-content-newline': 'off',
'vue/max-attributes-per-line': ['error', {
'singleline': 10,
Expand Down

0 comments on commit 12fd1a9

Please sign in to comment.