diff --git a/extensions/tags/js/src/common/helpers/tagLabel.js b/extensions/tags/js/src/common/helpers/tagLabel.js index 51bf849cd..9d9c5110c 100644 --- a/extensions/tags/js/src/common/helpers/tagLabel.js +++ b/extensions/tags/js/src/common/helpers/tagLabel.js @@ -1,5 +1,5 @@ import extract from 'flarum/common/utils/extract'; -import getContrast from 'flarum/common/utils/getContrast'; +import isDark from 'flarum/common/utils/isDark'; import Link from 'flarum/common/components/Link'; import tagIcon from './tagIcon'; @@ -12,16 +12,15 @@ export default function tagLabel(tag, attrs = {}) { if (tag) { const color = tag.color(); - const contrast = getContrast(color); if (color) { attrs.style['--tag-bg'] = color; attrs.className += ' colored'; - if (contrast >= 128) { - attrs.className += ' tag-light'; + if (isDark(color)) { + attrs.className += ' tag-dark'; } else { - attrs.className += ' tag-dark'; + attrs.className += ' tag-light'; } } diff --git a/extensions/tags/js/src/forum/components/TagsPage.js b/extensions/tags/js/src/forum/components/TagsPage.js index 940e2ee41..4a46f8cf2 100755 --- a/extensions/tags/js/src/forum/components/TagsPage.js +++ b/extensions/tags/js/src/forum/components/TagsPage.js @@ -4,7 +4,7 @@ import Link from 'flarum/common/components/Link'; import LoadingIndicator from 'flarum/common/components/LoadingIndicator'; import listItems from 'flarum/common/helpers/listItems'; import humanTime from 'flarum/common/helpers/humanTime'; -import getContrast from 'flarum/common/utils/getContrast'; +import isDark from 'flarum/common/utils/isDark'; import tagIcon from '../../common/helpers/tagIcon'; import tagLabel from '../../common/helpers/tagLabel'; @@ -59,7 +59,7 @@ export default class TagsPage extends Page { const children = sortTags(tag.children() || []); return ( -