Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

RPG Awesome Redux #3420

Merged
merged 21 commits into from
May 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion shared/naturalcrit/codeEditor/autocompleteEmoji.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
const diceFont = require('../../../themes/fonts/iconFonts/diceFont.js');
const elderberryInn = require('../../../themes/fonts/iconFonts/elderberryInn.js');
const fontAwesome = require('../../../themes/fonts/iconFonts/fontAwesome.js');
const gameIcons = require('../../../themes/fonts/iconFonts/gameIcons.js');

const emojis = {
...diceFont,
...elderberryInn,
...fontAwesome
...fontAwesome,
...gameIcons
};

const showAutocompleteEmoji = function(CodeMirror, editor) {
Expand Down
1 change: 1 addition & 0 deletions shared/naturalcrit/codeEditor/codeEditor.less
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
//Icon fonts included so they can appear in emoji autosuggest dropdown
@import (less) './themes/fonts/iconFonts/diceFont.less';
@import (less) './themes/fonts/iconFonts/elderberryInn.less';
@import (less) './themes/fonts/iconFonts/gameIcons.less';

@keyframes sourceMoveAnimation {
50% {background-color: red; color: white;}
Expand Down
4 changes: 3 additions & 1 deletion shared/naturalcrit/markdown.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ const { markedEmoji: MarkedEmojis } = require('marked-emoji');
const diceFont = require('../../themes/fonts/iconFonts/diceFont.js');
const elderberryInn = require('../../themes/fonts/iconFonts/elderberryInn.js');
const fontAwesome = require('../../themes/fonts/iconFonts/fontAwesome.js');
const gameIcons = require('../../themes/fonts/iconFonts/gameIcons.js');

const MathParser = require('expr-eval').Parser;
const renderer = new Marked.Renderer();
Expand Down Expand Up @@ -688,7 +689,8 @@ const MarkedEmojiOptions = {
emojis : {
...diceFont,
...elderberryInn,
...fontAwesome
...fontAwesome,
...gameIcons,
},
renderer : (token)=>`<i class="${token.emoji}"></i>`
};
Expand Down
1 change: 1 addition & 0 deletions themes/V3/Blank/style.less
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
@import (less) './themes/assets/assets.less';
@import (less) './themes/fonts/iconFonts/elderberryInn.less';
@import (less) './themes/fonts/iconFonts/diceFont.less';
@import (less) './themes/fonts/iconFonts/gameIcons.less';

:root {
//Colors
Expand Down
2 changes: 1 addition & 1 deletion themes/fonts/iconFonts/elderberryInn.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ const elderberryInn = {
'ei_slashing' : 'ei slashing',
'ei_thunder' : 'ei thunder',

/* DnD Donditions */
/* DnD Conditions */
'ei_blinded' : 'ei blinded',
'ei_charmed' : 'ei charmed',
'ei_deafened' : 'ei deafened',
Expand Down
13 changes: 13 additions & 0 deletions themes/fonts/iconFonts/game-icons_license.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# Game Icons License

The font used in gameIcons.woff / gameIcons.less / gameIcons.js, and usable in the Homebrewery as "gi" icons, are a subset of the Game-Icons.net library of icons.

## The license

Game-Icons has this to say about their license:

> Game-icons.net is an online repository providing heaps of cool game related graphics.
>
> They are provided provided under the terms of the Creative Commons 3.0 BY license.
>
> It means that you can use them freely as long as you credit the original author in your creation(see below). A mention like "Icons made by {author;}. Available on https://game-icons.net" is fine.
509 changes: 509 additions & 0 deletions themes/fonts/iconFonts/gameIcons.js

Large diffs are not rendered by default.

Loading