Remove last traces of has-emoji class (#11263)

Now that emojify.js has been removed, get rid of all instances of has-emoji class that was only used for that. Support for rendering shortcodes should remain in all of these places so it should still work the same.

Co-authored-by: 6543 <6543@obermui.de>
Co-authored-by: Lauris BH <lauris@nix.lv>

diff --git a/modules/markup/html.go b/modules/markup/html.go
index c5bb4d847b06712e9046459c0ff01dfdb796dc54..8fbfee6a533193c70a2c61265a3f109a11cd0dda 100644 (file)
--- a/modules/markup/html.go
+++ b/modules/markup/html.go
@@ -284,6 +284,8 @@ func RenderDescriptionHTML(
                urlPrefix: urlPrefix,
                procs: []processor{
                        descriptionLinkProcessor,
+                       emojiShortCodeProcessor,
+                       emojiProcessor,
                },
        }
        return ctx.postProcess(rawHTML)

diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 8d188e32e5d8275319de53d3a4b581e664a6f484..a6c5d4197862d859328ef8c955855ca3211cdf03 100644 (file)
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -865,8 +865,8 @@ issues.label_templates.info = No labels exist yet. Create a label with 'New Labe
 issues.label_templates.helper = Select a label set
 issues.label_templates.use = Use Label Set
 issues.label_templates.fail_to_load_file = Failed to load label template file '%s': %v
-issues.add_label_at = added the <div class="ui label has-emoji" style="color: %s\; background-color: %s">%s</div> label %s
-issues.remove_label_at = removed the <div class="ui label has-emoji" style="color: %s\; background-color: %s">%s</div> label %s
+issues.add_label_at = added the <div class="ui label" style="color: %s\; background-color: %s">%s</div> label %s
+issues.remove_label_at = removed the <div class="ui label" style="color: %s\; background-color: %s">%s</div> label %s
 issues.add_milestone_at = `added this to the <b>%s</b> milestone %s`
 issues.change_milestone_at = `modified the milestone from <b>%s</b> to <b>%s</b> %s`
 issues.remove_milestone_at = `removed this from the <b>%s</b> milestone %s`

diff --git a/templates/explore/repo_list.tmpl b/templates/explore/repo_list.tmpl
index 72b36432ef6418824fb00f9c355b3f8b5dd99a39..42e8d1f662d53212b350ac35746ff31855cc911d 100644 (file)
--- a/templates/explore/repo_list.tmpl
+++ b/templates/explore/repo_list.tmpl
@@ -29,7 +29,7 @@
                                </div>
                        </div>
                        <div class="description">
-                               {{if .DescriptionHTML}}<p class="has-emoji">{{.DescriptionHTML}}</p>{{end}}
+                               {{if .DescriptionHTML}}<p>{{.DescriptionHTML}}</p>{{end}}
                                {{if .Topics }}
                                        <div class="ui tags">
                                        {{range .Topics}}

diff --git a/templates/repo/activity.tmpl b/templates/repo/activity.tmpl
index c11a841b2d6316bc28853094adb14986555d2ecb..41f6be64309e06dd2ecd75316de1d2bec4f32a5a 100644 (file)
--- a/templates/repo/activity.tmpl
+++ b/templates/repo/activity.tmpl
@@ -129,7 +129,7 @@
                                                <div class="ui green label">{{$.i18n.Tr "repo.activity.published_release_label"}}</div>
                                                {{.TagName}}
                                                {{if not .IsTag}}
-                                                       <a class="title has-emoji" href="{{$.RepoLink}}/src/{{.TagName | EscapePound}}">{{.Title}}</a>
+                                                       <a class="title" href="{{$.RepoLink}}/src/{{.TagName | EscapePound}}">{{.Title | RenderEmoji}}</a>
                                                {{end}}
                                                {{TimeSinceUnix .CreatedUnix $.Lang}}
                                        </p>
@@ -146,7 +146,7 @@
                                {{range .Activity.MergedPRs}}
                                        <p class="desc">
                                                <div class="ui purple label">{{$.i18n.Tr "repo.activity.merged_prs_label"}}</div>
-                                               #{{.Index}} <a class="title has-emoji" href="{{$.RepoLink}}/pulls/{{.Index}}">{{.Issue.Title}}</a>
+                                               #{{.Index}} <a class="title" href="{{$.RepoLink}}/pulls/{{.Index}}">{{.Issue.Title | RenderEmoji}}</a>
                                                {{TimeSinceUnix .MergedUnix $.Lang}}
                                        </p>
                                {{end}}
@@ -162,7 +162,7 @@
                                {{range .Activity.OpenedPRs}}
                                        <p class="desc">
                                                <div class="ui green label">{{$.i18n.Tr "repo.activity.opened_prs_label"}}</div>
-                                               #{{.Index}} <a class="title has-emoji" href="{{$.RepoLink}}/pulls/{{.Index}}">{{.Issue.Title}}</a>
+                                               #{{.Index}} <a class="title" href="{{$.RepoLink}}/pulls/{{.Index}}">{{.Issue.Title | RenderEmoji}}</a>
                                                {{TimeSinceUnix .Issue.CreatedUnix $.Lang}}
                                        </p>
                                {{end}}
@@ -178,7 +178,7 @@
                                {{range .Activity.ClosedIssues}}
                                        <p class="desc">
                                                <div class="ui red label">{{$.i18n.Tr "repo.activity.closed_issue_label"}}</div>
-                                               #{{.Index}} <a class="title has-emoji" href="{{$.RepoLink}}/issues/{{.Index}}">{{.Title}}</a>
+                                               #{{.Index}} <a class="title" href="{{$.RepoLink}}/issues/{{.Index}}">{{.Title | RenderEmoji}}</a>
                                                {{TimeSinceUnix .ClosedUnix $.Lang}}
                                        </p>
                                {{end}}
@@ -194,7 +194,7 @@
                                {{range .Activity.OpenedIssues}}
                                        <p class="desc">
                                                <div class="ui green label">{{$.i18n.Tr "repo.activity.new_issue_label"}}</div>
-                                               #{{.Index}} <a class="title has-emoji" href="{{$.RepoLink}}/issues/{{.Index}}">{{.Title}}</a>
+                                               #{{.Index}} <a class="title" href="{{$.RepoLink}}/issues/{{.Index}}">{{.Title | RenderEmoji}}</a>
                                                {{TimeSinceUnix .CreatedUnix $.Lang}}
                                        </p>
                                {{end}}
@@ -215,9 +215,9 @@
                                                <div class="ui green label">{{$.i18n.Tr "repo.activity.unresolved_conv_label"}}</div>
                                                #{{.Index}}
                                                {{if .IsPull}}
-                                               <a class="title has-emoji" href="{{$.RepoLink}}/pulls/{{.Index}}">{{.Title}}</a>
+                                               <a class="title" href="{{$.RepoLink}}/pulls/{{.Index}}">{{.Title | RenderEmoji}}</a>
                                                {{else}}
-                                               <a class="title has-emoji" href="{{$.RepoLink}}/issues/{{.Index}}">{{.Title}}</a>
+                                               <a class="title" href="{{$.RepoLink}}/issues/{{.Index}}">{{.Title | RenderEmoji}}</a>
                                                {{end}}
                                                {{TimeSinceUnix .UpdatedUnix $.Lang}}
                                        </p>

diff --git a/templates/repo/blame.tmpl b/templates/repo/blame.tmpl
index 0a906d1f1813c95f963de60d84cf0c1877b09dce..c2410e8c1d0d7b927d0e7f3833ed01cbfbaffd76 100644 (file)
--- a/templates/repo/blame.tmpl
+++ b/templates/repo/blame.tmpl
@@ -34,7 +34,7 @@
        </h4>
 
     <div class="ui attached table unstackable segment">
-        <div class="file-view code-view has-emoji">
+        <div class="file-view code-view">
             <table>
                 <tbody>
                     <tr>

diff --git a/templates/repo/commits_list.tmpl b/templates/repo/commits_list.tmpl
index 5dc12c642bdbaa492635f19816570bbbde36dfc4..92da6c1b294a7382dde9061acc5c0fa1fb7abf4d 100644 (file)
--- a/templates/repo/commits_list.tmpl
+++ b/templates/repo/commits_list.tmpl
@@ -74,10 +74,10 @@
                                                <td class="message">
                                                        <span class="message-wrapper">
                                                        {{if $.PageIsWiki}}
-                                                               <span class="commit-summary has-emoji{{if gt .ParentCount 1}} grey text{{end}}" title="{{.Summary}}">{{.Summary}}</span>
+                                                               <span class="commit-summary {{if gt .ParentCount 1}} grey text{{end}}" title="{{.Summary}}">{{.Summary | RenderEmoji}}</span>
                                                        {{else }}
                                                                {{ $commitLink:= printf "%s/%s/%s/commit/%s" AppSubUrl $.Username $.Reponame .ID }}
-                                                               <span class="commit-summary has-emoji{{if gt .ParentCount 1}} grey text{{end}}" title="{{.Summary}}">{{RenderCommitMessageLinkSubject .Message $.RepoLink $commitLink $.Repository.ComposeMetas}}</span>
+                                                               <span class="commit-summary {{if gt .ParentCount 1}} grey text{{end}}" title="{{.Summary}}">{{RenderCommitMessageLinkSubject .Message $.RepoLink $commitLink $.Repository.ComposeMetas}}</span>
                                                        {{end}}
                                                        </span>
                                                        {{if IsMultilineCommitMessage .Message}}

diff --git a/templates/repo/diff/comments.tmpl b/templates/repo/diff/comments.tmpl
index f5b8d8042dea3c01a0a77c6cfe09061c5279dad8..288b2316a6274a87b3b16a7a12b0e18d4b986885 100644 (file)
--- a/templates/repo/diff/comments.tmpl
+++ b/templates/repo/diff/comments.tmpl
@@ -35,7 +35,7 @@
                        </div>
                </div>
                <div class="ui attached segment">
-                       <div class="render-content markdown has-emoji">
+                       <div class="render-content markdown">
                        {{if .RenderedContent}}
                                {{.RenderedContent|Str2html}}
                        {{else}}

diff --git a/templates/repo/graph.tmpl b/templates/repo/graph.tmpl
index 20fe3d1527499f0ece2c42029d55c82f734742b8..5f4d9f1d622633146fd61878f1ccfd127be2bb47 100644 (file)
--- a/templates/repo/graph.tmpl
+++ b/templates/repo/graph.tmpl
@@ -24,7 +24,7 @@
                    <a href="{{AppSubUrl}}/{{$.Username}}/{{$.Reponame}}/commit/{{.Rev}}">{{ .ShortRev}}</a>
                  </code>
                  <strong> {{.Branch}}</strong>
-                 <span class="has-emoji">{{RenderCommitMessage .Subject $.RepoLink $.Repository.ComposeMetas}}</span> by
+                 <span>{{RenderCommitMessage .Subject $.RepoLink $.Repository.ComposeMetas}}</span> by
                  <span class="author">
                    {{.Author}}
                  </span>

diff --git a/templates/repo/home.tmpl b/templates/repo/home.tmpl
index 2397cb1b889c674d39aef2cfa213ab9d027bb823..51e924747cc79e67b389c65b17c4bdffecca432e 100644 (file)
--- a/templates/repo/home.tmpl
+++ b/templates/repo/home.tmpl
@@ -5,7 +5,7 @@
                {{template "base/alert" .}}
                <div class="ui repo-description">
                        <div id="repo-desc">
-                               {{if .Repository.DescriptionHTML}}<span class="description has-emoji">{{.Repository.DescriptionHTML}}</span>{{else if .IsRepositoryAdmin}}<span class="no-description text-italic">{{.i18n.Tr "repo.no_desc"}}</span>{{end}}
+                               {{if .Repository.DescriptionHTML}}<span class="description">{{.Repository.DescriptionHTML}}</span>{{else if .IsRepositoryAdmin}}<span class="no-description text-italic">{{.i18n.Tr "repo.no_desc"}}</span>{{end}}
                                <a class="link" href="{{.Repository.Website}}">{{.Repository.Website}}</a>
                        </div>
                        {{if .RepoSearchEnabled}}

diff --git a/templates/repo/issue/labels/label_list.tmpl b/templates/repo/issue/labels/label_list.tmpl
index 5692f36d22c8dd81e6f6235e5a0004dd8e0ca2d8..e9f235e3b764cf55424e4879d6b97840e478636f 100644 (file)
--- a/templates/repo/issue/labels/label_list.tmpl
+++ b/templates/repo/issue/labels/label_list.tmpl
@@ -31,11 +31,11 @@
                        <li class="item">
                        <div class="ui grid middle aligned">
                                <div class="four wide column">
-                                       <div class="ui label" style="color: {{.ForegroundColor}}; background-color: {{.Color}}">{{svg "octicon-tag" 16}} {{.Name | RenderEmojiPlain}}</div>
+                                       <div class="ui label" style="color: {{.ForegroundColor}}; background-color: {{.Color}}">{{svg "octicon-tag" 16}} {{.Name | RenderEmoji}}</div>
                                </div>
                                <div class="six wide column">
-                                       <div class="ui has-emoji">
-                                       {{.Description}}
+                                       <div class="ui">
+                                       {{.Description | RenderEmoji}}
                                        </div>
                                </div>
                                <div class="three wide column">
@@ -74,11 +74,11 @@
                                        <li class="item">
                                        <div class="ui grid middle aligned">
                                                <div class="three wide column">
-                                                       <div class="ui label" style="color: {{.ForegroundColor}}; background-color: {{.Color}}">{{svg "octicon-tag" 16}} {{.Name | RenderEmojiPlain}}</div>
+                                                       <div class="ui label" style="color: {{.ForegroundColor}}; background-color: {{.Color}}">{{svg "octicon-tag" 16}} {{.Name | RenderEmoji}}</div>
                                                </div>
                                                <div class="seven wide column">
-                                                       <div class="ui has-emoji">
-                                                       {{.Description}}
+                                                       <div class="ui">
+                                                       {{.Description | RenderEmoji}}
                                                        </div>
                                                </div>
                                                <div class="three wide column">

diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl
index dbfee8480f228d7e8dcfabcd133c2328347405e0..2b9078dfc1e07e352c8580154e76268b068502d1 100644 (file)
--- a/templates/repo/issue/list.tmpl
+++ b/templates/repo/issue/list.tmpl
@@ -51,7 +51,7 @@
                                                        <span class="info">{{.i18n.Tr "repo.issues.filter_label_exclude" | Safe}}</span>
                                                        <a class="item" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&milestone={{$.MilestoneID}}&assignee={{$.AssigneeID}}">{{.i18n.Tr "repo.issues.filter_label_no_select"}}</a>
                                                        {{range .Labels}}
-                                                               <a class="item label-filter-item" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&labels={{.QueryString}}&milestone={{$.MilestoneID}}&assignee={{$.AssigneeID}}" data-label-id="{{.ID}}">{{if .IsExcluded}}{{svg "octicon-circle-slash" 16}}{{else if .IsSelected}}{{svg "octicon-check" 16}}{{end}}<span class="label color" style="background-color: {{.Color}}"></span> {{.Name | RenderEmojiPlain}}</a>
+                                                               <a class="item label-filter-item" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&labels={{.QueryString}}&milestone={{$.MilestoneID}}&assignee={{$.AssigneeID}}" data-label-id="{{.ID}}">{{if .IsExcluded}}{{svg "octicon-circle-slash" 16}}{{else if .IsSelected}}{{svg "octicon-check" 16}}{{end}}<span class="label color" style="background-color: {{.Color}}"></span> {{.Name | RenderEmoji}}</a>
                                                        {{end}}
                                                </div>
                                        </div>
@@ -155,7 +155,7 @@
                                                <div class="menu">
                                                        {{range .Labels}}
                                                                <div class="item issue-action" data-action="toggle" data-element-id="{{.ID}}" data-url="{{$.RepoLink}}/issues/labels">
-                                                                       {{if contain $.SelLabelIDs .ID}}{{svg "octicon-check" 16}}{{end}}<span class="label color" style="background-color: {{.Color}}"></span> {{.Name | RenderEmojiPlain}}
+                                                                       {{if contain $.SelLabelIDs .ID}}{{svg "octicon-check" 16}}{{end}}<span class="label color" style="background-color: {{.Color}}"></span> {{.Name | RenderEmoji}}
                                                                </div>
                                                        {{end}}
                                                </div>
@@ -220,7 +220,7 @@
                                        {{end}}
 
                                        {{range .Labels}}
-                                               <a class="ui label" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&state={{$.State}}&labels={{.ID}}&milestone={{$.MilestoneID}}&assignee={{$.AssigneeID}}" style="color: {{.ForegroundColor}}; background-color: {{.Color}}" title="{{.Description | RenderEmojiPlain}}">{{.Name | RenderEmojiPlain}}</a>
+                                               <a class="ui label" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&state={{$.State}}&labels={{.ID}}&milestone={{$.MilestoneID}}&assignee={{$.AssigneeID}}" style="color: {{.ForegroundColor}}; background-color: {{.Color}}" title="{{.Description | RenderEmojiPlain}}">{{.Name | RenderEmoji}}</a>
                                        {{end}}
 
                                        {{if .NumComments}}

diff --git a/templates/repo/issue/milestone_issues.tmpl b/templates/repo/issue/milestone_issues.tmpl
index 5307c05733b853890e2315f60eafb2e23c4c5b8d..665d262262b4851ebb29322df8acab5049f487ae 100644 (file)
--- a/templates/repo/issue/milestone_issues.tmpl
+++ b/templates/repo/issue/milestone_issues.tmpl
@@ -61,7 +61,7 @@
                                                        <span class="info">{{.i18n.Tr "repo.issues.filter_label_exclude" | Safe}}</span>
                                                        <a class="item" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&assignee={{$.AssigneeID}}">{{.i18n.Tr "repo.issues.filter_label_no_select"}}</a>
                                                        {{range .Labels}}
-                                                               <a class="item has-emoji label-filter-item" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&labels={{.ID}}&assignee={{$.AssigneeID}}" data-label-id="{{.ID}}">{{if .IsExcluded}}{{svg "octicon-circle-slash" 16}}{{else if contain $.SelLabelIDs .ID}}{{svg "octicon-check" 16}}{{end}}<span class="label color" style="background-color: {{.Color}}"></span> {{.Name}}</a>
+                                                               <a class="item label-filter-item" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&labels={{.ID}}&assignee={{$.AssigneeID}}" data-label-id="{{.ID}}">{{if .IsExcluded}}{{svg "octicon-circle-slash" 16}}{{else if contain $.SelLabelIDs .ID}}{{svg "octicon-check" 16}}{{end}}<span class="label color" style="background-color: {{.Color}}"></span> {{.Name | RenderEmoji}}</a>
                                                        {{end}}
                                                </div>
                                        </div>
@@ -148,8 +148,8 @@
                                                </span>
                                                <div class="menu">
                                                        {{range .Labels}}
-                                                               <div class="item issue-action has-emoji" data-action="toggle" data-element-id="{{.ID}}" data-url="{{$.RepoLink}}/issues/labels">
-                                                                       {{if contain $.SelLabelIDs .ID}}{{svg "octicon-check" 16}}{{end}}<span class="label color" style="background-color: {{.Color}}"></span> {{.Name}}
+                                                               <div class="item issue-action" data-action="toggle" data-element-id="{{.ID}}" data-url="{{$.RepoLink}}/issues/labels">
+                                                                       {{if contain $.SelLabelIDs .ID}}{{svg "octicon-check" 16}}{{end}}<span class="label color" style="background-color: {{.Color}}"></span> {{.Name | RenderEmoji}}
                                                                </div>
                                                        {{end}}
                                                </div>
@@ -187,7 +187,7 @@
                                        </div>
                                        {{end}}
                                        <div class="ui {{if .IsClosed}}{{if .IsPull}}{{if .PullRequest.HasMerged}}purple{{else}}red{{end}}{{else}}red{{end}}{{else}}{{if .IsRead}}white{{else}}green{{end}}{{end}} label">#{{.Index}}</div>
-                                       <a class="title has-emoji" href="{{$.RepoLink}}/issues/{{.Index}}">{{.Title}}</a>
+                                       <a class="title" href="{{$.RepoLink}}/issues/{{.Index}}">{{.Title | RenderEmoji}}</a>
 
                                        {{if .IsPull }}
                                                {{if (index $.CommitStatus .PullRequest.ID)}}
@@ -196,7 +196,7 @@
                                        {{end}}
 
                                        {{range .Labels}}
-                                               <a class="ui label has-emoji" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&state={{$.State}}&labels={{.ID}}&assignee={{$.AssigneeID}}" style="color: {{.ForegroundColor}}; background-color: {{.Color}}" title="{{.Description}}">{{.Name}}</a>
+                                               <a class="ui label" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&state={{$.State}}&labels={{.ID}}&assignee={{$.AssigneeID}}" style="color: {{.ForegroundColor}}; background-color: {{.Color}}" title="{{.Description}}">{{.Name | RenderEmoji}}</a>
                                        {{end}}
 
                                        {{if .NumComments}}

diff --git a/templates/repo/issue/new_form.tmpl b/templates/repo/issue/new_form.tmpl
index 951fa965eae075b1bcf470af1f020f7f6f9526ec..a42a4d9ad53eca2af58c99fccebc38097489cd69 100644 (file)
--- a/templates/repo/issue/new_form.tmpl
+++ b/templates/repo/issue/new_form.tmpl
@@ -56,14 +56,14 @@
                                        <div class="no-select item">{{.i18n.Tr "repo.issues.new.clear_labels"}}</div>
                                        {{if or .Labels .OrgLabels}}
                                                {{range .Labels}}
-                                                       <a class="{{if .IsChecked}}checked{{end}} item" href="#" data-id="{{.ID}}" data-id-selector="#label_{{.ID}}"><span class="octicon-check {{if not .IsChecked}}invisible{{end}}">{{svg "octicon-check" 16}}</span><span class="label color" style="background-color: {{.Color}}"></span> {{.Name | RenderEmojiPlain}}
-                                                       {{if .Description }}<br><small class="desc">{{.Description | RenderEmojiPlain}}</small>{{end}}</a>
+                                                       <a class="{{if .IsChecked}}checked{{end}} item" href="#" data-id="{{.ID}}" data-id-selector="#label_{{.ID}}"><span class="octicon-check {{if not .IsChecked}}invisible{{end}}">{{svg "octicon-check" 16}}</span><span class="label color" style="background-color: {{.Color}}"></span> {{.Name | RenderEmoji}}
+                                                       {{if .Description }}<br><small class="desc">{{.Description | RenderEmoji}}</small>{{end}}</a>
                                                {{end}}
                                        
                                                <div class="ui divider"></div>
                                                {{range .OrgLabels}}
-                                                       <a class="{{if .IsChecked}}checked{{end}} item" href="#" data-id="{{.ID}}" data-id-selector="#label_{{.ID}}"><span class="octicon-check {{if not .IsChecked}}invisible{{end}}">{{svg "octicon-check" 16}}</span><span class="label color" style="background-color: {{.Color}}"></span> {{.Name | RenderEmojiPlain}}
-                                                       {{if .Description }}<br><small class="desc">{{.Description | RenderEmojiPlain}}</small>{{end}}</a>
+                                                       <a class="{{if .IsChecked}}checked{{end}} item" href="#" data-id="{{.ID}}" data-id-selector="#label_{{.ID}}"><span class="octicon-check {{if not .IsChecked}}invisible{{end}}">{{svg "octicon-check" 16}}</span><span class="label color" style="background-color: {{.Color}}"></span> {{.Name | RenderEmoji}}
+                                                       {{if .Description }}<br><small class="desc">{{.Description | RenderEmoji}}</small>{{end}}</a>
                                                {{end}}
                                        {{else}}
                                                <div class="header" style="text-transform: none;font-size:14px;">{{.i18n.Tr "repo.issues.new.no_items"}}</div>
@@ -73,10 +73,10 @@
                        <div class="ui labels list">
                                <span class="no-select item {{if .HasSelectedLabel}}hide{{end}}">{{.i18n.Tr "repo.issues.new.no_label"}}</span>
                                {{range .Labels}}
-                                       <a class="{{if not .IsChecked}}hide{{end}} item" id="label_{{.ID}}" href="{{$.RepoLink}}/issues?labels={{.ID}}"><span class="label color" style="background-color: {{.Color}}"></span> <span class="text">{{.Name | RenderEmojiPlain}}</span></a>
+                                       <a class="{{if not .IsChecked}}hide{{end}} item" id="label_{{.ID}}" href="{{$.RepoLink}}/issues?labels={{.ID}}"><span class="label color" style="background-color: {{.Color}}"></span> <span class="text">{{.Name | RenderEmoji}}</span></a>
                                {{end}}
                                {{range .OrgLabels}}
-                                       <a class="{{if not .IsChecked}}hide{{end}} item" id="label_{{.ID}}" href="/issues?labels={{.ID}}"><span class="label color" style="background-color: {{.Color}}"></span> <span class="text">{{.Name | RenderEmojiPlain}}</span></a>
+                                       <a class="{{if not .IsChecked}}hide{{end}} item" id="label_{{.ID}}" href="/issues?labels={{.ID}}"><span class="label color" style="background-color: {{.Color}}"></span> <span class="text">{{.Name | RenderEmoji}}</span></a>
                                {{end}}
                        </div>
 

diff --git a/templates/repo/issue/view_content.tmpl b/templates/repo/issue/view_content.tmpl
index c44da22720e11cc150ad7a768ff922e269a9152f..2e42c757723ed53363b53b0d8b7863a3d61c0d41 100644 (file)
--- a/templates/repo/issue/view_content.tmpl
+++ b/templates/repo/issue/view_content.tmpl
@@ -46,7 +46,7 @@
                                                {{end}}
                                        </div>
                                        <div class="ui attached segment">
-                                               <div class="render-content markdown has-emoji">
+                                               <div class="render-content markdown">
                                                        {{if .Issue.RenderedContent}}
                                                                {{.Issue.RenderedContent|Str2html}}
                                                        {{else}}

diff --git a/templates/repo/issue/view_content/comments.tmpl b/templates/repo/issue/view_content/comments.tmpl
index a3b4fb81e0df225ed1c479f5ce8c8180ee1d37a0..99884a6796b5bac9ebfeab8b63666e018650d03c 100644 (file)
--- a/templates/repo/issue/view_content/comments.tmpl
+++ b/templates/repo/issue/view_content/comments.tmpl
@@ -43,7 +43,7 @@
                                        {{end}}
                                </div>
                                <div class="ui attached segment">
-                                       <div class="render-content markdown has-emoji">
+                                       <div class="render-content markdown">
                                                {{if .RenderedContent}}
                                                        {{.RenderedContent|Str2html}}
                                                {{else}}
@@ -163,7 +163,7 @@
                                </a>
                                <span class="text grey">
                                        <a class="author" href="{{.Poster.HomeLink}}">{{.Poster.GetDisplayName}}</a>
-                                       {{if .Content}}{{$.i18n.Tr "repo.issues.add_label_at" .Label.ForegroundColor .Label.Color (.Label.Name|Escape|RenderEmojiPlain) $createdStr | Safe}}{{else}}{{$.i18n.Tr "repo.issues.remove_label_at" .Label.ForegroundColor .Label.Color (.Label.Name|Escape|RenderEmojiPlain) $createdStr | Safe}}{{end}}
+                                       {{if .Content}}{{$.i18n.Tr "repo.issues.add_label_at" .Label.ForegroundColor .Label.Color (.Label.Name|Escape|RenderEmoji) $createdStr | Safe}}{{else}}{{$.i18n.Tr "repo.issues.remove_label_at" .Label.ForegroundColor .Label.Color (.Label.Name|Escape|RenderEmoji) $createdStr | Safe}}{{end}}
                                </span>
                        </div>
                {{end}}
@@ -412,7 +412,7 @@
                                                </span>
                                        </div>
                                        <div class="ui attached segment">
-                                               <div class="render-content markdown has-emoji">
+                                               <div class="render-content markdown">
                                                        {{if .RenderedContent}}
                                                                {{.RenderedContent|Str2html}}
                                                        {{else}}
@@ -483,7 +483,7 @@
                                                                                                                        <a class="author"{{if gt .Poster.ID 0}} href="{{.Poster.HomeLink}}"{{end}}>{{.Poster.GetDisplayName}}</a>
                                                                                                                        {{$.i18n.Tr "repo.issues.commented_at" .HashTag $createdSubStr | Safe}}
                                                                                                                        <div class="text">
-                                                                                                                               <div class="render-content markdown has-emoji">
+                                                                                                                               <div class="render-content markdown">
                                                                                                                                {{if .RenderedContent}}
                                                                                                                                        {{.RenderedContent|Str2html}}
                                                                                                                                {{else}}

diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl
index 2c355a9c0031aa21aeca02d5c935eaf4f99123fb..0f34231b17389ad656cb304f6f9a966a6cddf480 100644 (file)
--- a/templates/repo/issue/view_content/sidebar.tmpl
+++ b/templates/repo/issue/view_content/sidebar.tmpl
@@ -111,13 +111,13 @@
                                <div class="no-select item">{{.i18n.Tr "repo.issues.new.clear_labels"}}</div>
                                {{if or .Labels .OrgLabels}}
                                        {{range .Labels}}
-                                               <a class="{{if .IsChecked}}checked{{end}} item" href="#" data-id="{{.ID}}" data-id-selector="#label_{{.ID}}"><span class="octicon-check {{if not .IsChecked}}invisible{{end}}">{{svg "octicon-check" 16}}</span><span class="label color" style="background-color: {{.Color}}"></span> {{.Name | RenderEmojiPlain}}
-                                               {{if .Description }}<br><small class="desc">{{.Description | RenderEmojiPlain}}</small>{{end}}</a>
+                                               <a class="{{if .IsChecked}}checked{{end}} item" href="#" data-id="{{.ID}}" data-id-selector="#label_{{.ID}}"><span class="octicon-check {{if not .IsChecked}}invisible{{end}}">{{svg "octicon-check" 16}}</span><span class="label color" style="background-color: {{.Color}}"></span> {{.Name | RenderEmoji}}
+                                               {{if .Description }}<br><small class="desc">{{.Description | RenderEmoji}}</small>{{end}}</a>
                                        {{end}}
                                        <div class="ui divider"></div>
                                        {{range .OrgLabels}}
-                                               <a class="{{if .IsChecked}}checked{{end}} item" href="#" data-id="{{.ID}}" data-id-selector="#label_{{.ID}}"><span class="octicon-check {{if not .IsChecked}}invisible{{end}}">{{svg "octicon-check" 16}}</span><span class="label color" style="background-color: {{.Color}}"></span> {{.Name | RenderEmojiPlain}}
-                                               {{if .Description }}<br><small class="desc">{{.Description | RenderEmojiPlain}}</small>{{end}}</a>
+                                               <a class="{{if .IsChecked}}checked{{end}} item" href="#" data-id="{{.ID}}" data-id-selector="#label_{{.ID}}"><span class="octicon-check {{if not .IsChecked}}invisible{{end}}">{{svg "octicon-check" 16}}</span><span class="label color" style="background-color: {{.Color}}"></span> {{.Name | RenderEmoji}}
+                                               {{if .Description }}<br><small class="desc">{{.Description | RenderEmoji}}</small>{{end}}</a>
                                        {{end}}
                                {{else}}
                                        <div class="header" style="text-transform: none;font-size:14px;">{{.i18n.Tr "repo.issues.new.no_items"}}</div>
@@ -128,12 +128,12 @@
                        <span class="no-select item {{if .HasSelectedLabel}}hide{{end}}">{{.i18n.Tr "repo.issues.new.no_label"}}</span>
                        {{range .Labels}}
                                <div class="item">
-                                       <a class="ui label {{if not .IsChecked}}hide{{end}}" id="label_{{.ID}}" href="{{$.RepoLink}}/issues?labels={{.ID}}" style="color: {{.ForegroundColor}}; background-color: {{.Color}}" title="{{.Description}}">{{.Name | RenderEmojiPlain}}</a>
+                                       <a class="ui label {{if not .IsChecked}}hide{{end}}" id="label_{{.ID}}" href="{{$.RepoLink}}/issues?labels={{.ID}}" style="color: {{.ForegroundColor}}; background-color: {{.Color}}" title="{{.Description | RenderEmojiPlain}}">{{.Name | RenderEmoji}}</a>
                                </div>
                        {{end}}
                        {{range .OrgLabels}}
                                <div class="item">
-                                       <a class="ui label {{if not .IsChecked}}hide{{end}}" id="label_{{.ID}}" href="{{$.RepoLink}}/issues?labels={{.ID}}" style="color: {{.ForegroundColor}}; background-color: {{.Color}}" title="{{.Description}}">{{.Name | RenderEmojiPlain}}</a>
+                                       <a class="ui label {{if not .IsChecked}}hide{{end}}" id="label_{{.ID}}" href="{{$.RepoLink}}/issues?labels={{.ID}}" style="color: {{.ForegroundColor}}; background-color: {{.Color}}" title="{{.Description | RenderEmojiPlain}}">{{.Name | RenderEmoji}}</a>
                                </div>
 
                        {{end}}
@@ -414,7 +414,7 @@
                                                {{range .BlockingDependencies}}
                                                        <div class="item{{if .Issue.IsClosed}} is-closed{{end}}">
                                                                <span class="text grey right floated">#{{.Issue.Index}}</span>
-                                                               <a class="title has-emoji" href="{{.Repository.Link}}/issues/{{.Issue.Index}}">{{.Issue.Title}}</a>
+                                                               <a class="title" href="{{.Repository.Link}}/issues/{{.Issue.Index}}">{{.Issue.Title | RenderEmoji}}</a>
                                                                <div class="text small">{{.Repository.OwnerName}}/{{.Repository.Name}}</div>
                                                                <div class="ui transparent label right floated nopadding">
                                                                        {{if and $.CanCreateIssueDependencies (not $.Repository.IsArchived)}}
@@ -441,7 +441,7 @@
                                                {{range .BlockedByDependencies}}
                                                        <div class="item{{if .Issue.IsClosed}} is-closed{{end}}">
                                                                <span class="text grey right floated">#{{.Issue.Index}}</span>
-                                                               <a class="title has-emoji" href="{{.Repository.Link}}/issues/{{.Issue.Index}}">{{.Issue.Title}}</a>
+                                                               <a class="title" href="{{.Repository.Link}}/issues/{{.Issue.Index}}">{{.Issue.Title | RenderEmoji}}</a>
                                                                <div class="text small">{{.Repository.OwnerName}}/{{.Repository.Name}}</div>
                                                                <div class="ui transparent label right floated nopadding">
                                                                        {{if and $.CanCreateIssueDependencies (not $.Repository.IsArchived)}}

diff --git a/templates/repo/settings/lfs_file.tmpl b/templates/repo/settings/lfs_file.tmpl
index 6283548eaa9fd7e286cf0644805f9fa442d13a0a..e5736a059f035990e6bb18f9e5381fe5f08cd473 100644 (file)
--- a/templates/repo/settings/lfs_file.tmpl
+++ b/templates/repo/settings/lfs_file.tmpl
@@ -12,7 +12,7 @@
                                </div>
                        </h4>
                        <div class="ui attached table unstackable segment">
-                               <div class="file-view {{if .IsMarkup}}markdown{{else if .IsRenderedHTML}}plain-text{{else if .IsTextFile}}code-view{{end}} has-emoji">
+                               <div class="file-view {{if .IsMarkup}}markdown{{else if .IsRenderedHTML}}plain-text{{else if .IsTextFile}}code-view{{end}}">
                                        {{if .IsMarkup}}
                                                {{if .FileContent}}{{.FileContent | Safe}}{{end}}
                                        {{else if .IsRenderedHTML}}

diff --git a/templates/repo/settings/lfs_file_find.tmpl b/templates/repo/settings/lfs_file_find.tmpl
index 1057cfa94522ff5812e300115bd84abd48d37307..5a2a168becbd8abff3c25cabee0a938bbad85be9 100644 (file)
--- a/templates/repo/settings/lfs_file_find.tmpl
+++ b/templates/repo/settings/lfs_file_find.tmpl
@@ -16,10 +16,10 @@
                                                                {{svg "octicon-file" 16}}
                                                                <a href="{{EscapePound $.RepoLink}}/src/commit/{{.SHA}}/{{EscapePound .Name}}" title="{{.Name}}">{{.Name}}</a>
                                                        </td>
-                                                       <td class="message has-emoji">
+                                                       <td class="message">
                                                                <span class="truncate">
-                                                                       <a href="{{$.RepoLink}}/commit/{{.SHA}}" title="{{.Summary}}">
-                                                                               {{.Summary}}
+                                                                       <a href="{{$.RepoLink}}/commit/{{.SHA}}" title="{{.Summary | RenderEmojiPlain}}">
+                                                                               {{.Summary | RenderEmoji}}
                                                                        </a>
                                                                </span>
                                                        </td>

diff --git a/templates/repo/view_file.tmpl b/templates/repo/view_file.tmpl
index 1405378bd7d801a424f325a50b47d1edae59f2c3..1216b5f40aa18a31dd37cea1a65dc070f08ff8e2 100644 (file)
--- a/templates/repo/view_file.tmpl
+++ b/templates/repo/view_file.tmpl
@@ -64,7 +64,7 @@
                {{end}}
        </h4>
        <div class="ui attached table unstackable segment">
-               <div class="file-view {{if .IsMarkup}}{{.MarkupType}} markdown{{else if .IsRenderedHTML}}plain-text{{else if .IsTextFile}}code-view{{end}} has-emoji">
+               <div class="file-view {{if .IsMarkup}}{{.MarkupType}} markdown{{else if .IsRenderedHTML}}plain-text{{else if .IsTextFile}}code-view{{end}}">
                        {{if .IsMarkup}}
                                {{if .FileContent}}{{.FileContent | Safe}}{{end}}
                        {{else if .IsRenderedHTML}}

diff --git a/templates/repo/view_list.tmpl b/templates/repo/view_list.tmpl
index 9e77a4866c188d83a6112334fbb01414b299b36f..2add12577d8cf0e68733d8db84745c22747218d0 100644 (file)
--- a/templates/repo/view_list.tmpl
+++ b/templates/repo/view_list.tmpl
@@ -40,7 +40,7 @@
                                </a>
                                {{template "repo/commit_status" .LatestCommitStatus}}
                                {{ $commitLink:= printf "%s/commit/%s" .RepoLink .LatestCommit.ID }}
-                               <span class="grey has-emoji commit-summary" title="{{.LatestCommit.Summary}}"><span class="message-wrapper">{{RenderCommitMessageLinkSubject .LatestCommit.Message $.RepoLink $commitLink $.Repository.ComposeMetas}}</span>
+                               <span class="grey commit-summary" title="{{.LatestCommit.Summary}}"><span class="message-wrapper">{{RenderCommitMessageLinkSubject .LatestCommit.Message $.RepoLink $commitLink $.Repository.ComposeMetas}}</span>
                                {{if IsMultilineCommitMessage .LatestCommit.Message}}
                                        <button class="basic compact mini ui icon button commit-button"><i class="ellipsis horizontal icon"></i></button>
                                        <pre class="commit-body" style="display: none;">{{RenderCommitBody .LatestCommit.Message $.RepoLink $.Repository.ComposeMetas}}</pre>
@@ -94,8 +94,8 @@
                                        </td>
                                {{end}}
                                <td class="message nine wide">
-                                       <span class="truncate has-emoji">
-                                               <a href="{{$.RepoLink}}/commit/{{$commit.ID}}" title="{{$commit.Summary}}">{{$commit.Summary}}</a>
+                                       <span class="truncate">
+                                               <a href="{{$.RepoLink}}/commit/{{$commit.ID}}" title="{{$commit.Summary}}">{{$commit.Summary | RenderEmoji}}</a>
                                        </span>
                                </td>
                                <td class="text right age three wide">{{TimeSince $commit.Committer.When $.Lang}}</td>

diff --git a/templates/repo/wiki/view.tmpl b/templates/repo/wiki/view.tmpl
index 26ed049e63e6a64c445f4c0cf18a6760a6f37886..e9d02d50876e30e347c62c79860e7ae871687c21 100644 (file)
--- a/templates/repo/wiki/view.tmpl
+++ b/templates/repo/wiki/view.tmpl
@@ -80,7 +80,7 @@
                        </div>
                {{end}}
                <div class="ui {{if .sidebarPresent}}grid equal width{{end}}" style="margin-top: 1rem;">
-                       <div class="ui {{if .sidebarPresent}}eleven wide column{{end}} segment markdown has-emoji">
+                       <div class="ui {{if .sidebarPresent}}eleven wide column{{end}} segment markdown">
                                {{.content | Str2html}}
                        </div>
                        {{if .sidebarPresent}}

diff --git a/templates/user/dashboard/issues.tmpl b/templates/user/dashboard/issues.tmpl
index 5d8bc327e698d056eb680795b537982f6d7a00f2..82da91c81130f19f88aa03caf30f1ac9261fcd1b 100644 (file)
--- a/templates/user/dashboard/issues.tmpl
+++ b/templates/user/dashboard/issues.tmpl
@@ -123,7 +123,7 @@
                                                                especially on mobile views. */}}
                                                                <span style="line-height: 2.5">
                                                                        {{range .}}
-                                                                               <a class="ui label" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&state={{$.State}}&labels={{.ID}}&milestone={{$.MilestoneID}}&assignee={{$.AssigneeID}}&repos=[{{range $.RepoIDs}}{{.}}%2C{{end}}]" style="color: {{.ForegroundColor}}; background-color: {{.Color}}" title="{{.Description}}">{{.Name | RenderEmojiPlain}}</a>
+                                                                               <a class="ui label" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&state={{$.State}}&labels={{.ID}}&milestone={{$.MilestoneID}}&assignee={{$.AssigneeID}}&repos=[{{range $.RepoIDs}}{{.}}%2C{{end}}]" style="color: {{.ForegroundColor}}; background-color: {{.Color}}" title="{{.Description | RenderEmojiPlain}}">{{.Name | RenderEmoji}}</a>
                                                                        {{end}}
                                                                </span>
                                                        {{end}}

diff --git a/web_src/less/_base.less b/web_src/less/_base.less
index 6241ad5072659e7f2ba64528b3b495ef2713478a..0036bf6a4f37718a5379dd96d2703d7060287fe6 100644 (file)
--- a/web_src/less/_base.less
+++ b/web_src/less/_base.less
@@ -1272,6 +1272,13 @@ i.icon.centerlock {
     font-size: 1em;
 }
 
+.label > .emoji {
+    font-size: 1em;
+}
+
+.dropdown .emoji {
+    font-size: 1em;
+}
 .emoji img,
 .reaction img {
     border-width: 0 !important;