diff --git a/client/app/components/App/fontello-codes.scss b/client/app/components/App/fontello-codes.scss index 9bef7b4a..18e34ad0 100755 --- a/client/app/components/App/fontello-codes.scss +++ b/client/app/components/App/fontello-codes.scss @@ -23,6 +23,7 @@ .icon-seriousness:before { content: '\e815'; } /* '' */ .icon-plus:before { content: '\e816'; } /* '' */ .icon-tick:before { content: '\e817'; } /* '' */ +.icon-keyword-rule:before { content: '\e818'; } .icon-twitter:before { content: '\f099'; } /* '' */ .icon-facebook:before { content: '\f09a'; } /* '' */ .icon-sort:before { content: '\f0dc'; } /* '' */ diff --git a/client/app/utils/filtering.js b/client/app/utils/filtering.js index 6d0b6e35..18fd9baf 100644 --- a/client/app/utils/filtering.js +++ b/client/app/utils/filtering.js @@ -2,7 +2,7 @@ export function getFilterReasonIcon(reasonType) { const reasons = { corporate: 'icon-corporate', - keyword: 'icon-seriousness', // TODO: this needs a real logo + keyword: 'icon-keyword-rule', // TODO: this needs a real logo rudeness: 'icon-toxicity', seriousness: 'icon-seriousness', virality: 'icon-virality', diff --git a/client/app/utils/filtering.test.js b/client/app/utils/filtering.test.js index 31113a18..ce20b4fe 100644 --- a/client/app/utils/filtering.test.js +++ b/client/app/utils/filtering.test.js @@ -490,7 +490,7 @@ describe('filtering', () => { } = getFilteredPosts(POSTS.posts, settings, []); expect(keptPosts.length).toBe(1); expect(filteredPosts.length).toBe(2); - expect(filterReasons).toEqual({ 4521474: [{ label: 'Keyword', type: 'keyword', icon: 'icon-seriousness' }], 4521515: [{ label: 'Keyword', type: 'keyword', icon: 'icon-seriousness' }], 4521559: [] }); + expect(filterReasons).toEqual({ 4521474: [{ label: 'Keyword', type: 'keyword', icon: 'icon-keyword-rule' }], 4521515: [{ label: 'Keyword', type: 'keyword', icon: 'icon-keyword-rule' }], 4521559: [] }); }); it('filters by keyword by OR', () => { @@ -505,7 +505,7 @@ describe('filtering', () => { } = getFilteredPosts(POSTS.posts, settings, []); expect(keptPosts.length).toBe(1); expect(filteredPosts.length).toBe(2); - expect(filterReasons).toEqual({ 4521474: [{ label: 'Keyword', type: 'keyword', icon: 'icon-seriousness' }], 4521515: [], 4521559: [{ label: 'Keyword', type: 'keyword', icon: 'icon-seriousness' }] }); + expect(filterReasons).toEqual({ 4521474: [{ label: 'Keyword', type: 'keyword', icon: 'icon-keyword-rule' }], 4521515: [], 4521559: [{ label: 'Keyword', type: 'keyword', icon: 'icon-keyword-rule' }] }); }); }); }); diff --git a/client/static/custom-icons/fontello.eot b/client/static/custom-icons/fontello.eot index 530c69e1..78fdeaff 100755 Binary files a/client/static/custom-icons/fontello.eot and b/client/static/custom-icons/fontello.eot differ diff --git a/client/static/custom-icons/fontello.svg b/client/static/custom-icons/fontello.svg index f65d2b74..b045803f 100755 --- a/client/static/custom-icons/fontello.svg +++ b/client/static/custom-icons/fontello.svg @@ -1,7 +1,7 @@ -Copyright (C) 2017 by original authors @ fontello.com +Copyright (C) 2019 by original authors @ fontello.com @@ -54,6 +54,8 @@ + + diff --git a/client/static/custom-icons/fontello.ttf b/client/static/custom-icons/fontello.ttf index b15599bd..fd7184d9 100755 Binary files a/client/static/custom-icons/fontello.ttf and b/client/static/custom-icons/fontello.ttf differ diff --git a/client/static/custom-icons/fontello.woff b/client/static/custom-icons/fontello.woff index 085b0d76..b9f88251 100755 Binary files a/client/static/custom-icons/fontello.woff and b/client/static/custom-icons/fontello.woff differ diff --git a/client/static/custom-icons/fontello.woff2 b/client/static/custom-icons/fontello.woff2 index 316cd802..7367d227 100755 Binary files a/client/static/custom-icons/fontello.woff2 and b/client/static/custom-icons/fontello.woff2 differ diff --git a/client/static/icons/rule.svg b/client/static/icons/rule.svg new file mode 100644 index 00000000..454bc764 --- /dev/null +++ b/client/static/icons/rule.svg @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + +