diff options
author | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-02-11 04:10:16 +0000 |
---|---|---|
committer | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-02-11 04:10:16 +0000 |
commit | efc9ffcb80b995ef8c8d95ab1d8cb0af8efc094d (patch) | |
tree | 6ce57e5980ba0279355f97893d21852caace0232 /app/javascript/styles | |
parent | b6159bcb0a20f3aabfb4d17ad60842b7aa81925c (diff) | |
parent | 718802a05dfb3211d758513daf6070ffa22751dd (diff) |
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'app/javascript/styles')
-rw-r--r-- | app/javascript/styles/mastodon/components.scss | 39 |
1 files changed, 38 insertions, 1 deletions
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss index 91f9739d7..b6244e3f9 100644 --- a/app/javascript/styles/mastodon/components.scss +++ b/app/javascript/styles/mastodon/components.scss @@ -1786,7 +1786,7 @@ flex: 1; min-height: 47px; - > img { + > img { display: block; object-fit: contain; object-position: bottom left; @@ -3229,6 +3229,43 @@ font-weight: 500; } +.search-results__section { + margin-bottom: 20px; + + h5 { + position: relative; + + &::before { + content: ""; + display: block; + position: absolute; + left: 0; + right: 0; + top: 50%; + width: 100%; + height: 0; + border-top: 1px solid lighten($ui-base-color, 8%); + } + + span { + display: inline-block; + background: $ui-base-color; + color: $ui-primary-color; + font-size: 14px; + font-weight: 500; + padding: 10px; + position: relative; + z-index: 1; + cursor: default; + } + } + + .account:last-child, + & > div:last-child .status { + border-bottom: 0; + } +} + .search-results__hashtag { display: block; padding: 10px; |