diff options
| author | silverwind <me@silverwind.io> | 2020-10-31 23:15:11 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-31 18:15:11 -0400 |
| commit | 2ac112d84e7318a294b1e8cea5adae2dd50c89df (patch) | |
| tree | ded99a4d4d7626c21332ffd10eb0b39ef23a98bf /templates | |
| parent | e4e85a3e51066f4987a87762c9c69acda093f6ca (diff) | |
| download | gitea-2ac112d84e7318a294b1e8cea5adae2dd50c89df.tar.gz gitea-2ac112d84e7318a294b1e8cea5adae2dd50c89df.zip | |
Comment box tweaks and SVG dropdown triangles (#13376)
* Comment box tweaks and SVG dropdown triangles
- Change all dropdown triangles to SVG
- Bring inline review comment box closer to regular comment boxes
- Enhance arc-green checkbox contrast
- Minor reaction tweaks
- Flexbox the diff file header
* remove a border
* fix type marker in arc-green
* add small code padding
* fix position regression and remove useless rules
Co-authored-by: Lauris BH <lauris@nix.lv>
Co-authored-by: techknowlogick <techknowlogick@gitea.io>
Diffstat (limited to 'templates')
52 files changed, 147 insertions, 127 deletions
diff --git a/templates/admin/auth/edit.tmpl b/templates/admin/auth/edit.tmpl index e182bbc858..24f6b37c81 100644 --- a/templates/admin/auth/edit.tmpl +++ b/templates/admin/auth/edit.tmpl @@ -28,7 +28,7 @@ <div class="ui selection security-protocol dropdown"> <input type="hidden" id="security_protocol" name="security_protocol" value="{{$cfg.SecurityProtocol}}"> <div class="text">{{$cfg.SecurityProtocolName}}</div> - <i class="dropdown icon"></i> + {{svg "octicon-triangle-down" 14 "dropdown icon"}} <div class="menu"> {{range .SecurityProtocols}} <div class="item" data-value="{{.Type}}">{{.Name}}</div> @@ -158,7 +158,7 @@ <div class="ui selection type dropdown"> <input type="hidden" id="smtp_auth" name="smtp_auth" value="{{$cfg.Auth}}" required> <div class="text">{{$cfg.Auth}}</div> - <i class="dropdown icon"></i> + {{svg "octicon-triangle-down" 14 "dropdown icon"}} <div class="menu"> {{range .SMTPAuths}} <div class="item" data-value="{{.}}">{{.}}</div> @@ -198,7 +198,7 @@ <div class="ui selection type dropdown"> <input type="hidden" id="oauth2_provider" name="oauth2_provider" value="{{$cfg.Provider}}" required> <div class="text">{{.CurrentOAuth2Provider.DisplayName}}</div> - <i class="dropdown icon"></i> + {{svg "octicon-triangle-down" 14 "dropdown icon"}} <div class="menu"> {{range $key, $value := .OAuth2Providers}} <div class="item" data-value="{{$key}}">{{$value.DisplayName}}</div> @@ -282,7 +282,7 @@ <label for="sspi_default_language">{{.i18n.Tr "admin.auths.sspi_default_language"}}</label> <div class="ui language selection dropdown" id="sspi_default_language"> <input name="sspi_default_language" type="hidden" value="{{$cfg.DefaultLanguage}}"> - <i class="dropdown icon"></i> + {{svg "octicon-triangle-down" 14 "dropdown icon"}} <div class="text">{{range .AllLangs}}{{if eq $cfg.DefaultLanguage .Lang}}{{.Name}}{{end}}{{end}}</div> <div class="menu"> <div class="item{{if not $.SSPIDefaultLanguage}} active selected{{end}}" data-value="">-</div> diff --git a/templates/admin/auth/new.tmpl b/templates/admin/auth/new.tmpl index 5519f0b63a..e72a82cbb3 100644 --- a/templates/admin/auth/new.tmpl +++ b/templates/admin/auth/new.tmpl @@ -15,7 +15,7 @@ <div class="ui selection type dropdown"> <input type="hidden" id="auth_type" name="type" value="{{.type}}"> <div class="text">{{.CurrentTypeName}}</div> - <i class="dropdown icon"></i> + {{svg "octicon-triangle-down" 14 "dropdown icon"}} <div class="menu"> {{range .AuthSources}} <div class="item" data-value="{{.Type}}">{{.Name}}</div> diff --git a/templates/admin/auth/source/ldap.tmpl b/templates/admin/auth/source/ldap.tmpl index 6feb202abb..dbadd31f14 100644 --- a/templates/admin/auth/source/ldap.tmpl +++ b/templates/admin/auth/source/ldap.tmpl @@ -4,7 +4,7 @@ <div class="ui selection security-protocol dropdown"> <input type="hidden" id="security_protocol" name="security_protocol" value="{{.security_protocol}}"> <div class="text">{{.CurrentSecurityProtocol}}</div> - <i class="dropdown icon"></i> + {{svg "octicon-triangle-down" 14 "dropdown icon"}} <div class="menu"> {{range .SecurityProtocols}} <div class="item" data-value="{{.Type}}">{{.Name}}</div> diff --git a/templates/admin/auth/source/oauth.tmpl b/templates/admin/auth/source/oauth.tmpl index 148a99a5ea..7870dbd65d 100644 --- a/templates/admin/auth/source/oauth.tmpl +++ b/templates/admin/auth/source/oauth.tmpl @@ -4,7 +4,7 @@ <div class="ui selection type dropdown"> <input type="hidden" id="oauth2_provider" name="oauth2_provider" value="{{.oauth2_provider}}"> <div class="text">{{.oauth2_provider}}</div> - <i class="dropdown icon"></i> + {{svg "octicon-triangle-down" 14 "dropdown icon"}} <div class="menu"> {{range $key, $value := .OAuth2Providers}} <div class="item" data-value="{{$key}}">{{$value.DisplayName}}</div> diff --git a/templates/admin/auth/source/smtp.tmpl b/templates/admin/auth/source/smtp.tmpl index d4c83c171a..670c4b3b50 100644 --- a/templates/admin/auth/source/smtp.tmpl +++ b/templates/admin/auth/source/smtp.tmpl @@ -4,7 +4,7 @@ <div class="ui selection type dropdown"> <input type="hidden" id="smtp_auth" name="smtp_auth" value="{{.smtp_auth}}"> <div class="text">{{.smtp_auth}}</div> - <i class="dropdown icon"></i> + {{svg "octicon-triangle-down" 14 "dropdown icon"}} <div class="menu"> {{range .SMTPAuths}} <div class="item" data-value="{{.}}">{{.}}</div> diff --git a/templates/admin/auth/source/sspi.tmpl b/templates/admin/auth/source/sspi.tmpl index 50f9f99a8d..91697ef9c5 100644 --- a/templates/admin/auth/source/sspi.tmpl +++ b/templates/admin/auth/source/sspi.tmpl @@ -29,7 +29,7 @@ <label for="sspi_default_language">{{.i18n.Tr "admin.auths.sspi_default_language"}}</label> <div class="ui language selection dropdown" id="sspi_default_language"> <input name="sspi_default_language" type="hidden" value="{{.SSPIDefaultLanguage}}"> - <i class="dropdown icon"></i> + {{svg "octicon-triangle-down" 14 "dropdown icon"}} <div class="text">{{range .AllLangs}}{{if eq $.SSPIDefaultLanguage .Lang}}{{.Name}}{{end}}{{end}}</div> <div class="menu"> <div class="item{{if not $.SSPIDefaultLanguage}} active selected{{end}}" data-value="">-</div> diff --git a/templates/admin/base/search.tmpl b/templates/admin/base/search.tmpl index b817a8ad79..8a7af53da5 100644 --- a/templates/admin/base/search.tmpl +++ b/templates/admin/base/search.tmpl @@ -3,7 +3,7 @@ <div class="ui dropdown type jump item"> <span class="text"> {{.i18n.Tr "repo.issues.filter_sort"}} - <i class="dropdown icon"></i> + {{svg "octicon-triangle-down" 14 "dropdown icon"}} </span> <div class="menu"> <a class="{{if or (eq .SortType "oldest") (not .SortType)}}active{{end}} item" href="{{$.Link}}?sort=oldest&q={{$.Keyword}}">{{.i18n.Tr "repo.issues.filter_sort.oldest"}}</a> diff --git a/templates/admin/emails/list.tmpl b/templates/admin/emails/list.tmpl index 39a200942d..8a60088f0a 100644 --- a/templates/admin/emails/list.tmpl +++ b/templates/admin/emails/list.tmpl @@ -12,7 +12,7 @@ <div class="ui dropdown type jump item"> <span class="text"> {{.i18n.Tr "repo.issues.filter_sort"}} - <i class="dropdown icon"></i> + {{svg "octicon-triangle-down" 14 "dropdown icon"}} </span> <div class="menu"> <a class="{{if or (eq .SortType "email") (not .SortType)}}active{{end}} item" href="{{$.Link}}?sort=email&q={{$.Keyword}}">{{.i18n.Tr "admin.emails.filter_sort.email"}}</a> diff --git a/templates/admin/repo/search.tmpl b/templates/admin/repo/search.tmpl index 8e69f7c388..8b1deb9134 100644 --- a/templates/admin/repo/search.tmpl +++ b/templates/admin/repo/search.tmpl @@ -3,7 +3,7 @@ <div class="ui dropdown type jump item"> <span class="text"> {{.i18n.Tr "repo.issues.filter_sort"}} - <i class="dropdown icon"></i> + {{svg "octicon-triangle-down" 14 "dropdown icon"}} </span> <div class="menu"> <a class="{{if or (eq .SortType "oldest") (not .SortType)}}active{{end}} item" href="{{$.Link}}?sort=oldest&q={{$.Keyword}}">{{.i18n.Tr "repo.issues.filter_sort.oldest"}}</a> diff --git a/templates/admin/user/edit.tmpl b/templates/admin/user/edit.tmpl index 66f3c96711..a0edd68e48 100644 --- a/templates/admin/user/edit.tmpl +++ b/templates/admin/user/edit.tmpl @@ -19,7 +19,7 @@ <div class="ui selection type dropdown"> <input type="hidden" id="login_type" name="login_type" value="{{.LoginSource.Type}}-{{.LoginSource.ID}}" required> <div class="text">{{.i18n.Tr "admin.users.local"}}</div> - <i class="dropdown icon"></i> + {{svg "octicon-triangle-down" 14 "dropdown icon"}} <div class="menu"> <div class="item" data-value="0-0">{{.i18n.Tr "admin.users.local"}}</div> {{range .Sources}} diff --git a/templates/admin/user/new.tmpl b/templates/admin/user/new.tmpl index 463374dab7..b05f81717f 100644 --- a/templates/admin/user/new.tmpl +++ b/templates/admin/user/new.tmpl @@ -15,7 +15,7 @@ <div class="ui selection type dropdown"> <input type="hidden" id="login_type" name="login_type" value="{{.login_type}}" data-password="required" required> <div class="text">{{.i18n.Tr "admin.users.local"}}</div> - <i class="dropdown icon"></i> + {{svg "octicon-triangle-down" 14 "dropdown icon"}} <div class="menu"> <div class="item" data-value="0-0">{{.i18n.Tr "admin.users.local"}}</div> {{range .Sources}} diff --git a/templates/explore/repo_search.tmpl b/templates/explore/repo_search.tmpl index 0f3780177e..53c5156dc9 100644 --- a/templates/explore/repo_search.tmpl +++ b/templates/explore/repo_search.tmpl @@ -3,7 +3,7 @@ <div class="ui right dropdown type jump item"> <span class="text"> {{.i18n.Tr "repo.issues.filter_sort"}} - <i class="dropdown icon"></i> + {{svg "octicon-triangle-down" 14 "dropdown icon"}} </span> <div class="menu"> <a class="{{if eq .SortType "newest"}}active{{end}} item" href="{{$.Link}}?sort=newest&q={{$.Keyword}}&tab={{$.TabName}}">{{.i18n.Tr "repo.issues.filter_sort.latest"}}</a> diff --git a/templates/explore/search.tmpl b/templates/explore/search.tmpl index ccfdf971b5..d9d2f3b9a3 100644 --- a/templates/explore/search.tmpl +++ b/templates/explore/search.tmpl @@ -3,7 +3,7 @@ <div class="ui right dropdown type jump item"> <span class="text"> {{.i18n.Tr "repo.issues.filter_sort"}} - <i class="dropdown icon"></i> + {{svg "octicon-triangle-down" 14 "dropdown icon"}} </span> <div class="menu"> <a class="{{if eq .SortType "newest"}}active{{end}} item" href="{{$.Link}}?sort=newest&q={{$.Keyword}}&tab={{$.TabName}}">{{.i18n.Tr "repo.issues.filter_sort.latest"}}</a> diff --git a/templates/install.tmpl b/templates/install.tmpl index f0e4680c32..94fb851a42 100644 --- a/templates/install.tmpl +++ b/templates/install.tmpl @@ -19,7 +19,7 @@ <div class="ui selection database type dropdown"> <input type="hidden" id="db_type" name="db_type" value="{{.CurDbOption}}"> <div class="text">{{.CurDbOption}}</div> - <i class="dropdown icon"></i> + {{svg "octicon-triangle-down" 14 "dropdown icon"}} <div class="menu"> {{range .DbOptions}} <div class="item" data-value="{{.}}">{{.}}</div> @@ -54,7 +54,7 @@ <div class="ui selection database type dropdown"> <input type="hidden" name="ssl_mode" value="{{if .ssl_mode}}{{.ssl_mode}}{{else}}disable{{end}}"> <div class="default text">disable</div> - <i class="dropdown icon"></i> + {{svg "octicon-triangle-down" 14 "dropdown icon"}} <div class="menu"> <div class="item" data-value="disable">Disable</div> <div class="item" data-value="require">Require</div> @@ -75,7 +75,7 @@ <div class="ui selection database type dropdown"> <input type="hidden" name="charset" value="{{if .charset}}{{.charset}}{{else}}utf8mb4{{end}}"> <div class="default text">utf8mb4</div> - <i class="dropdown icon"></i> + {{svg "octicon-triangle-down" 14 "dropdown icon"}} <div class="menu"> <div class="item" data-value="utf8mb4">utf8mb4</div> <div class="item" data-value="utf8">utf8</div> diff --git a/templates/repo/activity.tmpl b/templates/repo/activity.tmpl index fd24499fcc..ba2750983c 100644 --- a/templates/repo/activity.tmpl +++ b/templates/repo/activity.tmpl @@ -9,7 +9,7 @@ <div class="ui basic compact button"> <span class="text"> {{.i18n.Tr "repo.activity.period.filter_label"}} <strong>{{.PeriodText}}</strong> - <i class="dropdown icon"></i> + {{svg "octicon-triangle-down" 14 "dropdown icon"}} </span> </div> <div class="menu"> diff --git a/templates/repo/branch_dropdown.tmpl b/templates/repo/branch_dropdown.tmpl index 6a8e16c101..9ef32d9e90 100644 --- a/templates/repo/branch_dropdown.tmpl +++ b/templates/repo/branch_dropdown.tmpl @@ -6,7 +6,7 @@ {{if .IsViewBranch}}{{.i18n.Tr "repo.branch"}}{{else}}{{.i18n.Tr "repo.tree"}}{{end}}: <strong>{{if .IsViewBranch}}{{.BranchName}}{{else}}{{ShortSha .BranchName}}{{end}}</strong> </span> - <i class="dropdown icon"></i> + {{svg "octicon-triangle-down" 14 "dropdown icon"}} </div> <div class="data" style="display: none" data-mode="{{if .IsViewTag}}tags{{else}}branches{{end}}"> {{range .Branches}} diff --git a/templates/repo/create.tmpl b/templates/repo/create.tmpl index d1f847b79f..6b9a2bca36 100644 --- a/templates/repo/create.tmpl +++ b/templates/repo/create.tmpl @@ -17,7 +17,7 @@ <img class="ui mini image" src="{{.ContextUser.RelAvatarLink}}"> {{.ContextUser.ShortName 20}} </span> - <i class="dropdown icon"></i> + {{svg "octicon-triangle-down" 14 "dropdown icon"}} <div class="menu"> <div class="item" data-value="{{.SignedUser.ID}}" title="{{.SignedUser.Name}}"> <img class="ui mini image" src="{{.SignedUser.RelAvatarLink}}"> @@ -172,7 +172,7 @@ <div class="ui selection owner dropdown"> <input type="hidden" id="trust_model" name="trust_model" value="default" required> <div class="default text">{{.i18n.Tr "repo.settings.trust_model"}}</div> - <i class="dropdown icon"></i> + {{svg "octicon-triangle-down" 14 "dropdown icon"}} <div class="menu"> <div class="item" data-value="default">{{.i18n.Tr "repo.settings.trust_model.default"}}</div> <div class="item" data-value="collaborator">{{.i18n.Tr "repo.settings.trust_model.collaborator"}}</div> diff --git a/templates/repo/diff/box.tmpl b/templates/repo/diff/box.tmpl index 36928f7b84..f30b81cb9e 100644 --- a/templates/repo/diff/box.tmpl +++ b/templates/repo/diff/box.tmpl @@ -84,41 +84,45 @@ </div> {{else}} <div class="diff-file-box diff-box file-content {{TabSizeClass $.Editorconfig $file.Name}}" id="diff-{{.Index}}"> - <h4 class="diff-file-header ui top attached normal header"> - {{$isImage := false}} - {{if $file.IsDeleted}} - {{$isImage = (call $.IsImageFileInBase $file.Name)}} - {{else}} - {{$isImage = (call $.IsImageFileInHead $file.Name)}} - {{end}} - {{if or (not $file.IsBin) $isImage}} - <a role="button" class="fold-file"> - {{svg "octicon-chevron-down" 18}} - </a> - {{end}} - <div class="diff-counter count"> - {{if $file.IsBin}} - {{$.i18n.Tr "repo.diff.bin"}} - {{else if not $file.IsRenamed}} - <span class="add" data-line="{{.Addition}}">+ {{.Addition}}</span> - <span class="bar"> - <div class="pull-left add"></div> - <div class="pull-left del"></div> - </span> - <span class="del" data-line="{{.Deletion}}">- {{.Deletion}}</span> - {{end}} - </div> - <span class="file">{{if $file.IsRenamed}}{{$file.OldName}} → {{end}}{{$file.Name}}{{if .IsLFSFile}} ({{$.i18n.Tr "repo.stored_lfs"}}){{end}}</span> - {{if $file.IsProtected}} - <span class="ui right basic label">{{$.i18n.Tr "repo.diff.protected"}}</span> - {{end}} - {{if and (not $file.IsSubmodule) (not $.PageIsWiki)}} + <h4 class="diff-file-header ui top attached normal header df ac sb"> + <div class="df ac"> + {{$isImage := false}} {{if $file.IsDeleted}} - <a class="ui basic grey tiny button" rel="nofollow" href="{{EscapePound $.BeforeSourcePath}}/{{EscapePound .Name}}">{{$.i18n.Tr "repo.diff.view_file"}}</a> + {{$isImage = (call $.IsImageFileInBase $file.Name)}} {{else}} - <a class="ui basic grey tiny button" rel="nofollow" href="{{EscapePound $.SourcePath}}/{{EscapePound .Name}}">{{$.i18n.Tr "repo.diff.view_file"}}</a> + {{$isImage = (call $.IsImageFileInHead $file.Name)}} {{end}} - {{end}} + {{if or (not $file.IsBin) $isImage}} + <a role="button" class="fold-file"> + {{svg "octicon-chevron-down" 18}} + </a> + {{end}} + <div class="diff-counter count"> + {{if $file.IsBin}} + {{$.i18n.Tr "repo.diff.bin"}} + {{else if not $file.IsRenamed}} + <span class="add" data-line="{{.Addition}}">+ {{.Addition}}</span> + <span class="bar"> + <div class="pull-left add"></div> + <div class="pull-left del"></div> + </span> + <span class="del" data-line="{{.Deletion}}">- {{.Deletion}}</span> + {{end}} + </div> + <span class="file">{{if $file.IsRenamed}}{{$file.OldName}} → {{end}}{{$file.Name}}{{if .IsLFSFile}} ({{$.i18n.Tr "repo.stored_lfs"}}){{end}}</span> + </div> + <div class="df ac"> + {{if $file.IsProtected}} + <span class="ui basic label">{{$.i18n.Tr "repo.diff.protected"}}</span> + {{end}} + {{if and (not $file.IsSubmodule) (not $.PageIsWiki)}} + {{if $file.IsDeleted}} + <a class="ui basic tiny button" rel="nofollow" href="{{EscapePound $.BeforeSourcePath}}/{{EscapePound .Name}}">{{$.i18n.Tr "repo.diff.view_file"}}</a> + {{else}} + <a class="ui basic tiny button" rel="nofollow" href="{{EscapePound $.SourcePath}}/{{EscapePound .Name}}">{{$.i18n.Tr "repo.diff.view_file"}}</a> + {{end}} + {{end}} + </div> </h4> <div class="diff-file-body ui attached unstackable table segment"> {{if ne $file.Type 4}} diff --git a/templates/repo/diff/comments.tmpl b/templates/repo/diff/comments.tmpl index 076d2d969e..4785f3a513 100644 --- a/templates/repo/diff/comments.tmpl +++ b/templates/repo/diff/comments.tmpl @@ -10,28 +10,44 @@ </a> {{end}} <div class="content"> - <div class="ui top attached header"> - <span class="text grey"> + <div class="ui top attached header comment-header df ac sb"> + <div class="comment-header-left df ac"> {{if .OriginalAuthor }} - <span class="text black"><i class="fa {{MigrationIcon $.root.Repository.GetOriginalURLHostname}}" aria-hidden="true"></i> {{ .OriginalAuthor }}</span><span class="text grey"> {{$.root.i18n.Tr "repo.issues.commented_at" .HashTag $createdStr | Safe}}</span> <span class="text migrate">{{if $.root.Repository.OriginalURL}} ({{$.root.i18n.Tr "repo.migrated_from" $.root.Repository.OriginalURL $.root.Repository.GetOriginalURLHostname | Safe }}){{end}}</span> + <span class="text black mr-2"> + <i class="fa {{MigrationIcon $.root.Repository.GetOriginalURLHostname}}" aria-hidden="true"></i> + {{ .OriginalAuthor }} + </span> + <span class="text grey"> + {{$.root.i18n.Tr "repo.issues.commented_at" .HashTag $createdStr | Safe}} + </span> + <span class="text migrate"> + {{if $.root.Repository.OriginalURL}} + ({{$.root.i18n.Tr "repo.migrated_from" $.root.Repository.OriginalURL $.root.Repository.GetOriginalURLHostname | Safe }}) + {{end}} + </span> {{else}} - <a {{if gt .Poster.ID 0}}href="{{.Poster.HomeLink}}"{{end}}>{{.Poster.GetDisplayName}}</a> {{$.root.i18n.Tr "repo.issues.commented_at" .HashTag $createdStr | Safe}} + <span class="text grey"> + <a class="mr-2" {{if gt .Poster.ID 0}}href="{{.Poster.HomeLink}}"{{end}}> + {{.Poster.GetDisplayName}} + </a> + {{$.root.i18n.Tr "repo.issues.commented_at" .HashTag $createdStr | Safe}} + </span> {{end}} - </span> - <div class="ui right actions"> - {{if and .Review}} - {{if eq .Review.Type 0}} - <div class="ui label basic small yellow"> - {{$.root.i18n.Tr "repo.issues.review.pending"}} - </div> - {{else}} - <div class="ui label basic small"> - {{$.root.i18n.Tr "repo.issues.review.review"}} - </div> + </div> + <div class="comment-header-right actions df ac"> + {{if and .Review}} + {{if eq .Review.Type 0}} + <div class="ui label basic small yellow"> + {{$.root.i18n.Tr "repo.issues.review.pending"}} + </div> + {{else}} + <div class="ui label basic small"> + {{$.root.i18n.Tr "repo.issues.review.review"}} + </div> + {{end}} {{end}} - {{end}} - {{template "repo/issue/view_content/add_reaction" Dict "ctx" $ "ActionURL" (Printf "%s/comments/%d/reactions" $.root.RepoLink .ID) }} - {{template "repo/issue/view_content/context_menu" Dict "ctx" $.root "item" . "delete" true "diff" true "IsCommentPoster" (and $.root.IsSigned (eq $.root.SignedUserID .PosterID))}} + {{template "repo/issue/view_content/add_reaction" Dict "ctx" $ "ActionURL" (Printf "%s/comments/%d/reactions" $.root.RepoLink .ID) }} + {{template "repo/issue/view_content/context_menu" Dict "ctx" $.root "item" . "delete" true "diff" true "IsCommentPoster" (and $.root.IsSigned (eq $.root.SignedUserID .PosterID))}} </div> </div> <div class="ui attached segment"> diff --git a/templates/repo/diff/compare.tmpl b/templates/repo/diff/compare.tmpl index cae57540a7..920ff120f7 100644 --- a/templates/repo/diff/compare.tmpl +++ b/templates/repo/diff/compare.tmpl @@ -17,7 +17,7 @@ <div class="ui floating filter dropdown" data-no-results="{{.i18n.Tr "repo.pulls.no_results"}}"> <div class="ui basic small button"> <span class="text">{{.i18n.Tr "repo.pulls.compare_base"}}: {{$.BaseName}}:{{$.BaseBranch}}</span> - <i class="dropdown icon"></i> + {{svg "octicon-triangle-down" 14 "dropdown icon"}} </div> <div class="menu"> <div class="ui icon search input"> @@ -50,7 +50,7 @@ <div class="ui floating filter dropdown"> <div class="ui basic small button"> <span class="text">{{.i18n.Tr "repo.pulls.compare_compare"}}: {{$.HeadUser.Name}}:{{$.HeadBranch}}</span> - <i class="dropdown icon"></i> + {{svg "octicon-triangle-down" 14 "dropdown icon"}} </div> <div class="menu"> <div class="ui icon search input"> diff --git a/templates/repo/diff/new_review.tmpl b/templates/repo/diff/new_review.tmpl index c92bac4155..b3f735a7f2 100644 --- a/templates/repo/diff/new_review.tmpl +++ b/templates/repo/diff/new_review.tmpl @@ -1,7 +1,7 @@ <div class="ui top right pointing dropdown custom" id="review-box"> <div class="ui tiny green button btn-review"> {{.i18n.Tr "repo.diff.review"}} - <i class="dropdown icon"></i> + {{svg "octicon-triangle-down" 14 "dropdown icon"}} </div> <div class="menu review-box"> <div class="ui clearing segment"> diff --git a/templates/repo/diff/options_dropdown.tmpl b/templates/repo/diff/options_dropdown.tmpl index 8dcf398240..92d870ea8a 100644 --- a/templates/repo/diff/options_dropdown.tmpl +++ b/templates/repo/diff/options_dropdown.tmpl @@ -1,6 +1,6 @@ -<div class="ui dropdown tiny button"> +<div class="ui dropdown tiny basic button"> {{.i18n.Tr "repo.diff.options_button"}} - <i class="dropdown icon"></i> + {{svg "octicon-triangle-down" 14 "dropdown icon"}} <div class="menu"> <a class="item tiny basic toggle button" data-target="#diff-files">{{.i18n.Tr "repo.diff.show_diff_stats"}}</a> {{if .Issue.Index}} diff --git a/templates/repo/diff/whitespace_dropdown.tmpl b/templates/repo/diff/whitespace_dropdown.tmpl index 65fd871ba5..1e0e046925 100644 --- a/templates/repo/diff/whitespace_dropdown.tmpl +++ b/templates/repo/diff/whitespace_dropdown.tmpl @@ -1,6 +1,6 @@ -<div class="ui dropdown tiny button"> +<div class="ui dropdown tiny basic button"> {{.i18n.Tr "repo.diff.whitespace_button"}} - <i class="dropdown icon"></i> + {{svg "octicon-triangle-down" 14 "dropdown icon"}} <div class="menu"> <a class="item" href="?style={{if .IsSplitStyle}}split{{else}}unified{{end}}&whitespace="> <i class="circle {{ if eq .WhitespaceBehavior "" }}dot{{else}}outline{{end}} icon"></i> diff --git a/templates/repo/issue/branch_selector_field.tmpl b/templates/repo/issue/branch_selector_field.tmpl index b59c57cb56..0facc96bcb 100644 --- a/templates/repo/issue/branch_selector_field.tmpl +++ b/templates/repo/issue/branch_selector_field.tmpl @@ -8,7 +8,7 @@ <div class="ui {{if .ReadOnly}}disabled{{end}} floating filter select-branch dropdown" data-no-results="{{.i18n.Tr "repo.pulls.no_results"}}"> <div class="ui basic small button"> <span class="text branch-name">{{if .Issue.Ref}}{{$.RefEndName}}{{else}}{{.i18n.Tr "repo.issues.no_ref"}}{{end}}</span> - <i class="dropdown icon"></i> + {{svg "octicon-triangle-down" 14 "dropdown icon"}} </div> <div class="menu"> <div class="ui icon search input"> diff --git a/templates/repo/issue/labels/label_list.tmpl b/templates/repo/issue/labels/label_list.tmpl index 7d6cf0f54b..5b50620b61 100644 --- a/templates/repo/issue/labels/label_list.tmpl +++ b/templates/repo/issue/labels/label_list.tmpl @@ -6,7 +6,7 @@ <div class="ui dropdown type jump item"> <span class="text"> {{.i18n.Tr "repo.issues.filter_sort"}} - <i class="dropdown icon"></i> + {{svg "octicon-triangle-down" 14 "dropdown icon"}} </span> <div class="menu"> <a class="{{if or (eq .SortType "alphabetically") (not .SortType)}}active{{end}} item" href="{{$.Link}}?sort=alphabetically&state={{$.State}}">{{.i18n.Tr "repo.issues.label.filter_sort.alphabetically"}}</a> diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl index 49f9db13bf..40a88c1b69 100644 --- a/templates/repo/issue/list.tmpl +++ b/templates/repo/issue/list.tmpl @@ -45,7 +45,7 @@ <div class="ui {{if not .Labels}}disabled{{end}} dropdown jump item label-filter" style="margin-left: auto"> <span class="text"> {{.i18n.Tr "repo.issues.filter_label"}} - <i class="dropdown icon"></i> + {{svg "octicon-triangle-down" 14 "dropdown icon"}} </span> <div class="menu"> <span class="info">{{.i18n.Tr "repo.issues.filter_label_exclude" | Safe}}</span> @@ -60,7 +60,7 @@ <div class="ui {{if not .Milestones}}disabled{{end}} dropdown jump item"> <span class="text"> {{.i18n.Tr "repo.issues.filter_milestone"}} - <i class="dropdown icon"></i> + {{svg "octicon-triangle-down" 14 "dropdown icon"}} </span> <div class="menu"> <a class="item" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&labels={{.SelectLabels}}&assignee={{$.AssigneeID}}">{{.i18n.Tr "repo.issues.filter_milestone_no_select"}}</a> @@ -74,7 +74,7 @@ <div class="ui {{if not .Assignees}}disabled{{end}} dropdown jump item"> <span class="text"> {{.i18n.Tr "repo.issues.filter_assignee"}} - <i class="dropdown icon"></i> + {{svg "octicon-triangle-down" 14 "dropdown icon"}} </span> <div class="menu"> <a class="item" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&labels={{.SelectLabels}}&milestone={{$.MilestoneID}}">{{.i18n.Tr "repo.issues.filter_assginee_no_select"}}</a> @@ -89,7 +89,7 @@ <div class="ui dropdown type jump item"> <span class="text"> {{.i18n.Tr "repo.issues.filter_type"}} - <i class="dropdown icon"></i> + {{svg "octicon-triangle-down" 14 "dropdown icon"}} </span> <div class="menu"> <a class="{{if eq .ViewType "all"}}active{{end}} item" href="{{$.Link}}?q={{$.Keyword}}&type=all&sort={{$.SortType}}&state={{$.State}}&labels={{.SelectLabels}}&milestone={{$.MilestoneID}}&assignee={{$.AssigneeID}}">{{.i18n.Tr "repo.issues.filter_type.all_issues"}}</a> @@ -104,7 +104,7 @@ <div class="ui dropdown type jump item"> <span class="text"> {{.i18n.Tr "repo.issues.filter_sort"}} - <i class="dropdown icon"></i> + {{svg "octicon-triangle-down" 14 "dropdown icon"}} </span> <div class="menu"> <a class="{{if or (eq .SortType "latest") (not .SortType)}}active{{end}} item" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&sort=latest&state={{$.State}}&labels={{.SelectLabels}}&milestone={{$.MilestoneID}}&assignee={{$.AssigneeID}}">{{.i18n.Tr "repo.issues.filter_sort.latest"}}</a> @@ -150,7 +150,7 @@ <div class="ui {{if not .Labels}}disabled{{end}} dropdown jump item"> <span class="text"> {{.i18n.Tr "repo.issues.action_label"}} - <i class="dropdown icon"></i> + {{svg "octicon-triangle-down" 14 "dropdown icon"}} </span> <div class="menu"> {{range .Labels}} @@ -165,7 +165,7 @@ <div class="ui {{if not .Milestones}}disabled{{end}} dropdown jump item"> <span class="text"> {{.i18n.Tr "repo.issues.action_milestone"}} - <i class="dropdown icon"></i> + {{svg "octicon-triangle-down" 14 "dropdown icon"}} </span> <div class="menu"> <div class="item issue-action" data-element-id="0" data-url="{{$.Link}}/milestone"> @@ -183,7 +183,7 @@ <div class="ui {{if not .Assignees}}disabled{{end}} dropdown jump item"> <span class="text"> {{.i18n.Tr "repo.issues.action_assignee"}} - <i class="dropdown icon"></i> + {{svg "octicon-triangle-down" 14 "dropdown icon"}} </span> <div class="menu"> <div class="item issue-action" data-element-id="0" data-url="{{$.Link}}/assignee"> diff --git a/templates/repo/issue/milestone_issues.tmpl b/templates/repo/issue/milestone_issues.tmpl index af17fde641..763543c38d 100644 --- a/templates/repo/issue/milestone_issues.tmpl +++ b/templates/repo/issue/milestone_issues.tmpl @@ -57,7 +57,7 @@ <div class="ui {{if not .Labels}}disabled{{end}} dropdown jump item label-filter" style="margin-left: auto"> <span class="text"> {{.i18n.Tr "repo.issues.filter_label"}} - <i class="dropdown icon"></i> + {{svg "octicon-triangle-down" 14 "dropdown icon"}} </span> <div class="menu"> <span class="info">{{.i18n.Tr "repo.issues.filter_label_exclude" | Safe}}</span> @@ -72,7 +72,7 @@ <div class="ui {{if not .Assignees}}disabled{{end}} dropdown jump item"> <span class="text"> {{.i18n.Tr "repo.issues.filter_assignee"}} - <i class="dropdown icon"></i> + {{svg "octicon-triangle-down" 14 "dropdown icon"}} </span> <div class="menu"> <a class="item" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&labels={{.SelectLabels}}">{{.i18n.Tr "repo.issues.filter_assginee_no_select"}}</a> @@ -87,7 +87,7 @@ <div class="ui dropdown type jump item"> <span class="text"> {{.i18n.Tr "repo.issues.filter_type"}} - <i class="dropdown icon"></i> + {{svg "octicon-triangle-down" 14 "dropdown icon"}} </span> <div class="menu"> <a class="{{if eq .ViewType "all"}}active{{end}} item" href="{{$.Link}}?q={{$.Keyword}}&type=all&sort={{$.SortType}}&state={{$.State}}&labels={{.SelectLabels}}&assignee={{$.AssigneeID}}">{{.i18n.Tr "repo.issues.filter_type.all_issues"}}</a> @@ -102,7 +102,7 @@ <div class="ui dropdown type jump item"> <span class="text"> {{.i18n.Tr "repo.issues.filter_sort"}} - <i class="dropdown icon"></i> + {{svg "octicon-triangle-down" 14 "dropdown icon"}} </span> <div class="menu"> <a class="{{if or (eq .SortType "latest") (not .SortType)}}active{{end}} item" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&sort=latest&state={{$.State}}&labels={{.SelectLabels}}&assignee={{$.AssigneeID}}">{{.i18n.Tr "repo.issues.filter_sort.latest"}}</a> @@ -146,7 +146,7 @@ <div class="ui {{if not .Labels}}disabled{{end}} dropdown jump item"> <span class="text"> {{.i18n.Tr "repo.issues.action_label"}} - <i class="dropdown icon"></i> + {{svg "octicon-triangle-down" 14 "dropdown icon"}} </span> <div class="menu"> {{range .Labels}} @@ -161,7 +161,7 @@ <div class="ui {{if not .Assignees}}disabled{{end}} dropdown jump item"> <span class="text"> {{.i18n.Tr "repo.issues.action_assignee"}} - <i class="dropdown icon"></i> + {{svg "octicon-triangle-down" 14 "dropdown icon"}} </span> <div class="menu"> <div class="item issue-action" data-element-id="0" data-url="{{$.Link}}/assignee"> diff --git a/templates/repo/issue/milestones.tmpl b/templates/repo/issue/milestones.tmpl index bc88d1015f..ca49664392 100644 --- a/templates/repo/issue/milestones.tmpl +++ b/templates/repo/issue/milestones.tmpl @@ -28,7 +28,7 @@ <div class="ui dropdown type jump item"> <span class="text"> {{.i18n.Tr "repo.issues.filter_sort"}} - <i class="dropdown icon"></i> + {{svg "octicon-triangle-down" 14 "dropdown icon"}} </span> <div class="menu"> <a class="{{if or (eq .SortType "closestduedate") (not .SortType)}}active{{end}} item" href="{{$.Link}}?sort=closestduedate&state={{$.State}}">{{.i18n.Tr "repo.milestones.filter_sort.closest_due_date"}}</a> diff --git a/templates/repo/issue/view_content.tmpl b/templates/repo/issue/view_content.tmpl index be5d5c77f4..611255518e 100644 --- a/templates/repo/issue/view_content.tmpl +++ b/templates/repo/issue/view_content.tmpl @@ -20,8 +20,8 @@ </a> {{end}} <div class="content"> - <div class="ui top attached header"> - <div class="header-left df ac"> + <div class="ui top attached header comment-header df ac sb"> + <div class="comment-header-left df ac"> {{if .Issue.OriginalAuthor }} <span class="text black"> <i class="fa {{MigrationIcon .Repository.GetOriginalURLHostname}}" aria-hidden="true"></i> @@ -40,7 +40,7 @@ </span> {{end}} </div> - <div class="header-right actions df ac"> + <div class="comment-header-right actions df ac"> {{if not $.Repository.IsArchived}} {{if gt .Issue.ShowTag 0}} <div class="ui basic label"> diff --git a/templates/repo/issue/view_content/pull.tmpl b/templates/repo/issue/view_content/pull.tmpl index a67783ebb1..01f6b224ef 100644 --- a/templates/repo/issue/view_content/pull.tmpl +++ b/templates/repo/issue/view_content/pull.tmpl @@ -336,7 +336,7 @@ </span> </button> <div class="ui dropdown icon button"> - <i class="dropdown icon"></i> + {{svg "octicon-triangle-down" 14 "dropdown icon"}} <div class="menu"> {{if $prUnit.PullRequestsConfig.AllowMerge}} <div class="item{{if eq .MergeStyle "merge"}} active selected{{end}}" data-do="merge">{{$.i18n.Tr "repo.pulls.merge_pull_request"}}</div> diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl index 3a1fcf3e8b..e08c47ff53 100644 --- a/templates/repo/issue/view_content/sidebar.tmpl +++ b/templates/repo/issue/view_content/sidebar.tmpl @@ -502,7 +502,7 @@ <div class="ui fluid action input"> <div class="ui search selection dropdown" id="new-dependency-drop-list" data-issue-id="{{.Issue.ID}}"> <input name="newDependency" type="hidden"> - <i class="dropdown icon"></i> + {{svg "octicon-triangle-down" 14 "dropdown icon"}} <input type="text" class="search"> <div class="default text">{{.i18n.Tr "repo.issues.dependency.add"}}</div> </div> @@ -571,7 +571,7 @@ <option value="{{.}}">{{.}}</option> {{end}} </select> - <i class="dropdown icon"></i> + {{svg "octicon-triangle-down" 14 "dropdown icon"}} <div class="default text"> </div> diff --git a/templates/repo/issue/view_title.tmpl b/templates/repo/issue/view_title.tmpl index 336b8850c2..f714f329d3 100644 --- a/templates/repo/issue/view_title.tmpl +++ b/templates/repo/issue/view_title.tmpl @@ -57,7 +57,7 @@ <div class="ui floating filter dropdown" data-no-results="{{.i18n.Tr "repo.pulls.no_results"}}"> <div class="ui basic small button"> <span class="text" id="pull-target-branch" data-basename="{{$.BaseName}}" data-branch="{{$.BaseBranch}}">{{.i18n.Tr "repo.pulls.compare_base"}}: {{$.BaseName}}:{{$.BaseBranch}}</span> - <i class="dropdown icon"></i> + {{svg "octicon-triangle-down" 14 "dropdown icon"}} </div> <div class="menu"> <div class="ui icon search input"> diff --git a/templates/repo/migrate/git.tmpl b/templates/repo/migrate/git.tmpl index 34a1c7bd0d..880faab888 100644 --- a/templates/repo/migrate/git.tmpl +++ b/templates/repo/migrate/git.tmpl @@ -51,7 +51,7 @@ <img class="ui mini image" src="{{.ContextUser.RelAvatarLink}}"> {{.ContextUser.ShortName 20}} </span> - <i class="dropdown icon"></i> + {{svg "octicon-triangle-down" 14 "dropdown icon"}} <div class="menu" title="{{.SignedUser.Name}}"> <div class="item" data-value="{{.SignedUser.ID}}"> <img class="ui mini image" src="{{.SignedUser.RelAvatarLink}}"> diff --git a/templates/repo/migrate/gitea.tmpl b/templates/repo/migrate/gitea.tmpl index 2996d3f676..3ca7527cef 100644 --- a/templates/repo/migrate/gitea.tmpl +++ b/templates/repo/migrate/gitea.tmpl @@ -85,7 +85,7 @@ <img class="ui mini image" src="{{.ContextUser.RelAvatarLink}}"> {{.ContextUser.ShortName 20}} </span> - <i class="dropdown icon"></i> + {{svg "octicon-triangle-down" 14 "dropdown icon"}} <div class="menu" title="{{.SignedUser.Name}}"> <div class="item" data-value="{{.SignedUser.ID}}"> <img class="ui mini image" src="{{.SignedUser.RelAvatarLink}}"> diff --git a/templates/repo/migrate/github.tmpl b/templates/repo/migrate/github.tmpl index 4d382ebbb5..c2679e820c 100644 --- a/templates/repo/migrate/github.tmpl +++ b/templates/repo/migrate/github.tmpl @@ -85,7 +85,7 @@ <img class="ui mini image" src="{{.ContextUser.RelAvatarLink}}"> {{.ContextUser.ShortName 20}} </span> - <i class="dropdown icon"></i> + {{svg "octicon-triangle-down" 14 "dropdown icon"}} <div class="menu" title="{{.SignedUser.Name}}"> <div class="item" data-value="{{.SignedUser.ID}}"> <img class="ui mini image" src="{{.SignedUser.RelAvatarLink}}"> diff --git a/templates/repo/migrate/gitlab.tmpl b/templates/repo/migrate/gitlab.tmpl index edf742eb99..41f5f3c3bb 100644 --- a/templates/repo/migrate/gitlab.tmpl +++ b/templates/repo/migrate/gitlab.tmpl @@ -85,7 +85,7 @@ <img class="ui mini image" src="{{.ContextUser.RelAvatarLink}}"> {{.ContextUser.ShortName 20}} </span> - <i class="dropdown icon"></i> + {{svg "octicon-triangle-down" 14 "dropdown icon"}} <div class="menu" title="{{.SignedUser.Name}}"> <div class="item" data-value="{{.SignedUser.ID}}"> <img class="ui mini image" src="{{.SignedUser.RelAvatarLink}}"> diff --git a/templates/repo/projects/list.tmpl b/templates/repo/projects/list.tmpl index 3974cd3dd1..35c3c00f44 100644 --- a/templates/repo/projects/list.tmpl +++ b/templates/repo/projects/list.tmpl @@ -28,7 +28,7 @@ <div class="ui dropdown type jump item"> <span class="text"> {{.i18n.Tr "repo.issues.filter_sort"}} - <i class="dropdown icon"></i> + {{svg "octicon-triangle-down" 14 "dropdown icon"}} </span> <div class="menu"> <a class="{{if eq .SortType "oldest"}}active{{end}} item" href="{{$.Link}}?q={{$.Keyword}}&sort=oldest&state={{$.State}}">{{.i18n.Tr "repo.issues.filter_sort.oldest"}}</a> diff --git a/templates/repo/pulls/fork.tmpl b/templates/repo/pulls/fork.tmpl index c7ad0f087b..fb690e8311 100644 --- a/templates/repo/pulls/fork.tmpl +++ b/templates/repo/pulls/fork.tmpl @@ -17,7 +17,7 @@ <img class="ui mini image" src="{{.ContextUser.RelAvatarLink}}"> {{.ContextUser.ShortName 20}} </span> - <i class="dropdown icon"></i> + {{svg "octicon-triangle-down" 14 "dropdown icon"}} <div class="menu"> {{if .CanForkToUser}} <div class="item" data-value="{{.SignedUser.ID}}" title="{{.SignedUser.Name}}"> diff --git a/templates/repo/release/list.tmpl b/templates/repo/release/list.tmpl index 6ab2e4283f..c353cc7627 100644 --- a/templates/repo/release/list.tmpl +++ b/templates/repo/release/list.tmpl @@ -82,7 +82,7 @@ <div class="download"> <div class="ui accordion"> <h2 class="title {{if eq $idx 0}}active{{end}}"> - <i class="dropdown icon"></i> + {{svg "octicon-triangle-down" 14 "dropdown icon"}} {{$.i18n.Tr "repo.release.downloads"}} </h2> <div class="content {{if eq $idx 0}}active{{end}}"> diff --git a/templates/repo/release/new.tmpl b/templates/repo/release/new.tmpl index 963d0dcde7..883d103998 100644 --- a/templates/repo/release/new.tmpl +++ b/templates/repo/release/new.tmpl @@ -28,7 +28,7 @@ {{.i18n.Tr "repo.release.target"}} : <strong id="repo-branch-current">{{.Repository.DefaultBranch}}</strong> </div> - <i class="dropdown icon"></i> + {{svg "octicon-triangle-down" 14 "dropdown icon"}} <div class="menu"> {{range .Branches}} <div class="item" data-value="{{.}}">{{.}}</div> diff --git a/templates/repo/settings/branches.tmpl b/templates/repo/settings/branches.tmpl index c7f2c9ccad..be68e9bcbc 100644 --- a/templates/repo/settings/branches.tmpl +++ b/templates/repo/settings/branches.tmpl @@ -27,7 +27,7 @@ {{range .Branches}} <option value="{{.}}">{{.}}</option> {{end}} - </select><i class="dropdown icon"></i> + </select>{{svg "octicon-triangle-down" 14 "dropdown icon"}} <div class="default text">{{.Repository.DefaultBranch}}</div> <div class="menu transition hidden" tabindex="-1" style="display: block !important;"> {{range .Branches}} @@ -49,7 +49,7 @@ <div class="ui grid padded"> <div class="eight wide column"> <div class="ui fluid dropdown selection" tabindex="0"> - <i class="dropdown icon"></i> + {{svg "octicon-triangle-down" 14 "dropdown icon"}} <div class="default text">{{.i18n.Tr "repo.settings.choose_branch"}}</div> <div class="menu transition hidden" tabindex="-1" style="display: block !important;"> {{range .LeftBranches}} diff --git a/templates/repo/settings/collaboration.tmpl b/templates/repo/settings/collaboration.tmpl index 13030fe86a..1d49fc54dc 100644 --- a/templates/repo/settings/collaboration.tmpl +++ b/templates/repo/settings/collaboration.tmpl @@ -21,7 +21,7 @@ {{svg "octicon-shield-lock"}} <div class="ui inline dropdown"> <div class="text">{{if eq .Collaboration.Mode 1}}{{$.i18n.Tr "repo.settings.collaboration.read"}}{{else if eq .Collaboration.Mode 2}}{{$.i18n.Tr "repo.settings.collaboration.write"}}{{else if eq .Collaboration.Mode 3}}{{$.i18n.Tr "repo.settings.collaboration.admin"}}{{else}}{{$.i18n.Tr "repo.settings.collaboration.undefined"}}{{end}}</div> - <i class="dropdown icon"></i> + {{svg "octicon-triangle-down" 14 "dropdown icon"}} <div class="access-mode menu" data-url="{{$.Link}}/access_mode" data-uid="{{.ID}}"> <div class="item" data-text="{{$.i18n.Tr "repo.settings.collaboration.admin"}}" data-value="3">{{$.i18n.Tr "repo.settings.collaboration.admin"}}</div> <div class="item" data-text="{{$.i18n.Tr "repo.settings.collaboration.write"}}" data-value="2">{{$.i18n.Tr "repo.settings.collaboration.write"}}</div> diff --git a/templates/repo/settings/webhook/gitea.tmpl b/templates/repo/settings/webhook/gitea.tmpl index 6400c9b400..bd91ce9e9c 100644 --- a/templates/repo/settings/webhook/gitea.tmpl +++ b/templates/repo/settings/webhook/gitea.tmpl @@ -11,7 +11,7 @@ <div class="ui selection dropdown"> <input type="hidden" id="http_method" name="http_method" value="{{if .Webhook.HTTPMethod}}{{.Webhook.HTTPMethod}}{{else}}POST{{end}}"> <div class="default text"></div> - <i class="dropdown icon"></i> + {{svg "octicon-triangle-down" 14 "dropdown icon"}} <div class="menu"> <div class="item" data-value="POST">POST</div> <div class="item" data-value="GET">GET</div> @@ -23,7 +23,7 @@ <div class="ui selection dropdown"> <input type="hidden" id="content_type" name="content_type" value="{{if .Webhook.ContentType}}{{.Webhook.ContentType}}{{else}}1{{end}}"> <div class="default text"></div> - <i class="dropdown icon"></i> + {{svg "octicon-triangle-down" 14 "dropdown icon"}} <div class="menu"> <div class="item" data-value="1">application/json</div> <div class="item" data-value="2">application/x-www-form-urlencoded</div> diff --git a/templates/repo/settings/webhook/gogs.tmpl b/templates/repo/settings/webhook/gogs.tmpl index 7a40146163..05fcbe6a5e 100644 --- a/templates/repo/settings/webhook/gogs.tmpl +++ b/templates/repo/settings/webhook/gogs.tmpl @@ -11,7 +11,7 @@ <div class="ui selection dropdown"> <input type="hidden" id="content_type" name="content_type" value="{{if .Webhook.ContentType}}{{.Webhook.ContentType}}{{else}}1{{end}}"> <div class="default text"></div> - <i class="dropdown icon"></i> + {{svg "octicon-triangle-down" 14 "dropdown icon"}} <div class="menu"> <div class="item" data-value="1">application/json</div> <div class="item" data-value="2">application/x-www-form-urlencoded</div> diff --git a/templates/repo/settings/webhook/matrix.tmpl b/templates/repo/settings/webhook/matrix.tmpl index 229559a1f6..fa23bb73e8 100644 --- a/templates/repo/settings/webhook/matrix.tmpl +++ b/templates/repo/settings/webhook/matrix.tmpl @@ -19,7 +19,7 @@ <div class="ui selection dropdown"> <input type="hidden" id="message_type" name="message_type" value="{{if .MatrixHook.MessageType}}{{.MatrixHook.MessageType}}{{else}}1{{end}}"> <div class="default text"></div> - <i class="dropdown icon"></i> + {{svg "octicon-triangle-down" 14 "dropdown icon"}} <div class="menu"> <div class="item" data-value="1">m.notice</div> <div class="item" data-value="2">m.text</div> diff --git a/templates/repo/wiki/view.tmpl b/templates/repo/wiki/view.tmpl index 7252093fb6..49730dc4bb 100644 --- a/templates/repo/wiki/view.tmpl +++ b/templates/repo/wiki/view.tmpl @@ -12,7 +12,7 @@ {{.i18n.Tr "repo.wiki.page"}}: <strong>{{$title}}</strong> </span> - <i class="dropdown icon"></i> + {{svg "octicon-triangle-down" 14 "dropdown icon"}} </div> <div class="menu"> <div class="ui icon search input"> diff --git a/templates/user/dashboard/issues.tmpl b/templates/user/dashboard/issues.tmpl index 58b51f1722..f035aed779 100644 --- a/templates/user/dashboard/issues.tmpl +++ b/templates/user/dashboard/issues.tmpl @@ -82,7 +82,7 @@ <div class="ui dropdown type jump item"> <span class="text"> {{.i18n.Tr "repo.issues.filter_sort"}} - <i class="dropdown icon"></i> + {{svg "octicon-triangle-down" 14 "dropdown icon"}} </span> <div class="menu"> <a class="{{if or (eq .SortType "latest") (not .SortType)}}active{{end}} item" href="{{$.Link}}?type={{$.ViewType}}&repos=[{{range $.RepoIDs}}{{.}}%2C{{end}}]&sort=latest&state={{$.State}}&q={{$.Keyword}}">{{.i18n.Tr "repo.issues.filter_sort.latest"}}</a> diff --git a/templates/user/dashboard/milestones.tmpl b/templates/user/dashboard/milestones.tmpl index f22bf13e22..c3fe4e2236 100644 --- a/templates/user/dashboard/milestones.tmpl +++ b/templates/user/dashboard/milestones.tmpl @@ -49,7 +49,7 @@ <div class="ui dropdown type jump item"> <span class="text"> {{.i18n.Tr "repo.issues.filter_sort"}} - <i class="dropdown icon"></i> + {{svg "octicon-triangle-down" 14 "dropdown icon"}} </span> <div class="menu"> <a class="{{if or (eq .SortType "closestduedate") (not .SortType)}}active{{end}} item" href="{{$.Link}}?repos=[{{range $.RepoIDs}}{{.}}%2C{{end}}]&sort=closestduedate&state={{$.State}}">{{.i18n.Tr "repo.milestones.filter_sort.closest_due_date"}}</a> diff --git a/templates/user/dashboard/navbar.tmpl b/templates/user/dashboard/navbar.tmpl index a911d1c4e1..0fc328e9c6 100644 --- a/templates/user/dashboard/navbar.tmpl +++ b/templates/user/dashboard/navbar.tmpl @@ -11,7 +11,7 @@ {{if .ContextUser.Visibility.IsPrivate}}<div class="ui red tiny horizontal label">{{.i18n.Tr "org.settings.visibility.private_shortname"}}</div>{{end}} </span> {{end}} - <i class="dropdown icon"></i> + {{svg "octicon-triangle-down" 14 "dropdown icon"}} </span> <div class="context user overflow menu" tabindex="-1"> <div class="ui header"> diff --git a/templates/user/project.tmpl b/templates/user/project.tmpl index 662544a366..64f671ae4a 100644 --- a/templates/user/project.tmpl +++ b/templates/user/project.tmpl @@ -17,7 +17,7 @@ <img class="ui mini image" src="{{.ContextUser.RelAvatarLink}}"> {{.ContextUser.ShortName 20}} </span> - <i class="dropdown icon"></i> + {{svg "octicon-triangle-down" 14 "dropdown icon"}} <div class="menu"> <div class="item" data-value="{{.SignedUser.ID}}" title="{{.SignedUser.Name}}"> <img class="ui mini image" src="{{.SignedUser.RelAvatarLink}}"> {{.SignedUser.ShortName 20}} diff --git a/templates/user/settings/account.tmpl b/templates/user/settings/account.tmpl index 1a978a6c28..8467d5b45f 100644 --- a/templates/user/settings/account.tmpl +++ b/templates/user/settings/account.tmpl @@ -56,7 +56,7 @@ <div class="field"> <div class="ui selection dropdown" tabindex="0"> <input name="preference" type="hidden" value="{{.EmailNotificationsPreference}}"> - <i class="dropdown icon"></i> + {{svg "octicon-triangle-down" 14 "dropdown icon"}} <div class="text">{{$.i18n.Tr "settings.email_notifications"}}</div> <div class="menu"> <div data-value="enabled" class="{{if eq .EmailNotificationsPreference "enabled"}}active selected {{end}}item">{{$.i18n.Tr "settings.email_notifications.enable"}}</div> @@ -144,7 +144,7 @@ <label for="ui">{{.i18n.Tr "settings.ui"}}</label> <div class="ui selection dropdown" id="ui"> <input name="theme" type="hidden" value="{{.SignedUser.Theme}}"> - <i class="dropdown icon"></i> + {{svg "octicon-triangle-down" 14 "dropdown icon"}} <div class="text"> {{range $i,$a := .AllThemes}} {{if eq $.SignedUser.Theme $a}}{{$a}}{{end}} diff --git a/templates/user/settings/profile.tmpl b/templates/user/settings/profile.tmpl index ea895ecd89..141be2d72d 100644 --- a/templates/user/settings/profile.tmpl +++ b/templates/user/settings/profile.tmpl @@ -48,7 +48,7 @@ <label for="language">{{.i18n.Tr "settings.language"}}</label> <div class="ui language selection dropdown" id="language"> <input name="language" type="hidden" value="{{.SignedUser.Language}}"> - <i class="dropdown icon"></i> + {{svg "octicon-triangle-down" 14 "dropdown icon"}} <div class="text">{{range .AllLangs}}{{if eq $.SignedUser.Language .Lang}}{{.Name}}{{end}}{{end}}</div> <div class="menu"> {{range .AllLangs}} |