Merge branch 'patch-a' into 'develop'

Switch to Fork Awesome

See merge request soapbox-pub/soapbox-fe!84

app/soapbox/common.js

@@ -3,7 +3,7 @@
 import Rails from 'rails-ujs';
 
 export function start() {
-  require('font-awesome/css/font-awesome.css');
+  require('fork-awesome/css/fork-awesome.css');
   require.context('../images/', true);
 
   try {

app/soapbox/components/home_column_header.js

@@ -143,7 +143,7 @@ class ColumnHeader extends React.PureComponent {
           </Link>
 
           <Link to='/timeline/local' className={classNames('btn grouped', { 'active': 'local' === activeItem })}>
-            <Icon id='site-icon' fixedWidth className='column-header__icon' />
+            <Icon id='users' fixedWidth className='column-header__icon' />
             {siteTitle}
           </Link>
 

app/soapbox/components/icon.js

@@ -12,7 +12,7 @@ export default class Icon extends React.PureComponent {
 
   render() {
     const { id, className, fixedWidth, ...other } = this.props;
-    // Use the font awesome retweet icon, but change its alt
+    // Use the Fork Awesome retweet icon, but change its alt
     // tag. There is a common adblocker rule which hides elements with
     // alt='retweet' unless the domain is twitter.com. This should
     // change what screenreaders call it as well.

app/styles/fonts.scss

@@ -159,8 +159,8 @@
   font-style: normal;
 }
 
-.fa-site-icon::before {
-  font-family: 'FontAwesome';
+.fa-users::before {
+  font-family: 'ForkAwesome';
   content: '\f0c0';
 }
 

app/styles/ui.scss

@@ -739,7 +739,7 @@
     display: block;
     position: absolute;
     content: '\f00c';
-    font: normal normal normal 14px/1 FontAwesome;
+    font: normal normal normal 14px/1 ForkAwesome;
     font-size: inherit;
     text-rendering: auto;
     -webkit-font-smoothing: antialiased;

package.json

@@ -70,7 +70,7 @@
     "exif-js": "^2.3.0",
     "express": "^4.17.1",
     "file-loader": "^4.0.0",
-    "font-awesome": "^4.7.0",
+    "fork-awesome": "^1.1.7",
     "glob": "^7.1.1",
     "html-webpack-harddisk-plugin": "^1.0.1",
     "html-webpack-plugin": "^4.3.0",

yarn.lock

@@ -5166,11 +5166,6 @@ follow-redirects@^1.0.0:
   dependencies:
     debug "=3.1.0"
 
-font-awesome@^4.7.0:
-  version "4.7.0"
-  resolved "https://registry.yarnpkg.com/font-awesome/-/font-awesome-4.7.0.tgz#8fa8cf0411a1a31afd07b06d2902bb9fc815a133"
-  integrity sha1-j6jPBBGhoxr9B7BtKQK7n8gVoTM=
-
 for-in@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
@@ -5181,6 +5176,11 @@ forever-agent@~0.6.1:
   resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
   integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=
 
+fork-awesome@^1.1.7:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/fork-awesome/-/fork-awesome-1.1.7.tgz#1427da1cac3d1713046ee88427e5fcecb9501d21"
+  integrity sha512-IHI7XCSXrKfUIWslse8c/PaaVDT1oBaYge+ju40ihL2ooiQeBpTr4wvIXhgTd2NuhntlvX+M5jYHAPTzNlmv0g==
+
 form-data@~2.3.2:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"