Mastodon
/
Whalebird-desktop-client-mac-linux-windows
mirror of https://github.com/h3poteto/whalebird-desktop
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #2222 from h3poteto/fix/fill-line 

Fix line for follows and follow requests in notifications
This commit is contained in:
AkiraFukushima 2021-03-06 01:00:59 +09:00 committed by GitHub
parent 9f0be1dd9a dcec4b559e
commit fe843842bd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 44 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/renderer/components/organisms/Notification/Follow.vue
View File

@ -1,6 +1,6 @@
<template>
<div
class="follow"
class="relationship"
tabIndex="0"
v-shortkey="shortcutEnabled ? { next: ['j'], prev: ['k'], right: ['l'], profile: ['p'] } : {}"
@shortkey="handleStatusControl"
@ -9,19 +9,21 @@
role="article"
aria-label="follow event"
>
<div class="action">
<div class="action-mark">
<icon name="user-plus" scale="0.7"></icon>
</div>
<div class="action-detail">
<span class="bold" @click="openUser(message.account)"><bdi v-html="username(message.account)"></bdi></span
>{{ $t('notification.follow.body') }}
</div>
<div class="action-icon" role="presentation">
<FailoverImg :src="message.account.avatar" />
<div class="follow">
<div class="action">
<div class="action-mark">
<icon name="user-plus" scale="0.8"></icon>
</div>
<div class="action-detail">
<span class="bold" @click="openUser(message.account)"><bdi v-html="username(message.account)"></bdi></span
>{{ $t('notification.follow.body') }}
</div>
<div class="action-icon" role="presentation">
<FailoverImg :src="message.account.avatar" />
</div>
</div>
<div class="clearfix"></div>
</div>
<div class="clearfix"></div>
<div class="fill-line"></div>
</div>
</template>
@ -153,16 +155,16 @@ export default {
}
}
}
.fill-line {
height: 1px;
background-color: var(--theme-border-color);
margin: 4px 0 0;
}
}
.follow:focus {
.relationship:focus {
background-color: var(--theme-selected-background-color);
outline: 0;
}
.fill-line {
height: 1px;
background-color: var(--theme-border-color);
margin: 4px 0 0;
}
</style>

44
src/renderer/components/organisms/Notification/FollowRequest.vue
View File

@ -1,6 +1,6 @@
<template>
<div
class="follow-request"
class="relationship"
tabIndex="0"
v-shortkey="shortcutEnabled ? { next: ['j'], prev: ['k'], right: ['l'], profile: ['p'] } : {}"
@shortkey="handleStatusControl"
@ -9,21 +9,23 @@
role="article"
aria-label="follow event"
>
<div class="action">
<div class="action-mark">
<icon name="user-plus" scale="0.7"></icon>
</div>
<div class="action-detail">
{{ $t('notification.follow_request.body') }}
<span class="bold" @click="openUser(message.account)">
<bdi v-html="username(message.account)"></bdi>
</span>
</div>
<div class="action-icon" role="presentation">
<FailoverImg :src="message.account.avatar" />
<div class="follow-request">
<div class="action">
<div class="action-mark">
<icon name="user-plus" scale="0.8"></icon>
</div>
<div class="action-detail">
{{ $t('notification.follow_request.body') }}
<span class="bold" @click="openUser(message.account)">
<bdi v-html="username(message.account)"></bdi>
</span>
</div>
<div class="action-icon" role="presentation">
<FailoverImg :src="message.account.avatar" />
</div>
</div>
<div class="clearfix"></div>
</div>
<div class="clearfix"></div>
<div class="fill-line"></div>
</div>
</template>
@ -155,16 +157,16 @@ export default {
}
}
}
.fill-line {
height: 1px;
background-color: var(--theme-border-color);
margin: 4px 0 0;
}
}
.follow-request:focus {
.relationship:focus {
background-color: var(--theme-selected-background-color);
outline: 0;
}
.fill-line {
height: 1px;
background-color: var(--theme-border-color);
margin: 4px 0 0;
}
</style>