Merge pull request #449 from verdigado/task/bring-back-forkawesome-2

Bring back forkawesome icons for peertube and pixelfed

functions/options/social-media.php

@@ -202,7 +202,8 @@ public function social_media_profiles_callback( $args ) {
  $default[] = 'fab fa-instagram;Instagram;';
  $default[] = 'fab fa-youtube;YouTube;';
  $default[] = 'fas fa-globe;Webseite;';
- $default[] = 'fab fa-peertube;PeerTube;';
+ $default[] = 'forkawesome fa-peertube;PeerTube;';
+ $default[] = 'forkawesome fa-pixelfed;Pixelfed;';
  $default[] = 'fab fa-mastodon;Mastodon;';
 
  printf(

package.json

@@ -21,7 +21,7 @@
  "@wordpress/scripts": "^26.15.0",
  "@wordpress/stylelint-config": "^21.27.0",
  "dir-archiver": "^2.1.0",
- "node-sass": "^8.0.0",
+ "node-sass": "^9.0.0",
  "rtlcss": "^3.5.0"
  },
  "rtlcssConfig": {
@@ -45,7 +45,7 @@
  "lint:scss": "wp-scripts lint-style 'sass/**/*.scss'",
  "lint:js": "wp-scripts lint-js 'js/*.js'",
  "copy-composer": "copyfiles -u 1 vendor/johngrogg/ics-parser/src/ICal/*.php assets/vndr",
- "copy-node-modules": "copyfiles -u 1 node_modules/jquery-slim/dist/*.min.js node_modules/@popperjs/core/dist/umd/popper.min.js node_modules/bootstrap/dist/js/*.min.js node_modules/@fortawesome/fontawesome-free/webfonts/*.woff* node_modules/leaflet/dist/*.js node_modules/leaflet/dist/*.css node_modules/leaflet/dist/images/* node_modules/jquery-datetimepicker/build/*.min.js node_modules/jquery-datetimepicker/build/*.min.css node_modules/lightbox2/dist/css/lightbox.min.css node_modules/lightbox2/dist/js/lightbox.min.js node_modules/lightbox2/dist/images/* assets/vndr",
+ "copy-node-modules": "copyfiles -u 1 node_modules/jquery-slim/dist/*.min.js node_modules/@popperjs/core/dist/umd/popper.min.js node_modules/bootstrap/dist/js/*.min.js node_modules/@fortawesome/fontawesome-free/webfonts/* node_modules/fork-awesome/fonts/* node_modules/leaflet/dist/*.js node_modules/leaflet/dist/*.css node_modules/leaflet/dist/images/* node_modules/jquery-datetimepicker/build/*.min.js node_modules/jquery-datetimepicker/build/*.min.css node_modules/lightbox2/dist/css/lightbox.min.css node_modules/lightbox2/dist/js/lightbox.min.js node_modules/lightbox2/dist/images/* assets/vndr",
  "bundle": "npm run copy-composer && npm run copy-node-modules && cd ../ && dir-archiver --src sunflower --dest sunflower.zip --includebasedir true --exclude Makefile create-changelog.php changelog.html documentation mkdocs .DS_Store .stylelintrc.json .eslintrc .git .gitattributes .github .gitignore README.md composer.json composer.lock node_modules vendor package-lock.json package.json .travis.yml phpcs.xml.dist sass style.css.map .favorites.json",
  "build": "wp-scripts build",
  "start": "wp-scripts start"
@@ -54,6 +54,7 @@
  "@popperjs/core": "^2.11.0",
  "bootstrap": "^5.3.2",
  "copyfiles": "^2.4.1",
+ "fork-awesome": "^1.2.0",
  "jquery-datetimepicker": "^2.5.21",
  "jquery-slim": "^3.0.0",
  "leaflet": "^1.9.3",

sass/_fonts.scss

@@ -40,12 +40,36 @@
  font-display: swap;
 }
 
+@font-face {
+ font-family: ForkAwesome;
+ font-style: normal;
+ font-weight: 400;
+ src: url("assets/vndr/fork-awesome/fonts/forkawesome-webfont.eot");
+ src:
+ url("assets/vndr/fork-awesome/fonts/forkawesome-webfont.eot?#iefix") format("embedded-opentype"),
+ url("assets/vndr/fork-awesome/fonts/forkawesome-webfont.woff2") format("woff2"),
+ url("assets/vndr/fork-awesome/fonts/forkawesome-webfont.woff") format("woff"),
+ url("assets/vndr/fork-awesome/fonts/forkawesome-webfont.ttf") format("truetype"),
+ url("assets/vndr/fork-awesome/fonts/forkawesome-webfont.svg#forkawesomeregular") format("svg");
+ font-display: block;
+}
+
 @font-face {
  font-family: Sarabun;
  src: url("assets/fonts/sarabun-v12-latin-regular.woff") format("woff");
  font-display: swap;
 }
 
+.forkawesome {
+ font-family: ForkAwesome !important;
+ -webkit-font-smoothing: antialiased;
+ display: inline-block;
+ font-style: normal;
+ font-variant: normal;
+ text-rendering: auto;
+ line-height: 1;
+}
+
 .gruenetype {
  font-family: GrueneType !important;
  font-weight: 500;