diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-04-01 21:28:31 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-04-01 21:28:31 +0200 |
| commit | 12dae9d58316bec32adaac016998ab1cf69d2b45 (patch) | |
| tree | 4ddadcc66d07a1edfcfb9ff0f9cda7cf107d6b46 /app/javascript/styles | |
| parent | 925830d11bb5c132e282f82bdb2ca893d87c9c24 (diff) | |
| parent | 120544067fcca4bf6e71ba1ffb276c451c17c656 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/models/form/admin_settings.rb - config/locales/ja.yml
Diffstat (limited to 'app/javascript/styles')
| -rw-r--r-- | app/javascript/styles/mastodon/stream_entries.scss | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/javascript/styles/mastodon/stream_entries.scss b/app/javascript/styles/mastodon/stream_entries.scss index a739c446d..d8bd30377 100644 --- a/app/javascript/styles/mastodon/stream_entries.scss +++ b/app/javascript/styles/mastodon/stream_entries.scss @@ -99,9 +99,9 @@ } } - &:active:not(:disabled), - &:focus:not(:disabled), - &:hover:not(:disabled) { + &:active, + &:focus, + &:hover { background: lighten($ui-highlight-color, 10%); svg path:last-child { |