Skip to content

Commit

Permalink
Merge branch 'develop' into list-tog
Browse files Browse the repository at this point in the history
  • Loading branch information
tamaina authored Jul 31, 2023
2 parents 8ed8dfa + 4aed596 commit c65c181
Show file tree
Hide file tree
Showing 5 changed files with 47 additions and 20 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@

### Client
- メニューのスイッチの動作を改善
- ユーザーメニューでスイッチでユーザーリストに追加・削除できるように
- Enhance: ユーザーメニューでスイッチでユーザーリストに追加・削除できるように
- Enhance: 自分が押したリアクションのデザインを改善
- Fix: サーバー情報画面(`/instance-info/{domain}`)でブロックができないのを修正
- Fix: 未読のお知らせの「わかった」をクリック・タップしてもその場で「わかった」が消えない問題を修正

Expand Down
2 changes: 1 addition & 1 deletion packages/frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"@rollup/plugin-replace": "5.0.2",
"@rollup/pluginutils": "5.0.2",
"@syuilo/aiscript": "0.15.0",
"@tabler/icons-webfont": "2.25.0",
"@tabler/icons-webfont": "2.30.0",
"@vitejs/plugin-vue": "4.2.3",
"@vue-macros/reactivity-transform": "0.3.15",
"@vue/compiler-sfc": "3.3.4",
Expand Down
12 changes: 5 additions & 7 deletions packages/frontend/src/components/MkReactionsViewer.reaction.vue
Original file line number Diff line number Diff line change
Expand Up @@ -143,15 +143,13 @@ useTooltip(buttonEl, async (showing) => {
}
}
&.reacted {
background: var(--accent);
&:hover {
background: var(--accent);
}
&.reacted, &.reacted:hover {
background: var(--accentedBg);
color: var(--accent);
border: 1px solid var(--accent);
> .count {
color: var(--fgOnAccent);
color: var(--accent);
}
> .icon {
Expand Down
2 changes: 1 addition & 1 deletion packages/frontend/src/components/MkUrlPreview.vue
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<template v-if="showActions">
<div v-if="tweetId" :class="$style.action">
<MkButton :small="true" inline @click="tweetExpanded = true">
<i class="ti ti-brand-twitter"></i> {{ i18n.ts.expandTweet }}
<i class="ti ti-brand-x"></i> {{ i18n.ts.expandTweet }}
</MkButton>
</div>
<div v-if="!playerEnabled && player.url" :class="$style.action">
Expand Down
48 changes: 38 additions & 10 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit c65c181

Please sign in to comment.