Browse Source

Merge pull request #2 from yuki-takei/omit-symlinks

Omit symlinks
Yuki Takei 9 years ago
parent
commit
c2213fcd32

+ 2 - 0
lib/views/layout/layout.html

@@ -15,6 +15,8 @@
 
 
   <script src="{{ assets('/js/bundled.js') }}"></script>
   <script src="{{ assets('/js/bundled.js') }}"></script>
   <link href='//fonts.googleapis.com/css?family=Open+Sans:400,700' rel='stylesheet' type='text/css'>
   <link href='//fonts.googleapis.com/css?family=Open+Sans:400,700' rel='stylesheet' type='text/css'>
+  <!-- Font Awesome -->
+  <link href='//cdn.jsdelivr.net/fontawesome/4.7.0/css/font-awesome.min.css' rel='stylesheet' type='text/css'>
 </head>
 </head>
 {% endblock %}
 {% endblock %}
 
 

+ 0 - 1
package.json

@@ -57,7 +57,6 @@
     "express": "~4.14.0",
     "express": "~4.14.0",
     "express-form": "~0.12.0",
     "express-form": "~0.12.0",
     "express-session": "~1.14.0",
     "express-session": "~1.14.0",
-    "font-awesome": "~4.7.0",
     "googleapis": "=12.3.0",
     "googleapis": "=12.3.0",
     "gulp": "~3.9.0",
     "gulp": "~3.9.0",
     "gulp-concat": "~2.6.0",
     "gulp-concat": "~2.6.0",

+ 0 - 1
public/css/diff2html

@@ -1 +0,0 @@
-../../node_modules/diff2html/dist

+ 0 - 1
public/emoji_images

@@ -1 +0,0 @@
-../node_modules/emojify.js/dist/images

+ 0 - 1
public/fonts

@@ -1 +0,0 @@
-../node_modules/font-awesome/fonts

+ 2 - 1
resource/js/util/PreProcessor/Emoji.js

@@ -3,8 +3,9 @@ import emojify from 'emojify.js';
 export default class Emoji {
 export default class Emoji {
 
 
   constructor() {
   constructor() {
+    // see https://github.com/Ranks/emojify.js/issues/123
     emojify.setConfig({
     emojify.setConfig({
-      img_dir: '/emoji_images/basic',
+      img_dir: 'https://github.global.ssl.fastly.net/images/icons/emoji/',
     });
     });
   }
   }