diff options
| author | ThibG <thib@sitedethib.com> | 2019-04-08 18:17:22 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-08 18:17:22 +0200 |
| commit | fc2f7ee8710b498c4533e229aff6391396aa7213 (patch) | |
| tree | 9576b254773166a419b932c50e8f4d354bea73c3 /app/javascript/flavours | |
| parent | 30500dff7cbf27fbee6eb45e20cc24ca0b7a9e77 (diff) | |
| parent | 63837a4b781ad27a4af895b0c983d4aff57d80e3 (diff) | |
Merge pull request #983 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/flavours')
| -rw-r--r-- | app/javascript/flavours/glitch/features/account/components/header.js | 2 | ||||
| -rw-r--r-- | app/javascript/flavours/glitch/styles/stream_entries.scss | 17 |
2 files changed, 17 insertions, 2 deletions
diff --git a/app/javascript/flavours/glitch/features/account/components/header.js b/app/javascript/flavours/glitch/features/account/components/header.js index 13f7741c8..43c4f0d32 100644 --- a/app/javascript/flavours/glitch/features/account/components/header.js +++ b/app/javascript/flavours/glitch/features/account/components/header.js @@ -22,8 +22,6 @@ const messages = defineMessages({ account_locked: { id: 'account.locked_info', defaultMessage: 'This account privacy status is set to locked. The owner manually reviews who can follow them.' }, mention: { id: 'account.mention', defaultMessage: 'Mention @{name}' }, direct: { id: 'account.direct', defaultMessage: 'Direct message @{name}' }, - edit_profile: { id: 'account.edit_profile', defaultMessage: 'Edit profile' }, - unblock: { id: 'account.unblock', defaultMessage: 'Unblock @{name}' }, unmute: { id: 'account.unmute', defaultMessage: 'Unmute @{name}' }, block: { id: 'account.block', defaultMessage: 'Block @{name}' }, mute: { id: 'account.mute', defaultMessage: 'Mute @{name}' }, diff --git a/app/javascript/flavours/glitch/styles/stream_entries.scss b/app/javascript/flavours/glitch/styles/stream_entries.scss index 6735049b9..e18696fb7 100644 --- a/app/javascript/flavours/glitch/styles/stream_entries.scss +++ b/app/javascript/flavours/glitch/styles/stream_entries.scss @@ -109,6 +109,23 @@ } } + &:disabled, + &.disabled { + svg path:last-child { + fill: $ui-primary-color; + } + + &:active, + &:focus, + &:hover { + background: $ui-primary-color; + + svg path:last-child { + fill: $ui-primary-color; + } + } + } + &.button--destructive { &:active, &:focus, |