diff options
author | ThibG <thib@sitedethib.com> | 2020-04-05 00:16:23 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-04-05 00:16:23 +0200 |
commit | 6e426267a762f3cd1efa2c5fb120a13543567775 (patch) | |
tree | 2a71acb5433eece834df66c179e924eb34df38fb /app/javascript/flavours/glitch/styles/components | |
parent | 5c5317041f17375666bfaf4788f0adf71804b47d (diff) | |
parent | ec6464f8d0bba52e3bfb8f0afc9531ce80238000 (diff) |
Merge pull request #1311 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/flavours/glitch/styles/components')
-rw-r--r-- | app/javascript/flavours/glitch/styles/components/columns.scss | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/app/javascript/flavours/glitch/styles/components/columns.scss b/app/javascript/flavours/glitch/styles/components/columns.scss index 525dcaf90..3269638eb 100644 --- a/app/javascript/flavours/glitch/styles/components/columns.scss +++ b/app/javascript/flavours/glitch/styles/components/columns.scss @@ -452,7 +452,8 @@ } .empty-column-indicator, -.error-column { +.error-column, +.follow_requests-unlocked_explanation { color: $dark-text-color; background: $ui-base-color; text-align: center; @@ -482,6 +483,11 @@ } } +.follow_requests-unlocked_explanation { + background: darken($ui-base-color, 4%); + contain: initial; +} + .error-column { flex-direction: column; } |