Skip to content

Commit 4e6d1cb

Browse files
authored
Merge pull request #36082 from nextcloud/backport/35903/stable25
[stable25] Replace custom tooltips with native ones in apps page
2 parents a46d010 + 9561d3c commit 4e6d1cb

6 files changed

Lines changed: 16 additions & 12 deletions

File tree

apps/settings/src/components/AppList/AppItem.vue

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,13 @@
5353

5454
<div class="app-level">
5555
<span v-if="app.level === 300"
56-
v-tooltip.auto="t('settings', 'This app is supported via your current Nextcloud subscription.')"
56+
:title="t('settings', 'This app is supported via your current Nextcloud subscription.')"
57+
:aria-label="t('settings', 'This app is supported via your current Nextcloud subscription.')"
5758
class="supported icon-checkmark-color">
5859
{{ t('settings', 'Supported') }}</span>
5960
<span v-if="app.level === 200"
60-
v-tooltip.auto="t('settings', 'Featured apps are developed by and within the community. They offer central functionality and are ready for production use.')"
61+
:title="t('settings', 'Featured apps are developed by and within the community. They offer central functionality and are ready for production use.')"
62+
:aria-label="t('settings', 'Featured apps are developed by and within the community. They offer central functionality and are ready for production use.')"
6163
class="official icon-checkmark">
6264
{{ t('settings', 'Featured') }}</span>
6365
<AppScore v-if="hasRating && !listView" :score="app.score" />
@@ -87,14 +89,16 @@
8789
{{ t('settings','Disable') }}
8890
</NcButton>
8991
<NcButton v-if="!app.active && (app.canInstall || app.isCompatible)"
90-
v-tooltip.auto="enableButtonTooltip"
92+
:title="enableButtonTooltip"
93+
:aria-label="enableButtonTooltip"
9194
type="primary"
9295
:disabled="!app.canInstall || installing || isLoading"
9396
@click.stop="enable(app.id)">
9497
{{ enableButtonText }}
9598
</NcButton>
9699
<NcButton v-else-if="!app.active"
97-
v-tooltip.auto="forceEnableButtonTooltip"
100+
:title="forceEnableButtonTooltip"
101+
:aria-label="forceEnableButtonTooltip"
98102
type="secondary"
99103
:disabled="installing || isLoading"
100104
@click.stop="forceEnable(app.id)">

apps/settings/src/views/Apps.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,11 +98,11 @@
9898
<!-- Featured/Supported badges -->
9999
<div v-if="app.level === 300 || app.level === 200 || hasRating" class="app-level">
100100
<span v-if="app.level === 300"
101-
v-tooltip.auto="t('settings', 'This app is supported via your current Nextcloud subscription.')"
101+
:title="t('settings', 'This app is supported via your current Nextcloud subscription.')"
102102
class="supported icon-checkmark-color">
103103
{{ t('settings', 'Supported') }}</span>
104104
<span v-if="app.level === 200"
105-
v-tooltip.auto="t('settings', 'Featured apps are developed by and within the community. They offer central functionality and are ready for production use.')"
105+
:title="t('settings', 'Featured apps are developed by and within the community. They offer central functionality and are ready for production use.')"
106106
class="official icon-checkmark">
107107
{{ t('settings', 'Featured') }}</span>
108108
<AppScore v-if="hasRating" :score="app.appstoreData.ratingOverall" />

dist/settings-apps-view-7418.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/settings-apps-view-7418.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/settings-vue-settings-apps-users-management.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/settings-vue-settings-apps-users-management.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)