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/styles | |
| parent | 30500dff7cbf27fbee6eb45e20cc24ca0b7a9e77 (diff) | |
| parent | 63837a4b781ad27a4af895b0c983d4aff57d80e3 (diff) | |
Merge pull request #983 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/styles')
| -rw-r--r-- | app/javascript/styles/mastodon/components.scss | 3 | ||||
| -rw-r--r-- | app/javascript/styles/mastodon/stream_entries.scss | 17 |
2 files changed, 19 insertions, 1 deletions
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss index 2ad93c59d..9fcaeb8dd 100644 --- a/app/javascript/styles/mastodon/components.scss +++ b/app/javascript/styles/mastodon/components.scss @@ -46,7 +46,8 @@ } } - &:disabled { + &:disabled, + &.disabled { background-color: $ui-primary-color; cursor: default; } diff --git a/app/javascript/styles/mastodon/stream_entries.scss b/app/javascript/styles/mastodon/stream_entries.scss index d8bd30377..63eeffe25 100644 --- a/app/javascript/styles/mastodon/stream_entries.scss +++ b/app/javascript/styles/mastodon/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, |