diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2019-02-01 00:14:05 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-01 00:14:05 +0100 |
| commit | 1f9519020296c8c24a73d3f99d3c1ad94a627f3b (patch) | |
| tree | 730245deccb6258eaddf9a013d377cd33ea2667b /app/javascript/mastodon/features/ui/components/column_link.js | |
| parent | 3383ed7573866f086ac49b0e975d5c502cdf4b89 (diff) | |
Refactor icons in web UI to use Icon component (#9951)
* Refactor uses of icons to an Icon component in web UI * Refactor options passed to the Icon component * Make tests work with absolute component paths
Diffstat (limited to 'app/javascript/mastodon/features/ui/components/column_link.js')
| -rw-r--r-- | app/javascript/mastodon/features/ui/components/column_link.js | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/javascript/mastodon/features/ui/components/column_link.js b/app/javascript/mastodon/features/ui/components/column_link.js index 25c2d1cf8..0a25f1ea2 100644 --- a/app/javascript/mastodon/features/ui/components/column_link.js +++ b/app/javascript/mastodon/features/ui/components/column_link.js @@ -1,6 +1,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import { Link } from 'react-router-dom'; +import Icon from 'mastodon/components/icon'; const ColumnLink = ({ icon, text, to, href, method, badge }) => { const badgeElement = typeof badge !== 'undefined' ? <span className='column-link__badge'>{badge}</span> : null; @@ -8,7 +9,7 @@ const ColumnLink = ({ icon, text, to, href, method, badge }) => { if (href) { return ( <a href={href} className='column-link' data-method={method}> - <i className={`fa fa-fw fa-${icon} column-link__icon`} /> + <Icon id={icon} fixedWidth className='column-link__icon' /> {text} {badgeElement} </a> @@ -16,7 +17,7 @@ const ColumnLink = ({ icon, text, to, href, method, badge }) => { } else { return ( <Link to={to} className='column-link'> - <i className={`fa fa-fw fa-${icon} column-link__icon`} /> + <Icon id={icon} fixedWidth className='column-link__icon' /> {text} {badgeElement} </Link> |