UX: removes color on categories if no style chosen (#9346)
* UX: removes color on categories if no style chosen * Update app/assets/javascripts/discourse/templates/components/categories-only.hbs * Update messages.hbs Co-authored-by: Robin Ward <robin.ward@gmail.com>
This commit is contained in:
parent
ad6709772a
commit
751f229665
app/assets
javascripts/discourse
stylesheets/desktop
|
@ -1,4 +1,7 @@
|
||||||
import Component from "@ember/component";
|
import Component from "@ember/component";
|
||||||
|
import { equal } from "@ember/object/computed";
|
||||||
|
|
||||||
export default Component.extend({
|
export default Component.extend({
|
||||||
tagName: ""
|
tagName: "",
|
||||||
|
noCategoryStyle: equal("siteSettings.category_style", "none")
|
||||||
});
|
});
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
<tbody aria-labelledby="categories-only-category">
|
<tbody aria-labelledby="categories-only-category">
|
||||||
{{#each categories as |c|}}
|
{{#each categories as |c|}}
|
||||||
<tr data-category-id={{c.id}} data-notification-level={{c.notificationLevelString}} class="{{if c.description_excerpt 'has-description' 'no-description'}} {{if c.uploaded_logo.url 'has-logo' 'no-logo'}}">
|
<tr data-category-id={{c.id}} data-notification-level={{c.notificationLevelString}} class="{{if c.description_excerpt 'has-description' 'no-description'}} {{if c.uploaded_logo.url 'has-logo' 'no-logo'}}">
|
||||||
<td class="category {{if c.isMuted 'muted'}}" style={{border-color c.color}}>
|
<td class="category {{if c.isMuted 'muted'}} {{if noCategoryStyle "no-category-style"}}" style={{unless noCategoryStyle (border-color c.color)}}>
|
||||||
{{category-title-link category=c}}
|
{{category-title-link category=c}}
|
||||||
{{#unless c.isMuted}}
|
{{#unless c.isMuted}}
|
||||||
{{#if c.description_excerpt}}
|
{{#if c.description_excerpt}}
|
||||||
|
|
|
@ -94,6 +94,11 @@
|
||||||
|
|
||||||
tbody {
|
tbody {
|
||||||
.category {
|
.category {
|
||||||
|
&.no-category-style {
|
||||||
|
border-color: transparent;
|
||||||
|
border-left: 0px;
|
||||||
|
padding-left: 0px;
|
||||||
|
}
|
||||||
border-left: 6px solid;
|
border-left: 6px solid;
|
||||||
h3,
|
h3,
|
||||||
h4 {
|
h4 {
|
||||||
|
|
Loading…
Reference in New Issue