summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordakkar <dakkar@thenautilus.net>2024-05-11 13:09:32 +0100
committerdakkar <dakkar@thenautilus.net>2024-05-11 13:09:32 +0100
commitaf2385700d5e27e72dea550b9d60595f7bb08ae0 (patch)
treee30c83268f0264d6285bb8f6d30a6a54a47b885f
parentMerge branch 'future-2024-04-10' into future-2024-04-25-post (diff)
downloadsharkey-af2385700d5e27e72dea550b9d60595f7bb08ae0.tar.gz
sharkey-af2385700d5e27e72dea550b9d60595f7bb08ae0.tar.bz2
sharkey-af2385700d5e27e72dea550b9d60595f7bb08ae0.zip
fix some icons
-rw-r--r--CONTRIBUTING.md5
-rw-r--r--packages/frontend/src/pages/clip.vue4
-rw-r--r--packages/frontend/src/pages/page.vue4
3 files changed, 8 insertions, 5 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 14b16345f3..2acacd6dfa 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -570,7 +570,10 @@ seems to do a decent job)
`packages/frontend/src/ui/deck/tl-column.vue`,
`packages/frontend/src/widgets/WidgetTimeline.vue`)
* make sure there aren't any new `ti-*` classes (Tabler Icons), and
- replace them with appropriate `ph-*` ones (Phosphor Icons)
+ replace them with appropriate `ph-*` ones (Phosphor Icons).
+ `git grep '["'\'']ti[ -](?!fw)'` should show you what to change.
+ NOTE: `ti-fw` is a special class that's defined by Misskey, leave it
+ alone
* re-generate `misskey-js`: `pnpm build-misskey-js-with-types`
* run tests `pnpm test` and fix as much as you can
* right now `megalodon` doesn't pass its tests, you probably need to
diff --git a/packages/frontend/src/pages/clip.vue b/packages/frontend/src/pages/clip.vue
index 29abb9117e..f89ef036cf 100644
--- a/packages/frontend/src/pages/clip.vue
+++ b/packages/frontend/src/pages/clip.vue
@@ -15,8 +15,8 @@ SPDX-License-Identifier: AGPL-3.0-only
</div>
<div v-else>({{ i18n.ts.noDescription }})</div>
<div>
- <MkButton v-if="favorited" v-tooltip="i18n.ts.unfavorite" asLike rounded primary @click="unfavorite()"><i class="ti ti-heart"></i><span v-if="clip.favoritedCount > 0" style="margin-left: 6px;">{{ clip.favoritedCount }}</span></MkButton>
- <MkButton v-else v-tooltip="i18n.ts.favorite" asLike rounded @click="favorite()"><i class="ti ti-heart"></i><span v-if="clip.favoritedCount > 0" style="margin-left: 6px;">{{ clip.favoritedCount }}</span></MkButton>
+ <MkButton v-if="favorited" v-tooltip="i18n.ts.unfavorite" asLike rounded primary @click="unfavorite()"><i class="ph-heart ph-bold pd-lg"></i><span v-if="clip.favoritedCount > 0" style="margin-left: 6px;">{{ clip.favoritedCount }}</span></MkButton>
+ <MkButton v-else v-tooltip="i18n.ts.favorite" asLike rounded @click="favorite()"><i class="ph-heart ph-bold pd-lg"></i><span v-if="clip.favoritedCount > 0" style="margin-left: 6px;">{{ clip.favoritedCount }}</span></MkButton>
</div>
</div>
<div :class="$style.user">
diff --git a/packages/frontend/src/pages/page.vue b/packages/frontend/src/pages/page.vue
index 48ebe4a01c..99b8b4143f 100644
--- a/packages/frontend/src/pages/page.vue
+++ b/packages/frontend/src/pages/page.vue
@@ -47,8 +47,8 @@ SPDX-License-Identifier: AGPL-3.0-only
<MkAvatar :user="page.user" :class="$style.avatar" indicator link preview/> <MkA :to="`/@${username}`"><MkUserName :user="page.user" :nowrap="false"/></MkA>
</div>
<div :class="$style.pageBannerTitleSubActions">
- <MkA v-if="page.userId === $i?.id" v-tooltip="i18n.ts._pages.editThisPage" :to="`/pages/edit/${page.id}`" class="_button" :class="$style.generalActionButton"><i class="ti ti-pencil ti-fw"></i></MkA>
- <button v-tooltip="i18n.ts.share" class="_button" :class="$style.generalActionButton" @click="share"><i class="ti ti-share ti-fw"></i></button>
+ <MkA v-if="page.userId === $i?.id" v-tooltip="i18n.ts._pages.editThisPage" :to="`/pages/edit/${page.id}`" class="_button" :class="$style.generalActionButton"><i class="ph-pencil-simple ph-bold ph-lg"></i></MkA>
+ <button v-tooltip="i18n.ts.share" class="_button" :class="$style.generalActionButton" @click="share"><i class="ph-share-network ph-bold ph-lg ti-fw"></i></button>
</div>
</div>
</div>