diff options
| author | ThibG <thib@sitedethib.com> | 2018-10-09 12:11:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-09 12:11:14 +0200 |
| commit | 4134a10549a833ad5ab18b3c579304919d594ce1 (patch) | |
| tree | 696f4b453ad029ffda3d0925c484c11b27b95cc6 /app/javascript/styles | |
| parent | d0b1369a853dc2e5b7934c148547f71f8d103859 (diff) | |
| parent | b368d3c15ddfca983e89ff2858f7f03eb7147d83 (diff) | |
Merge pull request #770 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/styles')
| -rw-r--r-- | app/javascript/styles/mastodon/components.scss | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss index ecd1a8063..6aabf5777 100644 --- a/app/javascript/styles/mastodon/components.scss +++ b/app/javascript/styles/mastodon/components.scss @@ -825,6 +825,7 @@ &.status-direct { background: lighten($ui-base-color, 8%); + border-bottom-color: lighten($ui-base-color, 12%); } &.light { @@ -5496,3 +5497,44 @@ noscript { } } } + +.conversation { + padding: 14px 10px; + border-bottom: 1px solid lighten($ui-base-color, 8%); + cursor: pointer; + + &__header { + display: flex; + margin-bottom: 15px; + } + + &__avatars { + overflow: hidden; + flex: 1 1 auto; + + & > div { + display: flex; + flex-wrap: none; + width: 900px; + } + + .account__avatar { + margin-right: 10px; + } + } + + &__time { + flex: 0 0 auto; + font-size: 14px; + color: $darker-text-color; + text-align: right; + + .display-name { + color: $secondary-text-color; + } + } + + .attachment-list.compact { + margin-top: 15px; + } +} |