diff options
| author | John Olheiser <42128690+jolheiser@users.noreply.github.com> | 2020-02-11 19:53:18 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-11 20:53:18 -0500 |
| commit | d67e9b9629557df1e355f0a864792c194b3e8848 (patch) | |
| tree | f7138acd6776fe08ebb40b840d898fbb47234d4a /templates | |
| parent | 2399bad1f1a4ab36b2fd05745beaea5fb1f53dab (diff) | |
| download | gitea-d67e9b9629557df1e355f0a864792c194b3e8848.tar.gz gitea-d67e9b9629557df1e355f0a864792c194b3e8848.zip | |
SVG Octicon fixes (#10237)
* SVG fixes
Signed-off-by: jolheiser <john.olheiser@gmail.com>
* Colorize span->svg only
Signed-off-by: jolheiser <john.olheiser@gmail.com>
* @silverwind suggestions
Signed-off-by: jolheiser <john.olheiser@gmail.com>
* Alphabetical
Signed-off-by: jolheiser <john.olheiser@gmail.com>
* Convert suburl and staticPrefix to window.config
Signed-off-by: jolheiser <john.olheiser@gmail.com>
* De-structure
Signed-off-by: jolheiser <john.olheiser@gmail.com>
Co-authored-by: Antoine GIRARD <sapk@users.noreply.github.com>
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/base/head.tmpl | 4 | ||||
| -rw-r--r-- | templates/repo/issue/view_title.tmpl | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/templates/base/head.tmpl b/templates/base/head.tmpl index c9ae07f632..f1558f9484 100644 --- a/templates/base/head.tmpl +++ b/templates/base/head.tmpl @@ -36,8 +36,6 @@ <meta name="keywords" content="{{MetaKeywords}}"> <meta name="referrer" content="no-referrer" /> <meta name="_csrf" content="{{.CsrfToken}}" /> - <meta name="_suburl" content="{{AppSubUrl}}" /> - <meta name="_staticprefix" content="{{StaticUrlPrefix}}" /> {{if .IsSigned}} <meta name="_uid" content="{{.SignedUser.ID}}" /> {{end}} @@ -86,6 +84,8 @@ </script> <script> window.config = { + AppSubUrl: '{{AppSubUrl}}', + StaticUrlPrefix: '{{StaticUrlPrefix}}', Datetimepicker: {{if .RequireDatetimepicker}}true{{else}}false{{end}}, Dropzone: {{if .RequireDropzone}}true{{else}}false{{end}}, HighlightJS: {{if .RequireHighlightJS}}true{{else}}false{{end}}, diff --git a/templates/repo/issue/view_title.tmpl b/templates/repo/issue/view_title.tmpl index 21ebf62129..e2a3e8f93a 100644 --- a/templates/repo/issue/view_title.tmpl +++ b/templates/repo/issue/view_title.tmpl @@ -17,7 +17,7 @@ {{end}} </div> {{if .HasMerged}} - <div class="ui purple large label">{{svg "octicon-gt-pull-request" 16}} {{.i18n.Tr "repo.pulls.merged"}}</div> + <div class="ui purple large label">{{svg "octicon-git-pull-request" 16}} {{.i18n.Tr "repo.pulls.merged"}}</div> {{else if .Issue.IsClosed}} <div class="ui red large label">{{svg "octicon-issue-closed" 16}} {{.i18n.Tr "repo.issues.closed_title"}}</div> {{else if .Issue.IsPull}} |