0
0
mirror of https://github.com/naturalcrit/homebrewery.git synced 2026-03-23 17:28:11 +00:00

Merge branch 'master' into pr/3477

This commit is contained in:
Trevor Buckner
2024-05-21 17:42:03 -04:00
45 changed files with 16361 additions and 15327 deletions

View File

@@ -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) {

View File

@@ -3,7 +3,6 @@ require('./codeEditor.less');
const React = require('react');
const createClass = require('create-react-class');
const _ = require('lodash');
const cx = require('classnames');
const closeTag = require('./close-tag');
const autoCompleteEmoji = require('./autocompleteEmoji');

View File

@@ -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;}