bigbuffet/pleroma
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use forked Emoji Mart picker to do the font icon picker instead

Browse source
This commit is contained in:
Sean King 2020-10-16 19:35:28 -06:00
parent 3d64f9647c
commit 9507b7a82f
No known key found for this signature in database
GPG key ID: 510C52BACD6E7257
7 changed files with 14 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
app/soapbox/features/soapbox_config/components/icon_picker_dropdown.js
View file

Binary file not shown.

56
app/soapbox/features/soapbox_config/forkawesome.json
View file

@ -392,25 +392,7 @@
"fa fa-spell-check",
"fa fa-moon",
"fa fa-sun",
"fa fa-biometric",
"fa fa-volume-mute",
"fa fa-bell-ringing",
"fa fa-bell-ringing-o",
"fa fa-bunny",
"fa fa-cc-by",
"fa fa-cc-cc",
"fa fa-cc-nc-eu",
"fa fa-cc-nc-jp",
"fa fa-cc-nc",
"fa fa-cc-nd",
"fa fa-cc-pd",
"fa fa-cc-remix",
"fa fa-cc-sa",
"fa fa-cc-share",
"fa fa-cc-zero",
"fa fa-email-bulk",
"fa fa-email-bulk-o",
"fa fa-skate"
"fa fa-biometric"
],
"Text Editor Icons": [
"fa fa-th-large",
@ -730,41 +712,7 @@
"fa fa-unsplash",
"fa fa-hackster",
"fa fa-f-droid",
"fa fa-wire",
"fa fa-tor-onion",
"fa fa-hal",
"fa fa-jupyter",
"fa fa-julia",
"fa fa-classicpress",
"fa fa-classicpress-circle",
"fa fa-open-collective",
"fa fa-orcid",
"fa fa-researchgate",
"fa fa-funkwhale",
"fa fa-boardgamegeek",
"fa fa-buymeacoffee",
"fa fa-conway-glider",
"fa fa-csharp",
"fa fa-gnu",
"fa fa-google-play",
"fa fa-heroku",
"fa fa-home-assistant",
"fa fa-java",
"fa fa-mariadb",
"fa fa-markdown",
"fa fa-mysql",
"fa fa-nordcast",
"fa fa-plume",
"fa fa-postgresql",
"fa fa-sass-alt",
"fa fa-sass",
"fa fa-sketchfab",
"fa fa-tex",
"fa fa-textpattern",
"fa fa-unity",
"fa fa-signalapp",
"fa fa-askfm",
"fa fa-blockstack"
"fa fa-signalapp"
],
"Medical Icons": [
"fa fa-user-md",

BIN
app/soapbox/features/soapbox_config/index.js
View file

Binary file not shown.

7
app/styles/emoji_picker.scss
View file

@ -173,6 +173,13 @@
display: inline-block;
font-size: 0;
.fa {
font-size: 18px;
width: 22px;
height: 22px;
text-align: center;
}
span {
width: 22px;
height: 22px;

1
app/styles/forms.scss
View file

@ -518,6 +518,7 @@ code {
padding: 9px;
border: 1px solid var(--highlight-text-color);
border-radius: 4px;
cursor: pointer;
.fa {
font-size: 18px;

2
package.json
View file

@ -62,7 +62,7 @@
"cssnano": "^4.1.10",
"detect-passive-events": "^1.0.2",
"dotenv": "^8.0.0",
"emoji-mart": "Gargron/emoji-mart#build",
"emoji-mart": "https://gitlab.com/seanking2919/emoji-mart#build",
"es6-symbol": "^3.1.1",
"escape-html": "^1.0.3",
"exif-js": "^2.3.0",

6
yarn.lock
View file

@ -4473,9 +4473,9 @@ elliptic@^6.0.0:
minimalistic-assert "^1.0.0"
minimalistic-crypto-utils "^1.0.0"
emoji-mart@Gargron/emoji-mart#build:
version "2.6.2"
resolved "https://codeload.github.com/Gargron/emoji-mart/tar.gz/ff00dc470b5b2d9f145a6d6e977a54de5df2b4c9"
"emoji-mart@https://gitlab.com/seanking2919/emoji-mart#build":
version "2.6.3"
resolved "https://gitlab.com/seanking2919/emoji-mart#c2d4dc6232e1cb1fd9541a12d2748015cddb14b1"
emoji-regex@^7.0.1:
version "7.0.3"