IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: add category colors back to categories pages (#21977)

Browse Source
This commit is contained in:
Kris
2023-06-07 12:57:10 -04:00
committed by GitHub
parent 96c6e535a6
commit e43ac00bf4
5 changed files with 5 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/assets/javascripts/discourse/app/components/categories-boxes-with-topics.hbs
View File

@@ -1,12 +1,7 @@
{{#each this.categories as |c|}} {{#each this.categories as |c|}}
<div <div
data-notification-level={{c.notificationLevelString}} data-notification-level={{c.notificationLevelString}}
style={{unless style={{unless this.noCategoryStyle (category-color-variable c.color)}}
this.noCategoryStyle
(html-safe
(concat (border-color c.color) (category-color-variable c.color))
)
}}
class="category category-box category-box-{{c.slug}} class="category category-box category-box-{{c.slug}}
{{if c.isMuted 'muted'}} {{if c.isMuted 'muted'}}
{{if this.noCategoryStyle 'no-category-boxes-style'}}" {{if this.noCategoryStyle 'no-category-boxes-style'}}"

7
app/assets/javascripts/discourse/app/components/categories-boxes.hbs
View File

@@ -5,12 +5,7 @@
/> />
<div <div
style={{unless style={{unless this.noCategoryStyle (category-color-variable c.color)}}
this.noCategoryStyle
(html-safe
(concat (border-color c.color) (category-color-variable c.color))
)
}}
data-category-id={{c.id}} data-category-id={{c.id}}
data-notification-level={{c.notificationLevelString}} data-notification-level={{c.notificationLevelString}}
data-url={{c.url}} data-url={{c.url}}

5
app/assets/javascripts/discourse/app/components/parent-category-row.hbs
View File

@@ -20,12 +20,7 @@
{{if this.noCategoryStyle 'no-category-style'}}" {{if this.noCategoryStyle 'no-category-style'}}"
style={{unless style={{unless
this.noCategoryStyle this.noCategoryStyle
(html-safe
(concat
(border-color this.category.color)
(category-color-variable this.category.color) (category-color-variable this.category.color)
)
)
}} }}
> >
<CategoryTitleLink @category={{this.category}} /> <CategoryTitleLink @category={{this.category}} />

2
app/assets/stylesheets/common/base/category-list.scss
View File

@@ -58,7 +58,7 @@
border-width: 0; border-width: 0;
border-left-width: 6px; border-left-width: 6px;
border-style: solid; border-style: solid;
border-color: var(--primary-low); border-color: var(--category-color, var(--primary-low));
.mobile-view & { .mobile-view & {
width: 100%; width: 100%;

2
app/assets/stylesheets/desktop/category-list.scss
View File

@@ -92,7 +92,7 @@
tbody { tbody {
.category { .category {
border-left: 6px solid; border-left: 6px solid var(--category-color, var(--primary-low));
h3, h3,
h4 { h4 {
line-height: var(--line-height-medium); line-height: var(--line-height-medium);