diff --git a/assets/css/search.css b/assets/css/search.css index 7601fa8a..7f95c88a 100644 --- a/assets/css/search.css +++ b/assets/css/search.css @@ -21,3 +21,29 @@ content: "[ - ]"; font-size: 1.5em; } + +.remove-filter { + margin-left: 6px; + vertical-align: middle; +} + +/* No theme */ + +.no-theme .remove-filter { + color: #ffffff +} + + +/* Light theme */ +@media (prefers-color-scheme: light) { + .light-theme .remove-filter { + color: #ffffff + } +} + + +/* Dark theme */ + +.no-theme .remove-filter { + color: #030303 +} diff --git a/src/invidious/views/search.ecr b/src/invidious/views/search.ecr index 0ed47ede..2b9615be 100644 --- a/src/invidious/views/search.ecr +++ b/src/invidious/views/search.ecr @@ -16,92 +16,117 @@ - <% filter_params = env.request.query_params.to_s.gsub(/q=.+?(?=&)/, "") %> - <% base_url = "/search?q=#{HTML.escape(query.not_nil!)}" %> + <% filter_params = env.request.query_params.to_s.gsub(/q=.+?(?=&|$)/, "") %> + <% base_url = "/search?q=#{HTML.escape(query.not_nil!)}" %> -
- <%= translate(locale, "date") %> -
- <% ["hour", "today", "week", "month", "year"].each do |date| %> -
- <% if operator_hash.fetch("date", "all") == date %> +
+ <%= translate(locale, "date") %> +
+ <% ["hour", "today", "week", "month", "year"].each do |date| %> +
+ <% if operator_hash.fetch("date", "all") == date %> + "> <%= translate(locale, date) %> - <% else %> - "> - <%= translate(locale, date) %> - - <% end %> -
- <% end %> -
+ + + <% else %> + "> + <%= translate(locale, date) %> + + <% end %> +
+ <% end %> +
-
- <%= translate(locale, "content_type") %> -
- <% ["video", "channel", "playlist", "movie", "show"].each do |content_type| %> -
- <% if operator_hash.fetch("content_type", "all") == content_type %> +
+ <%= translate(locale, "content_type") %> +
+ <% ["video", "channel", "playlist", "movie", "show"].each do |content_type| %> +
+ <% if operator_hash.fetch("content_type", "all") == content_type %> + "> <%= translate(locale, content_type) %> - <% else %> - "> - <%= translate(locale, content_type) %> - - <% end %> -
- <% end %> -
+ + + <% else %> + "> + <%= translate(locale, content_type) %> + + <% end %> +
+ <% end %> +
-
- <%= translate(locale, "duration") %> -
- <% ["short", "long"].each do |duration| %> -
- <% if operator_hash.fetch("duration", "all") == duration %> +
+ <%= translate(locale, "duration") %> +
+ <% ["short", "long"].each do |duration| %> +
+ <% if operator_hash.fetch("duration", "all") == duration %> + "> <%= translate(locale, duration) %> - <% else %> - "> - <%= translate(locale, duration) %> - - <% end %> -
- <% end %> -
+ + + <% else %> + "> + <%= translate(locale, duration) %> + + <% end %> +
+ <% end %> +
-
- <%= translate(locale, "features") %> -
- <% ["hd", "subtitles", "creative_commons", "3d", "live", "purchased", "4k", "360", "location", "hdr"].each do |feature| %> -
- <% if operator_hash.fetch("features", "all").includes?(feature) %> - <%= translate(locale, feature) %> - <% elsif operator_hash.has_key?("features") %> - "> - <%= translate(locale, feature) %> + + <% elsif operator_hash.has_key?("features") %> + "> + <%= translate(locale, feature) %> + + <% else %> + "> + <%= translate(locale, feature) %> + + <% end %> +
+ <% end %> +
-
- <%= translate(locale, "sort") %> -
- <% ["relevance", "rating", "date", "views"].each do |sort| %> -
- <% if operator_hash.fetch("sort", "relevance") == sort %> +
+ <%= translate(locale, "sort") %> +
+ <% ["relevance", "rating", "date", "views"].each do |sort| %> +
+ <% if operator_hash.fetch("sort", "relevance") == sort %> + "> <%= translate(locale, sort) %> - <% else %> - "> - <%= translate(locale, sort) %> - - <% end %> -
- <% end %> -
+ + + <% else %> + "> + <%= translate(locale, sort) %> + + <% end %> +
+ <% end %>
<% end %>