From 5ad45552b3b54539dbabcba0d46151f175e15e83 Mon Sep 17 00:00:00 2001 From: Lynx Kotoura Date: Thu, 14 Dec 2017 06:58:31 +0900 Subject: Fix overflowing emojis on some devices (#6016) * Fix overflowing emojis on some devices * Quit visible and add padding --- app/javascript/styles/mastodon/components.scss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'app/javascript/styles') diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss index 73aff3ad7..ce7150753 100644 --- a/app/javascript/styles/mastodon/components.scss +++ b/app/javascript/styles/mastodon/components.scss @@ -606,6 +606,7 @@ font-weight: 400; overflow: hidden; white-space: pre-wrap; + padding-top: 2px; &:focus { outline: 0; @@ -858,7 +859,7 @@ .status__action-bar { align-items: center; display: flex; - margin-top: 10px; + margin-top: 8px; } .status__action-bar-button { -- cgit From 0d3ffa691ebef1b7874b5369829b7c3e2b006940 Mon Sep 17 00:00:00 2001 From: Lynx Kotoura Date: Thu, 14 Dec 2017 07:36:29 +0900 Subject: Fix focused background color of notifications of direct toots (#6021) --- app/javascript/styles/mastodon/components.scss | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'app/javascript/styles') diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss index ce7150753..db07c3dfa 100644 --- a/app/javascript/styles/mastodon/components.scss +++ b/app/javascript/styles/mastodon/components.scss @@ -705,6 +705,10 @@ .status.status-direct { background: lighten($ui-base-color, 12%); + + &.muted { + background: transparent; + } } .detailed-status, -- cgit