Skip to content

Commit 7816b98

Browse files
authored
Merge pull request #7230 from FlowFuse/fix/lint-warnings
fix: resolve eslint indentation and attribute-order warnings
2 parents 5d53428 + 071c83d commit 7816b98

2 files changed

Lines changed: 24 additions & 24 deletions

File tree

frontend/src/components/dialogs/SnapshotDiffChangePanel.vue

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -68,29 +68,29 @@
6868
<div v-show="!collapsed" class="font-mono">
6969
<div class="diff-scroll-container" :class="{ 'diff-wrap': wrapped }">
7070
<div class="diff-content">
71-
<template v-for="(line, i) in lines" :key="i">
72-
<!-- Collapsed unchanged section -->
73-
<div
74-
v-if="line.type === 'collapsed'"
75-
class="flex leading-5 text-blue-600 bg-blue-50 cursor-pointer hover:bg-blue-100 select-none border-y border-blue-100"
76-
@click="expandSection(i)"
77-
>
78-
<span class="line-num border-r border-blue-200 text-blue-400" />
79-
<span class="line-num border-r border-blue-200 text-blue-400" />
80-
<span class="px-3 flex-1 text-center">&#8597; {{ line.count }} unchanged line{{ line.count === 1 ? '' : 's' }}</span>
81-
</div>
82-
<!-- Diff line -->
83-
<div
84-
v-else
85-
:class="lineClass(line)"
86-
:data-change="line.type !== 'unchanged' || undefined"
87-
class="flex leading-5"
88-
>
89-
<span class="line-num border-r select-none shrink-0" :class="lineNumClass(line)">{{ line.oldNum || '' }}</span>
90-
<span class="line-num border-r select-none shrink-0" :class="lineNumClass(line)">{{ line.newNum || '' }}</span>
91-
<span class="px-2" :class="wrapped ? 'whitespace-pre-wrap break-all' : 'whitespace-pre'">{{ linePrefix(line) }}{{ line.text }}</span>
92-
</div>
93-
</template>
71+
<template v-for="(line, i) in lines" :key="i">
72+
<!-- Collapsed unchanged section -->
73+
<div
74+
v-if="line.type === 'collapsed'"
75+
class="flex leading-5 text-blue-600 bg-blue-50 cursor-pointer hover:bg-blue-100 select-none border-y border-blue-100"
76+
@click="expandSection(i)"
77+
>
78+
<span class="line-num border-r border-blue-200 text-blue-400" />
79+
<span class="line-num border-r border-blue-200 text-blue-400" />
80+
<span class="px-3 flex-1 text-center">&#8597; {{ line.count }} unchanged line{{ line.count === 1 ? '' : 's' }}</span>
81+
</div>
82+
<!-- Diff line -->
83+
<div
84+
v-else
85+
:class="lineClass(line)"
86+
:data-change="line.type !== 'unchanged' || undefined"
87+
class="flex leading-5"
88+
>
89+
<span class="line-num border-r select-none shrink-0" :class="lineNumClass(line)">{{ line.oldNum || '' }}</span>
90+
<span class="line-num border-r select-none shrink-0" :class="lineNumClass(line)">{{ line.newNum || '' }}</span>
91+
<span class="px-2" :class="wrapped ? 'whitespace-pre-wrap break-all' : 'whitespace-pre'">{{ linePrefix(line) }}{{ line.text }}</span>
92+
</div>
93+
</template>
9494
</div>
9595
</div>
9696
</div>

frontend/src/ui-components/components/kebab-menu/KebabItem.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
:class="{[className]: kind.length, active, disabled: disabled}"
66
:data-el="'kebab-item-' + slugify(label)"
77
>
8-
<component v-if="icon" :is="icon" class="ff-icon" />
8+
<component :is="icon" v-if="icon" class="ff-icon" />
99
<label>{{ label }}</label>
1010
</li>
1111
</MenuItem>

0 commit comments

Comments
 (0)