diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2023-01-25 21:58:31 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-25 21:58:31 +0100 |
| commit | 7acf26e7778f8bb2b62c61904547dec75723c203 (patch) | |
| tree | 036948c5d0eb01bf9ae18d612d965ac9c9b89fae /app/javascript/styles | |
| parent | 368d6fe54f94ad2ecd2a1c1e7e5a2359dc37ad30 (diff) | |
| parent | 20934363492db6a33bf89726444c7a41eaa8d854 (diff) | |
Merge pull request #2094 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/styles')
| -rw-r--r-- | app/javascript/styles/mastodon-light/diff.scss | 19 | ||||
| -rw-r--r-- | app/javascript/styles/mastodon/components.scss | 6 |
2 files changed, 3 insertions, 22 deletions
diff --git a/app/javascript/styles/mastodon-light/diff.scss b/app/javascript/styles/mastodon-light/diff.scss index 596b7786b..c37100a28 100644 --- a/app/javascript/styles/mastodon-light/diff.scss +++ b/app/javascript/styles/mastodon-light/diff.scss @@ -551,25 +551,6 @@ html { } } -.directory__tag.active > a, -.directory__tag.active > div { - border-color: $ui-highlight-color; - - &, - h4, - h4 small, - .fa, - .trends__item__current { - color: $white; - } - - &:hover, - &:active, - &:focus { - background: $ui-highlight-color; - } -} - .batch-table { &__toolbar, &__row, diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss index 22f404c3b..32a387a4e 100644 --- a/app/javascript/styles/mastodon/components.scss +++ b/app/javascript/styles/mastodon/components.scss @@ -4441,14 +4441,14 @@ a.status-card.compact:hover { align-items: center; background: rgba($base-overlay-background, 0.8); display: flex; - height: 100%; + height: 100vh; justify-content: center; left: 0; opacity: 0; - position: absolute; + position: fixed; top: 0; visibility: hidden; - width: 100%; + width: 100vw; z-index: 2000; * { |