diff options
| author | ThibG <thib@sitedethib.com> | 2020-07-01 21:51:16 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-01 21:51:16 +0200 |
| commit | 665eb1affe7ba765af476e6f00096aad3af70735 (patch) | |
| tree | 20fbd695cfc9bad551abead27a80fdb0e19567b9 /app/javascript/flavours/glitch/styles | |
| parent | 39a0622de70dc24275808cee9526658bd68a55ed (diff) | |
| parent | f60c78ff3e42e321b457a7d63868b49bf56adfda (diff) | |
Merge pull request #1369 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/flavours/glitch/styles')
| -rw-r--r-- | app/javascript/flavours/glitch/styles/accounts.scss | 4 | ||||
| -rw-r--r-- | app/javascript/flavours/glitch/styles/components/status.scss | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/app/javascript/flavours/glitch/styles/accounts.scss b/app/javascript/flavours/glitch/styles/accounts.scss index a827d271a..a5ddde937 100644 --- a/app/javascript/flavours/glitch/styles/accounts.scss +++ b/app/javascript/flavours/glitch/styles/accounts.scss @@ -78,6 +78,10 @@ margin-left: 15px; text-align: left; + i[data-hidden] { + display: none; + } + strong { font-size: 15px; color: $primary-text-color; diff --git a/app/javascript/flavours/glitch/styles/components/status.scss b/app/javascript/flavours/glitch/styles/components/status.scss index fe4f16353..a65581136 100644 --- a/app/javascript/flavours/glitch/styles/components/status.scss +++ b/app/javascript/flavours/glitch/styles/components/status.scss @@ -295,7 +295,7 @@ position: relative; height: auto; border-bottom: 1px solid lighten($ui-base-color, 8%); - cursor: default; + cursor: auto; @supports (-ms-overflow-style: -ms-autohiding-scrollbar) { // Add margin to avoid Edge auto-hiding scrollbar appearing over content. |