Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(History): adjust button tooltips to consistent style #2018

Merged
merged 6 commits into from
Sep 24, 2024
Merged

fix(History): adjust button tooltips to consistent style #2018

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
098873e
fix: adjust button tooltips to same style
rackrick Sep 19, 2024
3cb8dc5
fix: remove title from delete button
rackrick Sep 19, 2024
1abc9f9
fix: remove duplicate localization call
rackrick Sep 19, 2024
eaeea3b
style: run prettier
rackrick Sep 19, 2024
230ea78
fix: move if to enclosing tag
rackrick Sep 24, 2024
0ebcf21
style: apply linter suggestion
rackrick Sep 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 22 additions & 12 deletions src/components/panels/HistoryListPanel.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<template>

Check failure on line 1 in src/components/panels/HistoryListPanel.vue

View workflow job for this annotation

GitHub Actions / Prettier

src/components/panels/HistoryListPanel.vue#L1 

There are issues with this file's formatting, please run Prettier to fix the errors
<panel :icon="mdiFileDocumentMultipleOutline" :title="$t('History.PrintHistory')" card-class="history-list-panel">
<v-card-text>
<v-row>
Expand All @@ -14,15 +14,19 @@
dense />
</v-col>
<v-col class="offset-4 col-4 d-flex align-center justify-end">
<template v-if="selectedJobs.length">
<v-btn
:title="$t('History.Delete')"
color="error"
class="px-2 minwidth-0 ml-3"
@click="deleteSelectedDialog = true">
<v-icon>{{ mdiDelete }}</v-icon>
</v-btn>
</template>
<v-tooltip top>
rackrick marked this conversation as resolved.
Show resolved Hide resolved
rackrick marked this conversation as resolved.
Show resolved Hide resolved
<template #activator="{ on, attrs }" v-if="selectedJobs.length">

Check warning on line 18 in src/components/panels/HistoryListPanel.vue

View workflow job for this annotation

GitHub Actions / ESLint

src/components/panels/HistoryListPanel.vue#L18 

Attribute "v-if" should go before "#activator" (vue/attributes-order)
meteyou marked this conversation as resolved.
Show resolved Hide resolved
<v-btn
color="error"
class="px-2 minwidth-0 ml-3"
v-bind="attrs"
v-on="on"
@click="deleteSelectedDialog = true">
<v-icon>{{ mdiDelete }}</v-icon>
</v-btn>
</template>
<span>{{ $t('History.Delete') }}</span>
</v-tooltip>
<v-tooltip top>
<template #activator="{ on, attrs }">
<v-btn
Expand Down Expand Up @@ -58,10 +62,16 @@
</v-tooltip>
<v-menu :offset-y="true" :close-on-content-click="false">
<template #activator="{ on, attrs }">
<v-btn class="px-2 minwidth-0 ml-3" v-bind="attrs" v-on="on">
<v-icon>{{ mdiCog }}</v-icon>
</v-btn>
<v-tooltip top>
rackrick marked this conversation as resolved.
Show resolved Hide resolved
<template #activator="{ on: onToolTip }">
<v-btn class="px-2 minwidth-0 ml-3" v-bind="attrs" v-on="{ ...on, ...onToolTip }">
rackrick marked this conversation as resolved.
Show resolved Hide resolved
<v-icon>{{ mdiCog }}</v-icon>
</v-btn>
</template>
<span>{{ $t('History.Settings') }}</span>
rackrick marked this conversation as resolved.
Show resolved Hide resolved
</v-tooltip>
</template>
<span>{{ $t('History.Settings') }}</span>
<v-list>
<v-list-item class="minHeight36">
<v-checkbox
Expand Down
1 change: 1 addition & 0 deletions src/locales/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -433,6 +433,7 @@
"SelectedFilamentUsed": "Selected Filament Used",
"SelectedJobs": "Selected Jobs",
"SelectedPrinttime": "Selected Print Time",
"Settings": "Settings",
"Slicer": "Slicer",
"SlicerVersion": "Slicer Version",
"StartTime": "Start Time",
Expand Down
Loading