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 #524 from h3poteto/fix/520 

fixes #520 Fix space in notifications
This commit is contained in:
AkiraFukushima 2018-08-19 18:13:18 +09:00 committed by GitHub
parent 8a5a486f65 38086f0ef0
commit 9ffbc10288
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/renderer/components/TimelineSpace/Contents/Cards/Notification/Favourite.vue
View File

@ -28,6 +28,7 @@
<div class="timestamp"> <div class="timestamp">
{{ parseDatetime(message.status.created_at) }} {{ parseDatetime(message.status.created_at) }}
</div> </div>
<div class="clearfix"></div>
</div> </div>
<div class="content-wrapper"> <div class="content-wrapper">
<div class="spoiler" v-show="spoilered(message.status)"> <div class="spoiler" v-show="spoilered(message.status)">
@ -218,6 +219,8 @@ export default {
color: #909399; color: #909399;
.toot-header { .toot-header {
height: 22px;
.user { .user {
float: left; float: left;
font-size: var(--base-font-size); font-size: var(--base-font-size);
@ -233,10 +236,10 @@ export default {
.content-wrapper /deep/ { .content-wrapper /deep/ {
font-size: var(--base-font-size); font-size: var(--base-font-size);
margin: 0;
.content { .content {
font-size: var(--base-font-size); font-size: var(--base-font-size);
margin: 4px 0 8px;
word-wrap: break-word; word-wrap: break-word;
} }

5
src/renderer/components/TimelineSpace/Contents/Cards/Notification/Reblog.vue
View File

@ -28,6 +28,7 @@
<div class="timestamp"> <div class="timestamp">
{{ parseDatetime(message.status.created_at) }} {{ parseDatetime(message.status.created_at) }}
</div> </div>
<div class="clearfix"></div>
</div> </div>
<div class="content-wrapper"> <div class="content-wrapper">
<div class="spoiler" v-show="spoilered(message.status)"> <div class="spoiler" v-show="spoilered(message.status)">
@ -218,6 +219,8 @@ export default {
color: #909399; color: #909399;
.toot-header { .toot-header {
height: 24px;
.user { .user {
float: left; float: left;
font-size: var(--base-font-size); font-size: var(--base-font-size);
@ -232,10 +235,10 @@ export default {
.content-wrapper /deep/ { .content-wrapper /deep/ {
font-size: var(--base-font-size); font-size: var(--base-font-size);
margin: 0;
.content { .content {
font-size: var(--base-font-size); font-size: var(--base-font-size);
margin: 4px 0 8px;
word-wrap: break-word; word-wrap: break-word;
} }