Skip to content

Commit

Permalink
fix vue/html-self-closing
Browse files Browse the repository at this point in the history
  • Loading branch information
sasarafu committed May 26, 2024
1 parent fea4a44 commit d769358
Show file tree
Hide file tree
Showing 14 changed files with 27 additions and 19 deletions.
4 changes: 2 additions & 2 deletions components/common/Menu.vue
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@
<input v-model="timelineName" class="input input-sm w-full" />
</div>

<div class="divider"></div>
<div class="divider" />

<CommonPartsUserSelector
v-model="activeLoginUser"
:users="orderedLoginUsers"
/>

<div class="divider"></div>
<div class="divider" />

<div class="flex w-full flex-wrap gap-1">
<button
Expand Down
2 changes: 1 addition & 1 deletion components/common/Modal/BaseContainer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<label class="text-xl font-bold">{{ title }}</label>
</header>

<div class="divider mt-2"></div>
<div class="divider mt-2" />
</template>

<slot />
Expand Down
4 changes: 2 additions & 2 deletions components/common/Modal/Config/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
</button>
</div>

<div class="divider"></div>
<div class="divider" />
<div>
<h2 class="text-3xl font-bold mb-2">danger zone</h2>

Expand All @@ -44,7 +44,7 @@
</CommonPartsDetails>
</div>

<div class="divider"></div>
<div class="divider" />
<div>
<h2 class="text-3xl font-bold mb-2">version</h2>
<p>
Expand Down
2 changes: 1 addition & 1 deletion components/common/Modal/Login/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
</div>
</div>

<div class="divider"></div>
<div class="divider" />

<component
:is="loginComponents[selectedInstanceType]"
Expand Down
2 changes: 1 addition & 1 deletion components/common/Modal/index.vue
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<template>
<div id="modalIndex" class="modal has-[*]:modal-open z-40"></div>
<div id="modalIndex" class="modal has-[*]:modal-open z-40" />
</template>
2 changes: 1 addition & 1 deletion components/common/Timeline/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@

<template v-if="isLoadable" #loading>
<div class="p-3 text-center">
<span v-if="isLoading" class="loading loading-spinner"></span>
<span v-if="isLoading" class="loading loading-spinner" />
<button v-else class="btn btn-neutral btn-sm" @click="loadPast">
<!-- 1度読み込んだ後にまだ画面上にあった場合、再ロードされないのでボタンで手動ロードできるようにしておく -->
<span>load more</span>
Expand Down
2 changes: 1 addition & 1 deletion components/common/Toast.vue
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
class="radial-progress"
style="--size: 1rem"
:style="{ '--value': toast.percent }"
></div>
/>
</div>
</template>
</div>
Expand Down
10 changes: 5 additions & 5 deletions components/common/parts/Container.vue
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
<template>
<div ref="container" class="common-container flex flex-col">
<div class="common-container-header">
<slot name="header" class="common-container-header"></slot>
<slot name="header" class="common-container-header" />
</div>

<div class="common-container-body flex-auto overflow-y-auto">
<div ref="topElement" class="h-0"></div>
<div ref="topElement" class="h-0" />

<slot></slot>
<slot />

<div ref="bottomElement">
<slot name="loading"></slot>
<slot name="loading" />
</div>
</div>

<div>
<slot name="footer" class="common-container-footer"></slot>
<slot name="footer" class="common-container-footer" />
</div>
</div>
</template>
Expand Down
2 changes: 1 addition & 1 deletion components/common/parts/RoundedIcon.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<img v-if="iconUrl" :src="iconUrl" class="rounded-full" draggable="false" />
<div v-else class="rounded-full bg-neutral-content"></div>
<div v-else class="rounded-full bg-neutral-content" />
</template>

<script setup lang="ts">
Expand Down
2 changes: 1 addition & 1 deletion components/instances/bluesky/Login.vue
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<span class="text-lg">{{ instance }}</span>
</button>

<div class="basis-full"></div>
<div class="basis-full" />

<form
class="flex items-center relative max-w-full"
Expand Down
2 changes: 1 addition & 1 deletion components/instances/mastodon/ColumnItem.vue
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
</div>
</template>

<p class="w-full break-words text-sm" v-html="sanitizedHTML"></p>
<p class="w-full break-words text-sm" v-html="sanitizedHTML" />

<CommonTimelineItemMedia :media-list="mediaList" />

Expand Down
2 changes: 1 addition & 1 deletion components/instances/mastodon/Login.vue
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<span class="text-lg">{{ instance }}</span>
</button>

<div class="basis-full"></div>
<div class="basis-full" />

<form
class="flex items-center relative max-w-full"
Expand Down
2 changes: 1 addition & 1 deletion components/instances/misskey/Login.vue
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<span class="text-lg">{{ instance }}</span>
</button>

<div class="basis-full"></div>
<div class="basis-full" />

<form
class="flex items-center relative max-w-full"
Expand Down
8 changes: 8 additions & 0 deletions eslint.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,14 @@ export default withNuxt({
'no-console': 'warn',
'no-empty': 'warn', // temporary
'@typescript-eslint/ban-types': 'warn', // temporary
'vue/html-self-closing': [
'warn',
{
html: {
void: 'always', // temporary?: allow self-closing for consistency
},
},
],
},
}).append({
...eslintPluginPrettierRecommended,
Expand Down

0 comments on commit d769358

Please sign in to comment.