From ff4e295c4fa72c05829959610f20faa02e71e5ff Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Thu, 27 Jul 2017 19:22:19 -0400 Subject: [PATCH] FIX: Notifications dropdown had incorrect spacing --- .../javascripts/discourse-common/lib/icon-library.js.es6 | 6 ++++-- .../discourse/widgets/topic-notifications-button.js.es6 | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/discourse-common/lib/icon-library.js.es6 b/app/assets/javascripts/discourse-common/lib/icon-library.js.es6 index be4f004055..60fe773995 100644 --- a/app/assets/javascripts/discourse-common/lib/icon-library.js.es6 +++ b/app/assets/javascripts/discourse-common/lib/icon-library.js.es6 @@ -54,6 +54,8 @@ registerIconRenderer({ }, node(id, params) { + let tagName = params.tagName || 'i'; + const properties = { className: faClasses(id, params), attributes: { "aria-hidden": true } @@ -61,9 +63,9 @@ registerIconRenderer({ if (params.title) { properties.attributes.title = params.title; } if (params.label) { - return h('i', properties, h('span.sr-only', I18n.t(params.label))); + return h(tagName, properties, h('span.sr-only', I18n.t(params.label))); } else { - return h('i', properties); + return h(tagName, properties); } } }); diff --git a/app/assets/javascripts/discourse/widgets/topic-notifications-button.js.es6 b/app/assets/javascripts/discourse/widgets/topic-notifications-button.js.es6 index 74ae08c495..71062d741c 100644 --- a/app/assets/javascripts/discourse/widgets/topic-notifications-button.js.es6 +++ b/app/assets/javascripts/discourse/widgets/topic-notifications-button.js.es6 @@ -10,7 +10,7 @@ createWidget('notification-option', { html(attrs) { return h('a', [ - iconNode(attrs.icon, { class: attrs.key }), + iconNode(attrs.icon, { class: `icon ${attrs.key}`, tagName: 'span' }), h('div', [ h('span.title', I18n.t(`topic.notifications.${attrs.key}.title`)), h('span.desc', I18n.t(`topic.notifications.${attrs.key}.description`)),