UX: Restore category badge colours on 404 page (#24754)
This commit is contained in:
parent
42e5bbaf38
commit
48ec946702
|
@ -25,8 +25,17 @@ module CategoryBadge
|
||||||
category_url =
|
category_url =
|
||||||
opts[:absolute_url] ? "#{Discourse.base_url_no_prefix}#{category.url}" : category.url
|
opts[:absolute_url] ? "#{Discourse.base_url_no_prefix}#{category.url}" : category.url
|
||||||
|
|
||||||
|
# styles
|
||||||
|
styles = {
|
||||||
|
"--category-badge-color": "##{category.color}",
|
||||||
|
"--category-badge-text-color": "##{category.text_color}",
|
||||||
|
}
|
||||||
|
styles["--parent-category-badge-color"] = "##{parent_category.color}" if parent_category
|
||||||
|
style_value = styles.map { |k, v| "#{k}: #{ERB::Util.html_escape(v)};" }.join(" ")
|
||||||
|
|
||||||
# category badge structure
|
# category badge structure
|
||||||
result << "<span data-category-id='#{category.id}'"
|
result << "<span data-category-id='#{category.id}'"
|
||||||
|
result << " style='#{style_value}'"
|
||||||
result << " data-parent-category-id='#{parent_category.id}'" if parent_category
|
result << " data-parent-category-id='#{parent_category.id}'" if parent_category
|
||||||
result << " data-drop-close='true' class='#{class_names}' #{description}>"
|
result << " data-drop-close='true' class='#{class_names}' #{description}>"
|
||||||
result << "<span class='badge-category__name'>"
|
result << "<span class='badge-category__name'>"
|
||||||
|
|
|
@ -20,4 +20,16 @@ RSpec.describe CategoryBadge do
|
||||||
|
|
||||||
expect(html).to include("title='' <b id="x">'")
|
expect(html).to include("title='' <b id="x">'")
|
||||||
end
|
end
|
||||||
|
|
||||||
|
it "includes color vars" do
|
||||||
|
c = Fabricate(:category, color: "123456", text_color: "654321")
|
||||||
|
html = CategoryBadge.html_for(c)
|
||||||
|
|
||||||
|
expect(html).to have_tag(
|
||||||
|
"span[data-category-id]",
|
||||||
|
with: {
|
||||||
|
style: "--category-badge-color: #123456; --category-badge-text-color: #654321;",
|
||||||
|
},
|
||||||
|
)
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue