1
1
mirror of https://github.com/go-gitea/gitea synced 2025-07-22 18:28:37 +00:00

Merged conflicts.

This commit is contained in:
Sergio Benitez
2015-09-09 13:44:51 -07:00
952 changed files with 1344 additions and 1161 deletions

View File

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

View File

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

File diff suppressed because one or more lines are too long

View File

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