diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2023-01-25 17:26:38 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2023-01-25 17:26:38 +0100 |
| commit | 0f4637981b702c047454baa5f6ae312c012d3a79 (patch) | |
| tree | f11c5aaa50b65942f5dec11f2ce54eb529c1bba1 /app | |
| parent | ffea6680761b4b9debf32317912216c093d457d8 (diff) | |
| parent | e5ae75bf6a88ff70570df43635e75db904e40a50 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Diffstat (limited to 'app')
| -rw-r--r-- | app/javascript/styles/mastodon-light/diff.scss | 19 | ||||
| -rw-r--r-- | app/views/settings/featured_tags/index.html.haml | 2 |
2 files changed, 1 insertions, 20 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/views/settings/featured_tags/index.html.haml b/app/views/settings/featured_tags/index.html.haml index 078abd788..3ead9d2e2 100644 --- a/app/views/settings/featured_tags/index.html.haml +++ b/app/views/settings/featured_tags/index.html.haml @@ -17,7 +17,7 @@ %hr.spacer/ - @featured_tags.each do |featured_tag| - .directory__tag{ class: params[:tag] == featured_tag.name ? 'active' : nil } + .directory__tag %div %h4 = fa_icon 'hashtag' |