Use upstream's Icon component

Rework the codebase to avoid unnecessary differences with upstream
2019-09-09 15:28:45 +02:00
parent f2b307af25
commit f154d9d6e9
18 changed files with 62 additions and 66 deletions
--- a/app/javascript/flavours/glitch/components/icon_with_badge.js
+++ b/app/javascript/flavours/glitch/components/icon_with_badge.js
@@ -6,7 +6,7 @@ const formatNumber = num => num > 40 ? '40+' : num;

 const IconWithBadge = ({ id, count, className }) => (
  <i className='icon-with-badge'>
-    <Icon icon={id} fixedWidth className={className} />
+    <Icon id={id} fixedWidth className={className} />
    {count > 0 && <i className='icon-with-badge__badge'>{formatNumber(count)}</i>}
  </i>
 );