diff options
| author | ThibG <thib@sitedethib.com> | 2019-03-31 00:37:16 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-31 00:37:16 +0100 |
| commit | 925830d11bb5c132e282f82bdb2ca893d87c9c24 (patch) | |
| tree | 324003d03c66caead9842a6052bc28caf7f654c2 /app/javascript/styles | |
| parent | b6fa500806f68d5394174e1f341dc61e3578760e (diff) | |
| parent | b72950fbd3536260df0b9c22179a6024d4d0c189 (diff) | |
Merge pull request #976 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/styles')
| -rw-r--r-- | app/javascript/styles/mastodon/components.scss | 1 | ||||
| -rw-r--r-- | app/javascript/styles/mastodon/stream_entries.scss | 6 | ||||
| -rw-r--r-- | app/javascript/styles/mastodon/widgets.scss | 1 |
3 files changed, 5 insertions, 3 deletions
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss index 75a9be045..2ad93c59d 100644 --- a/app/javascript/styles/mastodon/components.scss +++ b/app/javascript/styles/mastodon/components.scss @@ -5308,6 +5308,7 @@ noscript { margin-left: -2px; .account__avatar { + background: darken($ui-base-color, 8%); border: 2px solid lighten($ui-base-color, 4%); } } diff --git a/app/javascript/styles/mastodon/stream_entries.scss b/app/javascript/styles/mastodon/stream_entries.scss index d8bd30377..a739c446d 100644 --- a/app/javascript/styles/mastodon/stream_entries.scss +++ b/app/javascript/styles/mastodon/stream_entries.scss @@ -99,9 +99,9 @@ } } - &:active, - &:focus, - &:hover { + &:active:not(:disabled), + &:focus:not(:disabled), + &:hover:not(:disabled) { background: lighten($ui-highlight-color, 10%); svg path:last-child { diff --git a/app/javascript/styles/mastodon/widgets.scss b/app/javascript/styles/mastodon/widgets.scss index 645192ea4..307e509d5 100644 --- a/app/javascript/styles/mastodon/widgets.scss +++ b/app/javascript/styles/mastodon/widgets.scss @@ -352,6 +352,7 @@ border-radius: 50%; position: relative; margin-left: -10px; + background: darken($ui-base-color, 8%); border: 2px solid $ui-base-color; &:nth-child(1) { |