diff options
| author | ThibG <thib@sitedethib.com> | 2018-05-21 17:51:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-21 17:51:06 +0200 |
| commit | 162f1863a74efdbd2912fef671338c545721742c (patch) | |
| tree | 9ed60f78e2e8acc823bccb7c75ecaa3fdb1b7ab6 /app/javascript/styles | |
| parent | 98ecadbf99aa823164608f796a40ab1cd067bdc2 (diff) | |
| parent | a4c9bda771c04526005f708dfb9ca2ccced60d52 (diff) | |
Merge pull request #499 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/styles')
| -rw-r--r-- | app/javascript/styles/mastodon/accounts.scss | 2 | ||||
| -rw-r--r-- | app/javascript/styles/mastodon/components.scss | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/app/javascript/styles/mastodon/accounts.scss b/app/javascript/styles/mastodon/accounts.scss index 93aa134cf..de0a7ea42 100644 --- a/app/javascript/styles/mastodon/accounts.scss +++ b/app/javascript/styles/mastodon/accounts.scss @@ -1,5 +1,5 @@ .card { - background-color: lighten($ui-base-color, 4%); + background-color: $base-shadow-color; background-size: cover; background-position: center; border-radius: 4px 4px 0 0; diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss index 4022885e1..2967c2d68 100644 --- a/app/javascript/styles/mastodon/components.scss +++ b/app/javascript/styles/mastodon/components.scss @@ -4737,6 +4737,8 @@ a.status-card { } } +.community-timeline__section-headline, +.public-timeline__section-headline, .account__section-headline { background: darken($ui-base-color, 4%); border-bottom: 1px solid lighten($ui-base-color, 8%); |