Unknwon 9 years ago
parent
commit
d48cde6ec8

+ 5 - 0
public/ng/css/gogs.css

@@ -278,6 +278,11 @@ img.avatar-100 {
   padding-left: 0;
   list-style: none;
 }
+.emoji {
+  width: 1.5em;
+  height: 1.5em;
+  display: inline-block;
+}
 .markdown {
   overflow: hidden;
   font-family: "Helvetica Neue", Helvetica, "Segoe UI", Arial, freesans, sans-serif;

+ 4 - 0
public/ng/js/gogs.js

@@ -936,6 +936,10 @@ $(document).ready(function () {
     $('#pull-issue-preview').markdown_preview(".issue-add-comment");
 
     homepage();
+    emojify.setConfig({
+        img_dir:'/img/emoji'
+    });
+    emojify.run();
 
     // Fix language drop-down menu height.
     var l = $('#footer-lang li').length;

File diff suppressed because it is too large
+ 0 - 0
public/ng/js/min/gogs-min.js


+ 5 - 0
public/ng/less/gogs/base.less

@@ -299,3 +299,8 @@ clear: both;
     padding-left: 0;
     list-style: none;
 }
+.emoji {
+    width: 1.5em;
+    height: 1.5em;
+    display: inline-block;
+}

+ 1 - 0
templates/ng/base/head.tmpl

@@ -29,6 +29,7 @@
     	<script src="{{AppSubUrl}}/ng/js/lib/lib.js"></script>
     	<script src="{{AppSubUrl}}/ng/js/lib/jquery.tipsy.js"></script>
     	<script src="{{AppSubUrl}}/ng/js/lib/jquery.magnific-popup.min.js"></script>
+	<script src="{{AppSubUrl}}/js/libs/emojify-1.1.0.min.js"></script>
         <script src="{{AppSubUrl}}/ng/js/utils/tabs.js"></script>
         <script src="{{AppSubUrl}}/ng/js/utils/preview.js"></script>
 		<script src="{{AppSubUrl}}/ng/js/gogs/issue_label.js"></script>

Some files were not shown because too many files changed in this diff