diff options
author | zeripath <art27@cantab.net> | 2023-02-13 17:59:59 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-02-13 17:59:59 +0000 |
commit | 51383ec0841ec2562e5c4a9dadd4fef82974dd5c (patch) | |
tree | ca77ae07a74536297ded91b51e6a1eb6d55047d9 /templates/repo/issue | |
parent | 00b18ab42fdd49a437249f57c0b9086fd0ee1d03 (diff) | |
download | gitea-51383ec0841ec2562e5c4a9dadd4fef82974dd5c.tar.gz gitea-51383ec0841ec2562e5c4a9dadd4fef82974dd5c.zip |
Move helpers to be prefixed with `gt-` (#22879)
As discussed in #22847 the helpers in helpers.less need to have a
separate prefix as they are causing conflicts with fomantic styles
This will allow us to have the `.gt-hidden { display:none !important; }`
style that is needed to for the reverted PR.
Of note in doing this I have noticed that there was already a conflict
with at least one chroma style which this PR now avoids.
I've also added in the `gt-hidden` style that matches the tailwind one
and switched the code that needed it to use that.
Signed-off-by: Andrew Thornton <art27@cantab.net>
---------
Signed-off-by: Andrew Thornton <art27@cantab.net>
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
Diffstat (limited to 'templates/repo/issue')
-rw-r--r-- | templates/repo/issue/branch_selector_field.tmpl | 6 | ||||
-rw-r--r-- | templates/repo/issue/list.tmpl | 20 | ||||
-rw-r--r-- | templates/repo/issue/milestone_issues.tmpl | 8 | ||||
-rw-r--r-- | templates/repo/issue/milestones.tmpl | 20 | ||||
-rw-r--r-- | templates/repo/issue/new_form.tmpl | 26 | ||||
-rw-r--r-- | templates/repo/issue/openclose.tmpl | 6 | ||||
-rw-r--r-- | templates/repo/issue/view_content.tmpl | 8 | ||||
-rw-r--r-- | templates/repo/issue/view_content/comments.tmpl | 60 | ||||
-rw-r--r-- | templates/repo/issue/view_content/pull.tmpl | 4 | ||||
-rw-r--r-- | templates/repo/issue/view_content/pull_merge_instruction.tmpl | 6 | ||||
-rw-r--r-- | templates/repo/issue/view_content/sidebar.tmpl | 98 | ||||
-rw-r--r-- | templates/repo/issue/view_content/update_branch_by_merge.tmpl | 2 | ||||
-rw-r--r-- | templates/repo/issue/view_title.tmpl | 4 |
13 files changed, 134 insertions, 134 deletions
diff --git a/templates/repo/issue/branch_selector_field.tmpl b/templates/repo/issue/branch_selector_field.tmpl index 214914b1bf..0d87b0687c 100644 --- a/templates/repo/issue/branch_selector_field.tmpl +++ b/templates/repo/issue/branch_selector_field.tmpl @@ -12,7 +12,7 @@ </div> <div class="menu"> <div class="ui icon search input"> - <i class="icon df ac jc m-0">{{svg "octicon-filter" 16}}</i> + <i class="icon gt-df gt-ac gt-jc gt-m-0">{{svg "octicon-filter" 16}}</i> <input name="search" placeholder="{{.locale.Tr "repo.filter_branch_and_tag"}}..."> </div> <div class="header"> @@ -20,12 +20,12 @@ <div class="two column row"> <a class="reference column" href="#" data-target="#branch-list"> <span class="text black"> - {{svg "octicon-git-branch" 16 "mr-2"}}{{.locale.Tr "repo.branches"}} + {{svg "octicon-git-branch" 16 "gt-mr-2"}}{{.locale.Tr "repo.branches"}} </span> </a> <a class="reference column" href="#" data-target="#tag-list"> <span class="text"> - {{svg "octicon-tag" 16 "mr-2"}}{{.locale.Tr "repo.tags"}} + {{svg "octicon-tag" 16 "gt-mr-2"}}{{.locale.Tr "repo.tags"}} </span> </a> </div> diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl index c04b074221..96d82d4aa6 100644 --- a/templates/repo/issue/list.tmpl +++ b/templates/repo/issue/list.tmpl @@ -29,7 +29,7 @@ <div id="issue-filters" class="ui stackable grid"> <div class="six wide column"> {{if $.CanWriteIssuesOrPulls}} - <div class="ui checkbox issue-checkbox-all vm"> + <div class="ui checkbox issue-checkbox-all gt-vm"> <input type="checkbox" title="{{.locale.Tr "repo.issues.action_check_all"}}"> </div> {{end}} @@ -45,7 +45,7 @@ </span> <div class="menu"> <div class="ui icon search input"> - <i class="icon df ac jc">{{svg "octicon-search" 16}}</i> + <i class="icon gt-df gt-ac gt-jc">{{svg "octicon-search" 16}}</i> <input type="text" placeholder="{{.locale.Tr "repo.issues.filter_label"}}"> </div> <span class="info">{{.locale.Tr "repo.issues.filter_label_exclude" | Safe}}</span> @@ -64,7 +64,7 @@ </span> <div class="menu"> <div class="ui icon search input"> - <i class="icon df ac jc">{{svg "octicon-search" 16}}</i> + <i class="icon gt-df gt-ac gt-jc">{{svg "octicon-search" 16}}</i> <input type="text" placeholder="{{.locale.Tr "repo.issues.filter_milestone"}}"> </div> <a class="item" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&labels={{.SelectLabels}}&assignee={{$.AssigneeID}}&poster={{$.PosterID}}">{{.locale.Tr "repo.issues.filter_milestone_no_select"}}</a> @@ -82,7 +82,7 @@ </span> <div class="menu"> <div class="ui icon search input"> - <i class="icon df ac jc">{{svg "octicon-search" 16}}</i> + <i class="icon gt-df gt-ac gt-jc">{{svg "octicon-search" 16}}</i> <input type="text" placeholder="{{.locale.Tr "repo.issues.filter_project"}}"> </div> <a class="item" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&labels={{.SelectLabels}}&assignee={{$.AssigneeID}}&poster={{$.PosterID}}">{{.locale.Tr "repo.issues.filter_project_all"}}</a> @@ -94,7 +94,7 @@ </div> {{range .OpenProjects}} <a class="{{if $.ProjectID}}{{if eq $.ProjectID .ID}}active selected{{end}}{{end}} item" href="{{$.Link}}?type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&labels={{$.SelectLabels}}&milestone={{$.MilestoneID}}&project={{.ID}}&assignee={{$.AssigneeID}}&poster={{$.PosterID}}"> - {{if .IsOrganizationProject}}{{svg "octicon-project-symlink" 18 "mr-3"}}{{else}}{{svg "octicon-project" 18 "mr-3"}}{{end}} + {{if .IsOrganizationProject}}{{svg "octicon-project-symlink" 18 "gt-mr-3"}}{{else}}{{svg "octicon-project" 18 "gt-mr-3"}}{{end}} {{.Title}} </a> {{end}} @@ -106,7 +106,7 @@ </div> {{range .ClosedProjects}} <a class="{{if $.ProjectID}}{{if eq $.ProjectID .ID}}active selected{{end}}{{end}} item" href="{{$.Link}}?type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&labels={{$.SelectLabels}}&milestone={{$.MilestoneID}}&project={{.ID}}&assignee={{$.AssigneeID}}&poster={{$.PosterID}}"> - {{if .IsOrganizationProject}}{{svg "octicon-project-symlink" 18 "mr-3"}}{{else}}{{svg "octicon-project" 18 "mr-3"}}{{end}} + {{if .IsOrganizationProject}}{{svg "octicon-project-symlink" 18 "gt-mr-3"}}{{else}}{{svg "octicon-project" 18 "gt-mr-3"}}{{end}} {{.Title}} </a> {{end}} @@ -122,7 +122,7 @@ </span> <div class="menu"> <div class="ui icon search input"> - <i class="icon df ac jc">{{svg "octicon-search" 16}}</i> + <i class="icon gt-df gt-ac gt-jc">{{svg "octicon-search" 16}}</i> <input type="text" placeholder="{{.locale.Tr "repo.issues.filter_poster"}}"> </div> <a class="item" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&labels={{.SelectLabels}}&milestone={{$.MilestoneID}}&project={{$.ProjectID}}&assignee={{$.AssigneeID}}">{{.locale.Tr "repo.issues.filter_poster_no_select"}}</a> @@ -142,7 +142,7 @@ </span> <div class="menu"> <div class="ui icon search input"> - <i class="icon df ac jc">{{svg "octicon-search" 16}}</i> + <i class="icon gt-df gt-ac gt-jc">{{svg "octicon-search" 16}}</i> <input type="text" placeholder="{{.locale.Tr "repo.issues.filter_assignee"}}"> </div> <a class="item" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&labels={{.SelectLabels}}&milestone={{$.MilestoneID}}&project={{$.ProjectID}}&poster={{$.PosterID}}">{{.locale.Tr "repo.issues.filter_assginee_no_select"}}</a> @@ -260,7 +260,7 @@ </div> {{range .OpenProjects}} <div class="item issue-action" data-element-id="{{.ID}}" data-url="{{$.RepoLink}}/issues/projects"> - {{if .IsOrganizationProject}}{{svg "octicon-project-symlink" 18 "mr-3"}}{{else}}{{svg "octicon-project" 18 "mr-3"}}{{end}} + {{if .IsOrganizationProject}}{{svg "octicon-project-symlink" 18 "gt-mr-3"}}{{else}}{{svg "octicon-project" 18 "gt-mr-3"}}{{end}} {{.Title}} </div> {{end}} @@ -272,7 +272,7 @@ </div> {{range .ClosedProjects}} <div class="item issue-action" data-element-id="{{.ID}}" data-url="{{$.RepoLink}}/issues/projects"> - {{if .IsOrganizationProject}}{{svg "octicon-project-symlink" 18 "mr-3"}}{{else}}{{svg "octicon-project" 18 "mr-3"}}{{end}} + {{if .IsOrganizationProject}}{{svg "octicon-project-symlink" 18 "gt-mr-3"}}{{else}}{{svg "octicon-project" 18 "gt-mr-3"}}{{end}} {{.Title}} </div> {{end}} diff --git a/templates/repo/issue/milestone_issues.tmpl b/templates/repo/issue/milestone_issues.tmpl index f0d6ae6bfe..45b5b490a9 100644 --- a/templates/repo/issue/milestone_issues.tmpl +++ b/templates/repo/issue/milestone_issues.tmpl @@ -52,7 +52,7 @@ </span> <div class="menu"> <div class="ui icon search input"> - <i class="icon df ac jc">{{svg "octicon-search" 16}}</i> + <i class="icon gt-df gt-ac gt-jc">{{svg "octicon-search" 16}}</i> <input type="text" placeholder="{{.locale.Tr "repo.issues.filter_label"}}"> </div> <span class="info">{{.locale.Tr "repo.issues.filter_label_exclude" | Safe}}</span> @@ -87,13 +87,13 @@ </span> <div class="menu"> <div class="ui icon search input"> - <i class="icon df ac jc">{{svg "octicon-search" 16}}</i> + <i class="icon gt-df gt-ac gt-jc">{{svg "octicon-search" 16}}</i> <input type="text" placeholder="{{.locale.Tr "repo.issues.filter_assignee"}}"> </div> <a class="item" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&labels={{.SelectLabels}}&poster={{$.PosterID}}">{{.locale.Tr "repo.issues.filter_assginee_no_select"}}</a> {{range .Assignees}} <a class="{{if eq $.AssigneeID .ID}}active selected{{end}} item" href="{{$.Link}}?type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&labels={{$.SelectLabels}}&assignee={{.ID}}&poster={{$.PosterID}}"> - {{avatar . 28 "mr-2"}} + {{avatar . 28 "gt-mr-2"}} {{.GetDisplayName}} </a> {{end}} @@ -179,7 +179,7 @@ </div> {{range .Assignees}} <div class="item issue-action" data-element-id="{{.ID}}" data-url="{{$.RepoLink}}/issues/assignee"> - {{avatar . 28 "mr-2"}} + {{avatar . 28 "gt-mr-2"}} {{.GetDisplayName}} </div> {{end}} diff --git a/templates/repo/issue/milestones.tmpl b/templates/repo/issue/milestones.tmpl index 4bfd04c782..3730d3d3c4 100644 --- a/templates/repo/issue/milestones.tmpl +++ b/templates/repo/issue/milestones.tmpl @@ -17,11 +17,11 @@ <div class="column"> <div class="ui compact tiny menu"> <a class="item{{if not .IsShowClosed}} active{{end}}" href="{{.RepoLink}}/milestones?state=open&q={{$.Keyword}}"> - {{svg "octicon-milestone" 16 "mr-3"}} + {{svg "octicon-milestone" 16 "gt-mr-3"}} {{JsPrettyNumber .OpenCount}} {{.locale.Tr "repo.issues.open_title"}} </a> <a class="item{{if .IsShowClosed}} active{{end}}" href="{{.RepoLink}}/milestones?state=closed&q={{$.Keyword}}"> - {{svg "octicon-check" 16 "mr-3"}} + {{svg "octicon-check" 16 "gt-mr-3"}} {{JsPrettyNumber .ClosedCount}} {{.locale.Tr "repo.issues.closed_title"}} </a> </div> @@ -38,7 +38,7 @@ </form> </div> - <div class="column right aligned df ac je"> + <div class="column right aligned gt-df gt-ac gt-je"> <!-- Sort --> <div class="ui dropdown type jump item"> <span class="text"> @@ -61,12 +61,12 @@ <div class="milestone list"> {{range .Milestones}} <li class="item"> - <div class="df ac sb"> - <h3 class="df ac m-0 fw"> - {{svg "octicon-milestone" 16 "mr-3"}}<a class="muted" href="{{$.RepoLink}}/milestone/{{.ID}}">{{.Name}}</a> + <div class="gt-df gt-ac gt-sb"> + <h3 class="gt-df gt-ac gt-m-0 gt-fw"> + {{svg "octicon-milestone" 16 "gt-mr-3"}}<a class="muted" href="{{$.RepoLink}}/milestone/{{.ID}}">{{.Name}}</a> </h3> - <div class="df ac"> - <span class="mr-3">{{.Completeness}}%</span> + <div class="gt-df gt-ac"> + <span class="gt-mr-3">{{.Completeness}}%</span> <progress value="{{.Completeness}}" max="100"></progress> </div> </div> @@ -83,9 +83,9 @@ {{end}} {{end}} <span class="issue-stats"> - {{svg "octicon-issue-opened" 16 "mr-3"}} + {{svg "octicon-issue-opened" 16 "gt-mr-3"}} {{JsPrettyNumber .NumOpenIssues}} {{$.locale.Tr "repo.issues.open_title"}} - {{svg "octicon-check" 16 "mr-3"}} + {{svg "octicon-check" 16 "gt-mr-3"}} {{JsPrettyNumber .NumClosedIssues}} {{$.locale.Tr "repo.issues.closed_title"}} {{if .TotalTrackedTime}}{{svg "octicon-clock"}} {{.TotalTrackedTime|Sec2Time}}{{end}} {{if .UpdatedUnix}}{{svg "octicon-clock"}} {{$.locale.Tr "repo.milestones.update_ago" (.TimeSinceUpdate|Sec2Time)}}{{end}} diff --git a/templates/repo/issue/new_form.tmpl b/templates/repo/issue/new_form.tmpl index 2e55686725..84c2c64a72 100644 --- a/templates/repo/issue/new_form.tmpl +++ b/templates/repo/issue/new_form.tmpl @@ -47,7 +47,7 @@ <div class="header" style="text-transform: none;font-size:16px;">{{.locale.Tr "repo.issues.new.add_labels_title"}}</div> {{if or .Labels .OrgLabels}} <div class="ui icon search input"> - <i class="icon df ac jc">{{svg "octicon-search" 16}}</i> + <i class="icon gt-df gt-ac gt-jc">{{svg "octicon-search" 16}}</i> <input type="text" placeholder="{{.locale.Tr "repo.issues.filter_labels"}}"> </div> {{end}} @@ -84,7 +84,7 @@ <div class="header" style="text-transform: none;font-size:16px;">{{.locale.Tr "repo.issues.new.add_milestone_title"}}</div> {{if or .OpenMilestones .ClosedMilestones}} <div class="ui icon search input"> - <i class="icon df ac jc">{{svg "octicon-search" 16}}</i> + <i class="icon gt-df gt-ac gt-jc">{{svg "octicon-search" 16}}</i> <input type="text" placeholder="{{.locale.Tr "repo.issues.filter_milestones"}}"> </div> {{end}} @@ -101,7 +101,7 @@ </div> {{range .OpenMilestones}} <a class="item" data-id="{{.ID}}" data-href="{{$.RepoLink}}/issues?milestone={{.ID}}"> - {{svg "octicon-milestone" 16 "mr-2"}} + {{svg "octicon-milestone" 16 "gt-mr-2"}} {{.Name}} </a> {{end}} @@ -113,7 +113,7 @@ </div> {{range .ClosedMilestones}} <a class="item" data-id="{{.ID}}" data-href="{{$.RepoLink}}/issues?milestone={{.ID}}"> - {{svg "octicon-milestone" 16 "mr-2"}} + {{svg "octicon-milestone" 16 "gt-mr-2"}} {{.Name}} </a> {{end}} @@ -126,7 +126,7 @@ <div class="selected"> {{if .Milestone}} <a class="item muted sidebar-item-link" href="{{.RepoLink}}/issues?milestone={{.Milestone.ID}}"> - {{svg "octicon-milestone" 18 "mr-3"}} + {{svg "octicon-milestone" 18 "gt-mr-3"}} {{.Milestone.Name}} </a> {{end}} @@ -148,7 +148,7 @@ <div class="header" style="text-transform: none;font-size:16px;">{{.locale.Tr "repo.issues.new.add_project_title"}}</div> {{if or .OpenProjects .ClosedProjects}} <div class="ui icon search input"> - <i class="icon df ac jc">{{svg "octicon-search" 16}}</i> + <i class="icon gt-df gt-ac gt-jc">{{svg "octicon-search" 16}}</i> <input type="text" placeholder="{{.locale.Tr "repo.issues.filter_projects"}}"> </div> {{end}} @@ -165,7 +165,7 @@ </div> {{range .OpenProjects}} <a class="item muted sidebar-item-link" data-id="{{.ID}}" data-href="{{$.RepoLink}}/projects/{{.ID}}"> - {{svg "octicon-project" 18 "mr-3"}} + {{svg "octicon-project" 18 "gt-mr-3"}} {{.Title}} </a> {{end}} @@ -177,7 +177,7 @@ </div> {{range .ClosedProjects}} <a class="item muted sidebar-item-link" data-id="{{.ID}}" data-href="{{$.RepoLink}}/projects/{{.ID}}"> - {{svg "octicon-project" 18 "mr-3"}} + {{svg "octicon-project" 18 "gt-mr-3"}} {{.Title}} </a> {{end}} @@ -190,7 +190,7 @@ <div class="selected"> {{if .Project}} <a class="item muted sidebar-item-link" href="{{.RepoLink}}/projects/{{.Project.ID}}"> - {{svg "octicon-project" 18 "mr-3"}} + {{svg "octicon-project" 18 "gt-mr-3"}} {{.Project.Title}} </a> {{end}} @@ -209,7 +209,7 @@ <div class="filter menu" data-id="#assignee_ids"> <div class="header" style="text-transform: none;font-size:16px;">{{.locale.Tr "repo.issues.new.add_assignees_title"}}</div> <div class="ui icon search input"> - <i class="icon df ac jc">{{svg "octicon-search" 16}}</i> + <i class="icon gt-df gt-ac gt-jc">{{svg "octicon-search" 16}}</i> <input type="text" placeholder="{{.locale.Tr "repo.issues.filter_assignees"}}"> </div> <div class="no-select item">{{.locale.Tr "repo.issues.new.clear_assignees"}}</div> @@ -217,7 +217,7 @@ <a class="item muted" href="#" data-id="{{.ID}}" data-id-selector="#assignee_{{.ID}}"> <span class="octicon-check invisible">{{svg "octicon-check"}}</span> <span class="text"> - {{avatar . 28 "mr-3"}}{{.GetDisplayName}} + {{avatar . 28 "gt-mr-3"}}{{.GetDisplayName}} </span> </a> {{end}} @@ -228,8 +228,8 @@ {{.locale.Tr "repo.issues.new.no_assignees"}} </span> {{range .Assignees}} - <a class="hide item p-2 muted" id="assignee_{{.ID}}" href="{{$.RepoLink}}/issues?assignee={{.ID}}"> - {{avatar . 28 "mr-3 vm"}}{{.GetDisplayName}} + <a class="hide item gt-p-2 muted" id="assignee_{{.ID}}" href="{{$.RepoLink}}/issues?assignee={{.ID}}"> + {{avatar . 28 "gt-mr-3 gt-vm"}}{{.GetDisplayName}} </a> {{end}} </div> diff --git a/templates/repo/issue/openclose.tmpl b/templates/repo/issue/openclose.tmpl index 9299fe1cb1..e2c13fea18 100644 --- a/templates/repo/issue/openclose.tmpl +++ b/templates/repo/issue/openclose.tmpl @@ -1,14 +1,14 @@ <div class="ui compact tiny menu"> <a class="{{if not .IsShowClosed}}active {{end}}item" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&sort={{$.SortType}}&state=open&labels={{.SelectLabels}}&milestone={{.MilestoneID}}&project={{.ProjectID}}&assignee={{.AssigneeID}}&poster={{.PosterID}}"> {{if .PageIsPullList}} - {{svg "octicon-git-pull-request" 16 "mr-3"}} + {{svg "octicon-git-pull-request" 16 "gt-mr-3"}} {{else}} - {{svg "octicon-issue-opened" 16 "mr-3"}} + {{svg "octicon-issue-opened" 16 "gt-mr-3"}} {{end}} {{JsPrettyNumber .IssueStats.OpenCount}} {{.locale.Tr "repo.issues.open_title"}} </a> <a class="{{if .IsShowClosed}}active {{end}}item" href="{{$.Link}}?q={{$.Keyword}}&type={{.ViewType}}&sort={{$.SortType}}&state=closed&labels={{.SelectLabels}}&milestone={{.MilestoneID}}&project={{.ProjectID}}&assignee={{.AssigneeID}}&poster={{.PosterID}}"> - {{svg "octicon-check" 16 "mr-3"}} + {{svg "octicon-check" 16 "gt-mr-3"}} {{JsPrettyNumber .IssueStats.ClosedCount}} {{.locale.Tr "repo.issues.closed_title"}} </a> </div> diff --git a/templates/repo/issue/view_content.tmpl b/templates/repo/issue/view_content.tmpl index 7b318d51f1..b3970d6404 100644 --- a/templates/repo/issue/view_content.tmpl +++ b/templates/repo/issue/view_content.tmpl @@ -27,10 +27,10 @@ </a> {{end}} <div class="content comment-container"> - <div class="ui top attached header comment-header df ac sb"> - <div class="comment-header-left df ac"> + <div class="ui top attached header comment-header gt-df gt-ac gt-sb"> + <div class="comment-header-left gt-df gt-ac"> {{if .Issue.OriginalAuthor}} - <span class="text black bold"> + <span class="text black gt-bold"> {{svg (MigrationIcon .Repository.GetOriginalURLHostname)}} {{.Issue.OriginalAuthor}} </span> @@ -50,7 +50,7 @@ </span> {{end}} </div> - <div class="comment-header-right actions df ac"> + <div class="comment-header-right actions gt-df gt-ac"> {{if gt .Issue.ShowRole 0}} {{if (.Issue.ShowRole.HasRole "Writer")}} <div class="ui basic label role-label"> diff --git a/templates/repo/issue/view_content/comments.tmpl b/templates/repo/issue/view_content/comments.tmpl index 37aa82345f..90646045d0 100644 --- a/templates/repo/issue/view_content/comments.tmpl +++ b/templates/repo/issue/view_content/comments.tmpl @@ -22,10 +22,10 @@ </a> {{end}} <div class="content comment-container"> - <div class="ui top attached header comment-header df ac sb"> - <div class="comment-header-left df ac"> + <div class="ui top attached header comment-header gt-df gt-ac gt-sb"> + <div class="comment-header-left gt-df gt-ac"> {{if .OriginalAuthor}} - <span class="text black bold mr-2"> + <span class="text black gt-bold gt-mr-2"> {{svg (MigrationIcon $.Repository.GetOriginalURLHostname)}} {{.OriginalAuthor}} </span> @@ -47,7 +47,7 @@ </span> {{end}} </div> - <div class="comment-header-right actions df ac"> + <div class="comment-header-right actions gt-df gt-ac"> {{if (.ShowRole.HasRole "Poster")}} <div class="ui basic label"> {{$.locale.Tr "repo.issues.poster"}} @@ -93,7 +93,7 @@ </div> {{else if eq .Type 1}} <div class="timeline-item event" id="{{.HashTag}}"> - <span class="badge bg-green text-white">{{svg "octicon-dot-fill"}}</span> + <span class="badge gt-bg-green gt-text-white">{{svg "octicon-dot-fill"}}</span> {{template "shared/user/avatarlink" .Poster}} <span class="text grey muted-links"> {{template "shared/user/authorlink" .Poster}} @@ -106,7 +106,7 @@ </div> {{else if eq .Type 2}} <div class="timeline-item event" id="{{.HashTag}}"> - <span class="badge bg-red text-white">{{svg "octicon-circle-slash"}}</span> + <span class="badge gt-bg-red gt-text-white">{{svg "octicon-circle-slash"}}</span> {{template "shared/user/avatarlink" .Poster}} <span class="text grey muted-links"> {{template "shared/user/authorlink" .Poster}} @@ -119,7 +119,7 @@ </div> {{else if eq .Type 28}} <div class="timeline-item event" id="{{.HashTag}}"> - <span class="badge bg-purple text-white">{{svg "octicon-git-merge"}}</span> + <span class="badge gt-bg-purple gt-text-white">{{svg "octicon-git-merge"}}</span> {{template "shared/user/avatarlink" .Poster}} <span class="text grey muted-links"> {{template "shared/user/authorlink" .Poster}} @@ -372,7 +372,7 @@ {{avatar .Poster}} </a> {{end}} - <span class="badge{{if eq .Review.Type 1}} bg-green text-white{{else if eq .Review.Type 3}} bg-red text-white{{end}}">{{svg (printf "octicon-%s" .Review.Type.Icon)}}</span> + <span class="badge{{if eq .Review.Type 1}} gt-bg-green gt-text-white{{else if eq .Review.Type 3}} gt-bg-red gt-text-white{{end}}">{{svg (printf "octicon-%s" .Review.Type.Icon)}}</span> <span class="text grey muted-links"> {{if .OriginalAuthor}} <span class="text black"> @@ -402,11 +402,11 @@ {{if .Content}} <div class="timeline-item comment" id="{{.HashTag}}"> <div class="content comment-container"> - <div class="ui top attached header comment-header df ac sb"> - <div class="comment-header-left df ac"> + <div class="ui top attached header comment-header gt-df gt-ac gt-sb"> + <div class="comment-header-left gt-df gt-ac"> <span class="text grey muted-links"> {{if .OriginalAuthor}} - <span class="text black bold"> + <span class="text black gt-bold"> {{svg (MigrationIcon $.Repository.GetOriginalURLHostname)}} {{.OriginalAuthor}} </span> @@ -419,7 +419,7 @@ {{$.locale.Tr "repo.issues.review.left_comment" | Safe}} </span> </div> - <div class="comment-header-right actions df ac"> + <div class="comment-header-right actions gt-df gt-ac"> {{if (.ShowRole.HasRole "Poster")}} <div class="ui basic label"> {{$.locale.Tr "repo.issues.poster"}} @@ -470,31 +470,31 @@ {{range $filename, $lines := .Review.CodeComments}} {{range $line, $comms := $lines}} <div class="ui segments"> - <div class="ui segment py-3 df ac sb"> + <div class="ui segment gt-py-3 gt-df gt-ac gt-sb"> {{$invalid := (index $comms 0).Invalidated}} {{$resolved := (index $comms 0).IsResolved}} {{$resolveDoer := (index $comms 0).ResolveDoer}} {{$isNotPending := (not (eq (index $comms 0).Review.Type 0))}} - <div class="df ac"> - <a href="{{(index $comms 0).CodeCommentLink}}" class="file-comment ml-3 word-break">{{$filename}}</a> + <div class="gt-df gt-ac"> + <a href="{{(index $comms 0).CodeCommentLink}}" class="file-comment gt-ml-3 gt-word-break">{{$filename}}</a> {{if $invalid}} - <span class="ui label basic small ml-3"> + <span class="ui label basic small gt-ml-3"> {{$.locale.Tr "repo.issues.review.outdated"}} </span> {{end}} </div> <div> {{if or $invalid $resolved}} - <button id="show-outdated-{{(index $comms 0).ID}}" data-comment="{{(index $comms 0).ID}}" class="{{if not $resolved}}hide {{end}}ui compact right labeled button show-outdated df ac"> - {{svg "octicon-unfold" 16 "mr-3"}} + <button id="show-outdated-{{(index $comms 0).ID}}" data-comment="{{(index $comms 0).ID}}" class="{{if not $resolved}}hide {{end}}ui compact right labeled button show-outdated gt-df gt-ac"> + {{svg "octicon-unfold" 16 "gt-mr-3"}} {{if $resolved}} {{$.locale.Tr "repo.issues.review.show_resolved"}} {{else}} {{$.locale.Tr "repo.issues.review.show_outdated"}} {{end}} </button> - <button id="hide-outdated-{{(index $comms 0).ID}}" data-comment="{{(index $comms 0).ID}}" class="{{if $resolved}}hide {{end}}ui compact right labeled button hide-outdated df ac"> - {{svg "octicon-fold" 16 "mr-3"}} + <button id="hide-outdated-{{(index $comms 0).ID}}" data-comment="{{(index $comms 0).ID}}" class="{{if $resolved}}hide {{end}}ui compact right labeled button hide-outdated gt-df gt-ac"> + {{svg "octicon-fold" 16 "gt-mr-3"}} {{if $resolved}} {{$.locale.Tr "repo.issues.review.hide_resolved"}} {{else}} @@ -520,13 +520,13 @@ </div> {{end}} <div id="code-comments-{{(index $comms 0).ID}}" class="comment-code-cloud ui segment{{if $resolved}} hide{{end}}"> - <div class="ui comments mb-0"> + <div class="ui comments gt-mb-0"> {{range $comms}} {{$createdSubStr:= TimeSinceUnix .CreatedUnix $.locale}} - <div class="comment code-comment pb-4" id="{{.HashTag}}"> + <div class="comment code-comment gt-pb-4" id="{{.HashTag}}"> <div class="content"> <div class="header comment-header"> - <div class="comment-header-left df ac"> + <div class="comment-header-left gt-df gt-ac"> {{if not .OriginalAuthor}} <a class="avatar"> {{avatar .Poster}} @@ -534,7 +534,7 @@ {{end}} <span class="text grey muted-links"> {{if .OriginalAuthor}} - <span class="text black bold"> + <span class="text black gt-bold"> {{svg (MigrationIcon $.Repository.GetOriginalURLHostname)}} {{.OriginalAuthor}} </span> @@ -546,7 +546,7 @@ {{$.locale.Tr "repo.issues.commented_at" (.HashTag|Escape) $createdSubStr | Safe}} </span> </div> - <div class="comment-header-right actions df ac"> + <div class="comment-header-right actions gt-df gt-ac"> {{if (.ShowRole.HasRole "Poster")}} <div class="ui basic label"> {{$.locale.Tr "repo.issues.poster"}} @@ -589,11 +589,11 @@ </div> {{end}} </div> - <div class="code-comment-buttons df ac fw mt-3 mb-2 mx-3"> - <div class="f1"> + <div class="code-comment-buttons gt-df gt-ac gt-fw gt-mt-3 gt-mb-2 gt-mx-3"> + <div class="gt-f1"> {{if $resolved}} <div class="ui grey text"> - {{svg "octicon-check" 16 "mr-2"}} + {{svg "octicon-check" 16 "gt-mr-2"}} <b>{{$resolveDoer.Name}}</b> {{$.locale.Tr "repo.issues.review.resolved_by"}} </div> {{end}} @@ -609,8 +609,8 @@ </button> {{end}} {{if and $.SignedUserID (not $.Repository.IsArchived)}} - <button class="comment-form-reply ui green tiny labeled icon button ml-2 mr-0"> - {{svg "octicon-reply" 16 "reply icon mr-2"}}{{$.locale.Tr "repo.diff.comment.reply"}} + <button class="comment-form-reply ui green tiny labeled icon button gt-ml-2 gt-mr-0"> + {{svg "octicon-reply" 16 "reply icon gt-mr-2"}}{{$.locale.Tr "repo.diff.comment.reply"}} </button> {{end}} </div> diff --git a/templates/repo/issue/view_content/pull.tmpl b/templates/repo/issue/view_content/pull.tmpl index f32c278b62..ae463d1b3f 100644 --- a/templates/repo/issue/view_content/pull.tmpl +++ b/templates/repo/issue/view_content/pull.tmpl @@ -177,7 +177,7 @@ {{$.locale.Tr "repo.pulls.data_broken"}} </div> {{else if .IsPullWorkInProgress}} - <div class="item toggle-wip df ac sb" data-title="{{.Issue.Title}}" data-wip-prefix="{{(.WorkInProgressPrefix|Escape)}}" data-update-url="{{.Issue.Link}}/title"> + <div class="item toggle-wip gt-df gt-ac gt-sb" data-title="{{.Issue.Title}}" data-wip-prefix="{{(.WorkInProgressPrefix|Escape)}}" data-update-url="{{.Issue.Link}}/title"> <div> <i class="icon icon-octicon">{{svg "octicon-x"}}</i> {{$.locale.Tr "repo.pulls.cannot_merge_work_in_progress"}} @@ -333,7 +333,7 @@ 'hasPendingPullRequestMergeTip': {{$hasPendingPullRequestMergeTip}}, }; - const generalHideAutoMerge = mergeForm.canMergeNow && mergeForm.allOverridableChecksOk; // if this PR can be merged now, then hide the auto merge + const generalHideAutoMerge = mergeForm.canMergeNow && mergeForm.allOverridableChecksOk; // if this pr can be merged now, then hide the auto merge mergeForm['mergeStyles'] = [ { 'name': 'merge', diff --git a/templates/repo/issue/view_content/pull_merge_instruction.tmpl b/templates/repo/issue/view_content/pull_merge_instruction.tmpl index 21bb3d8e79..5669b2fb69 100644 --- a/templates/repo/issue/view_content/pull_merge_instruction.tmpl +++ b/templates/repo/issue/view_content/pull_merge_instruction.tmpl @@ -1,7 +1,7 @@ -<div class="instruct-toggle mt-3"> {{$.locale.Tr "repo.pulls.merge_instruction_hint" | Safe}} </div> +<div class="instruct-toggle gt-mt-3"> {{$.locale.Tr "repo.pulls.merge_instruction_hint" | Safe}} </div> <div class="instruct-content" style="display:none"> <div class="ui divider"></div> - <div><h3 class="di">{{$.locale.Tr "step1"}} </h3>{{$.locale.Tr "repo.pulls.merge_instruction_step1_desc"}}</div> + <div><h3 class="gt-di">{{$.locale.Tr "step1"}} </h3>{{$.locale.Tr "repo.pulls.merge_instruction_step1_desc"}}</div> <div class="ui secondary segment"> {{if eq $.Issue.PullRequest.Flow 0}} <div>git checkout -b {{if ne $.Issue.PullRequest.HeadRepo.ID $.Issue.PullRequest.BaseRepo.ID}}{{$.Issue.PullRequest.HeadRepo.OwnerName}}-{{end}}{{$.Issue.PullRequest.HeadBranch}} {{$.Issue.PullRequest.BaseBranch}}</div> @@ -11,7 +11,7 @@ <div>git fetch origin {{$.Issue.PullRequest.GetGitRefName}}:{{$.Issue.PullRequest.HeadBranch}}</div> {{end}} </div> - <div><h3 class="di">{{$.locale.Tr "step2"}} </h3>{{$.locale.Tr "repo.pulls.merge_instruction_step2_desc"}}</div> + <div><h3 class="gt-di">{{$.locale.Tr "step2"}} </h3>{{$.locale.Tr "repo.pulls.merge_instruction_step2_desc"}}</div> <div class="ui secondary segment"> <div>git checkout {{$.Issue.PullRequest.BaseBranch}}</div> <div>git merge --no-ff {{if ne $.Issue.PullRequest.HeadRepo.ID $.Issue.PullRequest.BaseRepo.ID}}{{$.Issue.PullRequest.HeadRepo.OwnerName}}-{{end}}{{$.Issue.PullRequest.HeadBranch}}</div> diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl index 10bb6a07f9..0f256b6be8 100644 --- a/templates/repo/issue/view_content/sidebar.tmpl +++ b/templates/repo/issue/view_content/sidebar.tmpl @@ -6,17 +6,17 @@ <input id="reviewer_id" name="reviewer_id" type="hidden" value="{{.reviewer_id}}"> <div class="ui {{if or (not .Reviewers) (not .CanChooseReviewer) .Repository.IsArchived}}disabled{{end}} floating jump select-reviewers-modify dropdown"> - <a class="text df ac muted"> + <a class="text gt-df gt-ac muted"> <strong>{{.locale.Tr "repo.issues.review.reviewers"}}</strong> {{if and .CanChooseReviewer (not .Repository.IsArchived)}} - {{svg "octicon-gear" 16 "ml-2"}} + {{svg "octicon-gear" 16 "gt-ml-2"}} {{end}} </a> <div class="filter menu" data-action="update" data-issue-id="{{$.Issue.ID}}" data-update-url="{{$.RepoLink}}/issues/request_review"> <div class="header" style="text-transform: none;font-size:16px;">{{.locale.Tr "repo.issues.new.add_reviewer_title"}}</div> {{if .Reviewers}} <div class="ui icon search input"> - <i class="icon df ac jc">{{svg "octicon-search" 16}}</i> + <i class="icon gt-df gt-ac gt-jc">{{svg "octicon-search" 16}}</i> <input type="text" placeholder="{{.locale.Tr "repo.issues.filter_reviewers"}}"> </div> {{end}} @@ -26,7 +26,7 @@ <a class="{{if not .CanChange}}ui tooltip{{end}} item {{if .Checked}} checked {{end}} {{if not .CanChange}}ban-change{{end}}" href="#" data-id="{{.ItemID}}" data-id-selector="#review_request_{{.ItemID}}" {{if not .CanChange}} data-content="{{$.locale.Tr "repo.issues.remove_request_review_block"}}"{{end}}> <span class="octicon-check {{if not .Checked}}invisible{{end}}">{{svg "octicon-check"}}</span> <span class="text"> - {{avatar .User 28 "mr-3"}} + {{avatar .User 28 "gt-mr-3"}} {{.User.GetDisplayName}} </span> </a> @@ -40,7 +40,7 @@ <a class="{{if not .CanChange}}ui tooltip{{end}} item {{if .Checked}} checked {{end}} {{if not .CanChange}}ban-change{{end}}" href="#" data-id="{{.ItemID}}" data-id-selector="#review_request_team_{{.Team.ID}}" {{if not .CanChange}} data-content="{{$.locale.Tr "repo.issues.remove_request_review_block"}}"{{end}}> <span class="octicon-check {{if not .Checked}}invisible{{end}}">{{svg "octicon-check" 16}}</span> <span class="text"> - {{svg "octicon-people" 16 "ml-4 mr-2"}}{{$.Issue.Repo.OwnerName}}/{{.Team.Name}} + {{svg "octicon-people" 16 "gt-ml-4 gt-mr-2"}}{{$.Issue.Repo.OwnerName}}/{{.Team.Name}} </span> </a> {{end}} @@ -53,10 +53,10 @@ <span class="no-select item {{if or .OriginalReviews .PullReviewers}}hide{{end}}">{{.locale.Tr "repo.issues.new.no_reviewers"}}</span> <div class="selected"> {{range .PullReviewers}} - <div class="item mb-2"> + <div class="item gt-mb-2"> {{if .User}} <a class="muted sidebar-item-link" href="{{.User.HomeLink}}"> - {{avatar .User 28 "mr-3"}} + {{avatar .User 28 "gt-mr-3"}} {{.User.GetDisplayName}} </a> {{else if .Team}} @@ -107,17 +107,17 @@ {{end}} <div class="ui {{if or (not .HasIssuesOrPullsWritePermission) .Repository.IsArchived}}disabled{{end}} floating jump select-label dropdown"> - <a class="text df ac muted"> + <a class="text gt-df gt-ac muted"> <strong>{{.locale.Tr "repo.issues.new.labels"}}</strong> {{if and .HasIssuesOrPullsWritePermission (not .Repository.IsArchived)}} - {{svg "octicon-gear" 16 "ml-2"}} + {{svg "octicon-gear" 16 "gt-ml-2"}} {{end}} </a> <div class="filter menu" data-action="update" data-issue-id="{{$.Issue.ID}}" data-update-url="{{$.RepoLink}}/issues/labels"> <div class="header" style="text-transform: none;font-size:16px;">{{.locale.Tr "repo.issues.new.add_labels_title"}}</div> {{if or .Labels .OrgLabels}} <div class="ui icon search input"> - <i class="icon df ac jc">{{svg "octicon-search" 16}}</i> + <i class="icon gt-df gt-ac gt-jc">{{svg "octicon-search" 16}}</i> <input type="text" placeholder="{{.locale.Tr "repo.issues.filter_labels"}}"> </div> {{end}} @@ -142,17 +142,17 @@ <div class="ui divider"></div> <div class="ui {{if or (not .HasIssuesOrPullsWritePermission) .Repository.IsArchived}}disabled{{end}} floating jump select-milestone dropdown"> - <a class="text df ac muted"> + <a class="text gt-df gt-ac muted"> <strong>{{.locale.Tr "repo.issues.new.milestone"}}</strong> {{if and .HasIssuesOrPullsWritePermission (not .Repository.IsArchived)}} - {{svg "octicon-gear" 16 "ml-2"}} + {{svg "octicon-gear" 16 "gt-ml-2"}} {{end}} </a> <div class="menu" data-action="update" data-issue-id="{{$.Issue.ID}}" data-update-url="{{$.RepoLink}}/issues/milestone"> <div class="header" style="text-transform: none;font-size:16px;">{{.locale.Tr "repo.issues.new.add_milestone_title"}}</div> {{if or .OpenMilestones .ClosedMilestones}} <div class="ui icon search input"> - <i class="icon df ac jc">{{svg "octicon-search" 16}}</i> + <i class="icon gt-df gt-ac gt-jc">{{svg "octicon-search" 16}}</i> <input type="text" placeholder="{{.locale.Tr "repo.issues.filter_milestones"}}"> </div> {{end}} @@ -169,7 +169,7 @@ </div> {{range .OpenMilestones}} <a class="item" data-id="{{.ID}}" data-href="{{$.RepoLink}}/issues?milestone={{.ID}}"> - {{svg "octicon-milestone" 16 "mr-2"}} + {{svg "octicon-milestone" 16 "gt-mr-2"}} {{.Name}} </a> {{end}} @@ -181,7 +181,7 @@ </div> {{range .ClosedMilestones}} <a class="item" data-id="{{.ID}}" data-href="{{$.RepoLink}}/issues?milestone={{.ID}}"> - {{svg "octicon-milestone" 16 "mr-2"}} + {{svg "octicon-milestone" 16 "gt-mr-2"}} {{.Name}} </a> {{end}} @@ -194,7 +194,7 @@ <div class="selected"> {{if .Issue.Milestone}} <a class="item muted sidebar-item-link" href="{{.RepoLink}}/milestone/{{.Issue.Milestone.ID}}"> - {{svg "octicon-milestone" 18 "mr-3"}} + {{svg "octicon-milestone" 18 "gt-mr-3"}} {{.Issue.Milestone.Name}} </a> {{end}} @@ -205,17 +205,17 @@ <div class="ui divider"></div> <div class="ui {{if or (not .HasIssuesOrPullsWritePermission) .Repository.IsArchived}}disabled{{end}} floating jump select-project dropdown"> - <a class="text df ac muted"> + <a class="text gt-df gt-ac muted"> <strong>{{.locale.Tr "repo.issues.new.projects"}}</strong> {{if and .HasIssuesOrPullsWritePermission (not .Repository.IsArchived)}} - {{svg "octicon-gear" 16 "ml-2"}} + {{svg "octicon-gear" 16 "gt-ml-2"}} {{end}} </a> <div class="menu" data-action="update" data-issue-id="{{$.Issue.ID}}" data-update-url="{{$.RepoLink}}/issues/projects"> <div class="header" style="text-transform: none;font-size:16px;">{{.locale.Tr "repo.issues.new.add_project_title"}}</div> {{if or .OpenProjects .ClosedProjects}} <div class="ui icon search input"> - <i class="icon df ac jc">{{svg "octicon-search" 16}}</i> + <i class="icon gt-df gt-ac gt-jc">{{svg "octicon-search" 16}}</i> <input type="text" placeholder="{{.locale.Tr "repo.issues.filter_projects"}}"> </div> {{end}} @@ -227,7 +227,7 @@ </div> {{range .OpenProjects}} <a class="item muted sidebar-item-link" data-id="{{.ID}}" data-href="{{.Link}}"> - {{if .IsOrganizationProject}}{{svg "octicon-project-symlink" 18 "mr-3"}}{{else}}{{svg "octicon-project" 18 "mr-3"}}{{end}} + {{if .IsOrganizationProject}}{{svg "octicon-project-symlink" 18 "gt-mr-3"}}{{else}}{{svg "octicon-project" 18 "gt-mr-3"}}{{end}} {{.Title}} </a> {{end}} @@ -239,7 +239,7 @@ </div> {{range .ClosedProjects}} <a class="item muted sidebar-item-link" data-id="{{.ID}}" data-href="{{.Link}}"> - {{if .IsOrganizationProject}}{{svg "octicon-project-symlink" 18 "mr-3"}}{{else}}{{svg "octicon-project" 18 "mr-3"}}{{end}} + {{if .IsOrganizationProject}}{{svg "octicon-project-symlink" 18 "gt-mr-3"}}{{else}}{{svg "octicon-project" 18 "gt-mr-3"}}{{end}} {{.Title}} </a> {{end}} @@ -251,7 +251,7 @@ <div class="selected"> {{if .Issue.ProjectID}} <a class="item muted sidebar-item-link" href="{{.Issue.Project.Link}}"> - {{if .IsOrganizationProject}}{{svg "octicon-project-symlink" 18 "mr-3"}}{{else}}{{svg "octicon-project" 18 "mr-3"}}{{end}} + {{if .IsOrganizationProject}}{{svg "octicon-project-symlink" 18 "gt-mr-3"}}{{else}}{{svg "octicon-project" 18 "gt-mr-3"}}{{end}} {{.Issue.Project.Title}} </a> {{end}} @@ -263,16 +263,16 @@ <input id="assignee_id" name="assignee_id" type="hidden" value="{{.assignee_id}}"> <div class="ui {{if or (not .HasIssuesOrPullsWritePermission) .Repository.IsArchived}}disabled{{end}} floating jump select-assignees-modify dropdown"> - <a class="text df ac muted"> + <a class="text gt-df gt-ac muted"> <strong>{{.locale.Tr "repo.issues.new.assignees"}}</strong> {{if and .HasIssuesOrPullsWritePermission (not .Repository.IsArchived)}} - {{svg "octicon-gear" 16 "ml-2"}} + {{svg "octicon-gear" 16 "gt-ml-2"}} {{end}} </a> <div class="filter menu" data-action="update" data-issue-id="{{$.Issue.ID}}" data-update-url="{{$.RepoLink}}/issues/assignee"> <div class="header" style="text-transform: none;font-size:16px;">{{.locale.Tr "repo.issues.new.add_assignees_title"}}</div> <div class="ui icon search input"> - <i class="icon df ac jc">{{svg "octicon-search" 16}}</i> + <i class="icon gt-df gt-ac gt-jc">{{svg "octicon-search" 16}}</i> <input type="text" placeholder="{{.locale.Tr "repo.issues.filter_assignees"}}"> </div> <div class="no-select item">{{.locale.Tr "repo.issues.new.clear_assignees"}}</div> @@ -288,7 +288,7 @@ {{end}} <span class="octicon-check {{if not $checked}}invisible{{end}}">{{svg "octicon-check"}}</span> <span class="text"> - {{avatar . 28 "mr-3"}} + {{avatar . 28 "gt-mr-3"}} {{.GetDisplayName}} </span> </a> @@ -301,7 +301,7 @@ {{range .Issue.Assignees}} <div class="item"> <a class="muted sidebar-item-link" href="{{$.RepoLink}}/{{if $.Issue.IsPull}}pulls{{else}}issues{{end}}?assignee={{.ID}}"> - {{avatar . 28 "mr-3"}} + {{avatar . 28 "gt-mr-3"}} {{.GetDisplayName}} </a> </div> @@ -313,10 +313,10 @@ {{if .Participants}} <span class="text"><strong>{{.locale.Tr "repo.issues.num_participants" .NumParticipants}}</strong></span> - <div class="ui list df fw"> + <div class="ui list gt-df gt-fw"> {{range .Participants}} <a class="ui tooltip" {{if gt .ID 0}}href="{{.HomeLink}}"{{end}} data-content="{{.GetDisplayName}}" data-position="top center"> - {{avatar . 28 "my-1 mr-2"}} + {{avatar . 28 "gt-my-1 gt-mr-2"}} </a> {{end}} </div> @@ -327,16 +327,16 @@ <div class="ui watching"> <span class="text"><strong>{{.locale.Tr "notification.notifications"}}</strong></span> - <div class="mt-3"> + <div class="gt-mt-3"> <form method="POST" action="{{.Issue.Link}}/watch"> <input type="hidden" name="watch" value="{{if $.IssueWatch.IsWatching}}0{{else}}1{{end}}" /> {{$.CsrfTokenHtml}} - <button class="fluid ui button df jc"> + <button class="fluid ui button gt-df gt-jc"> {{if $.IssueWatch.IsWatching}} - {{svg "octicon-mute" 16 "mr-3"}} + {{svg "octicon-mute" 16 "gt-mr-3"}} {{.locale.Tr "repo.issues.unsubscribe"}} {{else}} - {{svg "octicon-unmute" 16 "mr-3"}} + {{svg "octicon-unmute" 16 "gt-mr-3"}} {{.locale.Tr "repo.issues.subscribe"}} {{end}} </button> @@ -349,7 +349,7 @@ <div class="ui divider"></div> <div class="ui timetrack"> <span class="text"><strong>{{.locale.Tr "repo.issues.tracker"}}</strong></span> - <div class="mt-3"> + <div class="gt-mt-3"> <form method="POST" action="{{.Issue.Link}}/times/stopwatch/toggle" id="toggle_stopwatch_form"> {{$.CsrfTokenHtml}} </form> @@ -358,7 +358,7 @@ </form> {{if $.IsStopwatchRunning}} <button class="ui fluid button issue-stop-time">{{.locale.Tr "repo.issues.stop_tracking"}}</button> - <button class="ui fluid negative button issue-cancel-time mt-3">{{.locale.Tr "repo.issues.cancel_tracking"}}</button> + <button class="ui fluid negative button issue-cancel-time gt-mt-3">{{.locale.Tr "repo.issues.cancel_tracking"}}</button> {{else}} {{if .HasUserStopwatch}} <div class="ui warning message"> @@ -380,7 +380,7 @@ <div class="ui red cancel button">{{.locale.Tr "repo.issues.add_time_cancel"}}</div> </div> </div> - <button class="ui fluid button green tooltip issue-add-time mt-3" data-content='{{.locale.Tr "repo.issues.add_time"}}' data-position="top center">{{.locale.Tr "repo.issues.add_time_short"}}</button> + <button class="ui fluid button green tooltip issue-add-time gt-mt-3" data-content='{{.locale.Tr "repo.issues.add_time"}}' data-position="top center">{{.locale.Tr "repo.issues.add_time_short"}}</button> {{end}} </div> </div> @@ -391,7 +391,7 @@ <span class="text"><strong>{{.locale.Tr "repo.issues.time_spent_from_all_authors" ($.Issue.TotalTrackedTime | Sec2Time) | Safe}}</strong></span> <div> {{range $user, $trackedtime := .WorkingUsers}} - <div class="comment mt-3"> + <div class="comment gt-mt-3"> <a class="avatar"> {{avatar $user}} </a> @@ -417,14 +417,14 @@ </div> {{if ne .Issue.DeadlineUnix 0}} <p> - <div class="df sb ac"> + <div class="gt-df gt-sb gt-ac"> <div class="due-date tooltip {{if .Issue.IsOverdue}}text red{{end}}" {{if .Issue.IsOverdue}}data-content="{{.locale.Tr "repo.issues.due_date_overdue"}}"{{end}}> - {{svg "octicon-calendar" 16 "mr-3"}} + {{svg "octicon-calendar" 16 "gt-mr-3"}} <time data-format="date" datetime="{{.Issue.DeadlineUnix.FormatDate}}">{{.Issue.DeadlineUnix.FormatDate}}</time> </div> <div> {{if and .HasIssuesOrPullsWritePermission (not .Repository.IsArchived)}} - <a class="issue-due-edit tooltip muted" data-content="{{$.locale.Tr "repo.issues.due_date_form_edit"}}">{{svg "octicon-pencil" 16 "mr-2"}}</a> + <a class="issue-due-edit tooltip muted" data-content="{{$.locale.Tr "repo.issues.due_date_form_edit"}}">{{svg "octicon-pencil" 16 "gt-mr-2"}}</a> <a class="issue-due-remove tooltip muted" data-content="{{$.locale.Tr "repo.issues.due_date_form_remove"}}">{{svg "octicon-trash"}}</a> {{end}} </div> @@ -473,8 +473,8 @@ </span> <div class="ui relaxed divided list"> {{range .BlockingDependencies}} - <div class="item dependency{{if .Issue.IsClosed}} is-closed{{end}} df ac sb"> - <div class="item-left df jc fc f1"> + <div class="item dependency{{if .Issue.IsClosed}} is-closed{{end}} gt-df gt-ac gt-sb"> + <div class="item-left gt-df gt-jc gt-fc gt-f1"> <a class="title tooltip" href="{{.Issue.Link}}" data-content="#{{.Issue.Index}} {{.Issue.Title | RenderEmoji}}"> #{{.Issue.Index}} {{.Issue.Title | RenderEmoji}} </a> @@ -482,7 +482,7 @@ {{.Repository.OwnerName}}/{{.Repository.Name}} </div> </div> - <div class="item-right df ac"> + <div class="item-right gt-df gt-ac"> {{if and $.CanCreateIssueDependencies (not $.Repository.IsArchived)}} <a class="delete-dependency-button tooltip ci muted" data-id="{{.Issue.ID}}" data-type="blocking" data-content="{{$.locale.Tr "repo.issues.dependency.remove_info"}}" data-inverted=""> {{svg "octicon-trash" 16}} @@ -500,8 +500,8 @@ </span> <div class="ui relaxed divided list"> {{range .BlockedByDependencies}} - <div class="item dependency{{if .Issue.IsClosed}} is-closed{{end}} df ac sb"> - <div class="item-left df jc fc f1"> + <div class="item dependency{{if .Issue.IsClosed}} is-closed{{end}} gt-df gt-ac gt-sb"> + <div class="item-left gt-df gt-jc gt-fc gt-f1"> <a class="title tooltip" href="{{.Issue.Link}}" data-content="#{{.Issue.Index}} {{.Issue.Title | RenderEmoji}}"> #{{.Issue.Index}} {{.Issue.Title | RenderEmoji}} </a> @@ -509,7 +509,7 @@ {{.Repository.OwnerName}}/{{.Repository.Name}} </div> </div> - <div class="item-right df ac"> + <div class="item-right gt-df gt-ac"> {{if and $.CanCreateIssueDependencies (not $.Repository.IsArchived)}} <a class="delete-dependency-button tooltip ci muted" data-id="{{.Issue.ID}}" data-type="blockedBy" data-content="{{$.locale.Tr "repo.issues.dependency.remove_info"}}" data-inverted=""> {{svg "octicon-trash" 16}} @@ -577,10 +577,10 @@ <div class="ui divider"></div> <div class="ui equal width compact grid"> - <div class="row ac"> + <div class="row gt-ac"> {{$issueReferenceLink := printf "%s#%d" .Issue.Repo.FullName .Issue.Index}} <span class="text column truncate">{{.locale.Tr "repo.issues.reference_link" $issueReferenceLink}}</span> - <button class="ui two wide button column p-3" data-clipboard-text="{{$issueReferenceLink}}">{{svg "octicon-copy" 14}}</button> + <button class="ui two wide button column gt-p-3" data-clipboard-text="{{$issueReferenceLink}}">{{svg "octicon-copy" 14}}</button> </div> </div> @@ -661,7 +661,7 @@ </form> </div> </div> - <button class="fluid ui show-modal button negative mt-3" data-modal="#delete"> + <button class="fluid ui show-modal button negative gt-mt-3" data-modal="#delete"> {{svg "octicon-trash"}} {{.locale.Tr "repo.issues.delete"}} </button> diff --git a/templates/repo/issue/view_content/update_branch_by_merge.tmpl b/templates/repo/issue/view_content/update_branch_by_merge.tmpl index 3bc8dcca97..6d36a9b45f 100644 --- a/templates/repo/issue/view_content/update_branch_by_merge.tmpl +++ b/templates/repo/issue/view_content/update_branch_by_merge.tmpl @@ -8,7 +8,7 @@ </div> <div class="item-section-right"> {{if and .UpdateAllowed .UpdateByRebaseAllowed}} - <div class="dib"> + <div class="gt-dib"> <div class="ui buttons update-button"> <button class="ui button" data-do="{{.Link}}/update" data-redirect="{{.Link}}"> <span class="button-text"> diff --git a/templates/repo/issue/view_title.tmpl b/templates/repo/issue/view_title.tmpl index 67ab71d694..7ba6198b62 100644 --- a/templates/repo/issue/view_title.tmpl +++ b/templates/repo/issue/view_title.tmpl @@ -8,7 +8,7 @@ <h1> <span id="issue-title">{{RenderIssueTitle $.Context .Issue.Title $.RepoLink $.Repository.ComposeMetas | RenderCodeBlock}}</span> <span class="index">#{{.Issue.Index}}</span> - <div id="edit-title-input" class="ui input ml-4" style="display: none"> + <div id="edit-title-input" class="ui input gt-ml-4" style="display: none"> <input value="{{.Issue.Title}}" maxlength="255" autocomplete="off"> </div> </h1> @@ -75,7 +75,7 @@ </div> <div class="menu"> <div class="ui icon search input"> - <i class="icon df ac jc m-0">{{svg "octicon-filter" 16}}</i> + <i class="icon gt-df gt-ac gt-jc gt-m-0">{{svg "octicon-filter" 16}}</i> <input name="search" placeholder="{{.locale.Tr "repo.pulls.filter_branch"}}..."> </div> <div class="scrolling menu" id="branch-select"> |