diff options
author | silverwind <me@silverwind.io> | 2020-11-29 16:52:11 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-11-29 17:52:11 +0200 |
commit | 295fc99607915d85141fd16099d2d9f59a7ee977 (patch) | |
tree | 89eec5bc2e3fbdd28be4fa63065d2022894dc7f1 /templates/repo/issue | |
parent | e00a3554279d314a4dab4ce11bdd86707201d0d2 (diff) | |
download | gitea-295fc99607915d85141fd16099d2d9f59a7ee977.tar.gz gitea-295fc99607915d85141fd16099d2d9f59a7ee977.zip |
Markdown and Repo header tweaks (#13744)
* Markdown and Repo header tweaks
- Use CSS vars for all markdown colors
- Tweak repo header, removing double borders and adjust sizes
- Use menu instead of buttons for issue open/close switcher
- Add emoji inversion for select emoji glyphs in arc-green
- Use border over box-shadow for all buttons
- Add spacing element to login form without openid
* repo settings navbar fix
* use shared template in more places and adjust dashboard
* fix remaining open/close combos
Diffstat (limited to 'templates/repo/issue')
-rw-r--r-- | templates/repo/issue/list.tmpl | 22 | ||||
-rw-r--r-- | templates/repo/issue/milestone_issues.tmpl | 22 | ||||
-rw-r--r-- | templates/repo/issue/milestones.tmpl | 10 | ||||
-rw-r--r-- | templates/repo/issue/openclose.tmpl | 10 |
4 files changed, 19 insertions, 45 deletions
diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl index 49adcd08bf..95aea0c13b 100644 --- a/templates/repo/issue/list.tmpl +++ b/templates/repo/issue/list.tmpl @@ -28,16 +28,7 @@ <div class="ui divider"></div> <div id="issue-filters" class="ui stackable grid"> <div class="six wide column"> - <div class="ui tiny basic status buttons"> - <a class="ui {{if not .IsShowClosed}}green active{{end}} basic button" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&sort={{$.SortType}}&state=open&labels={{.SelectLabels}}&milestone={{.MilestoneID}}&assignee={{.AssigneeID}}"> - {{svg "octicon-issue-opened"}} - {{.i18n.Tr "repo.issues.open_tab" .IssueStats.OpenCount}} - </a> - <a class="ui {{if .IsShowClosed}}red active{{end}} basic button" href="{{$.Link}}?q={{$.Keyword}}&type={{.ViewType}}&sort={{$.SortType}}&state=closed&labels={{.SelectLabels}}&milestone={{.MilestoneID}}&assignee={{.AssigneeID}}"> - {{svg "octicon-issue-closed"}} - {{.i18n.Tr "repo.issues.close_tab" .IssueStats.ClosedCount}} - </a> - </div> + {{template "repo/issue/openclose" .}} </div> <div class="ten wide right aligned column"> <div class="ui secondary filter stackable menu labels"> @@ -122,16 +113,7 @@ </div> <div id="issue-actions" class="ui stackable grid hide"> <div class="six wide column"> - <div class="ui tiny basic status buttons"> - <a class="ui {{if not .IsShowClosed}}green active{{end}} basic button" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&sort={{$.SortType}}&state=open&labels={{.SelectLabels}}&milestone={{.MilestoneID}}&assignee={{.AssigneeID}}"> - {{svg "octicon-issue-opened"}} - {{.i18n.Tr "repo.issues.open_tab" .IssueStats.OpenCount}} - </a> - <a class="ui {{if .IsShowClosed}}red active{{end}} basic button" href="{{$.Link}}?q={{$.Keyword}}&type={{.ViewType}}&sort={{$.SortType}}&state=closed&labels={{.SelectLabels}}&milestone={{.MilestoneID}}&assignee={{.AssigneeID}}"> - {{svg "octicon-issue-closed"}} - {{.i18n.Tr "repo.issues.close_tab" .IssueStats.ClosedCount}} - </a> - </div> + {{template "repo/issue/openclose" .}} </div> {{/* Ten wide does not cope well and makes the columns stack. This seems to be related to jQuery's hide/show: in fact, switching diff --git a/templates/repo/issue/milestone_issues.tmpl b/templates/repo/issue/milestone_issues.tmpl index 5794ac422f..a78b20893f 100644 --- a/templates/repo/issue/milestone_issues.tmpl +++ b/templates/repo/issue/milestone_issues.tmpl @@ -40,16 +40,7 @@ <div class="ui divider"></div> <div id="issue-filters" class="ui stackable grid"> <div class="six wide column"> - <div class="ui tiny basic status buttons"> - <a class="ui {{if not .IsShowClosed}}green active{{end}} basic button" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&sort={{$.SortType}}&state=open&labels={{.SelectLabels}}&assignee={{.AssigneeID}}"> - {{svg "octicon-issue-opened"}} - {{.i18n.Tr "repo.issues.open_tab" .IssueStats.OpenCount}} - </a> - <a class="ui {{if .IsShowClosed}}red active{{end}} basic button" href="{{$.Link}}?q={{$.Keyword}}&type={{.ViewType}}&sort={{$.SortType}}&state=closed&labels={{.SelectLabels}}&assignee={{.AssigneeID}}"> - {{svg "octicon-issue-closed"}} - {{.i18n.Tr "repo.issues.close_tab" .IssueStats.ClosedCount}} - </a> - </div> + {{template "repo/issue/openclose" .}} </div> <div class="ten wide right aligned column"> <div class="ui secondary filter stackable menu labels"> @@ -118,16 +109,7 @@ </div> <div id="issue-actions" class="ui stackable grid hide"> <div class="six wide column"> - <div class="ui tiny basic status buttons"> - <a class="ui {{if not .IsShowClosed}}green active{{end}} basic button" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&sort={{$.SortType}}&state=open&labels={{.SelectLabels}}&assignee={{.AssigneeID}}"> - {{svg "octicon-issue-opened"}} - {{.i18n.Tr "repo.issues.open_tab" .IssueStats.OpenCount}} - </a> - <a class="ui {{if .IsShowClosed}}red active{{end}} basic button" href="{{$.Link}}?q={{$.Keyword}}&type={{.ViewType}}&sort={{$.SortType}}&state=closed&labels={{.SelectLabels}}&assignee={{.AssigneeID}}"> - {{svg "octicon-issue-closed"}} - {{.i18n.Tr "repo.issues.close_tab" .IssueStats.ClosedCount}} - </a> - </div> + {{template "repo/issue/openclose" .}} </div> {{/* Ten wide does not cope well and makes the columns stack. diff --git a/templates/repo/issue/milestones.tmpl b/templates/repo/issue/milestones.tmpl index ca49664392..22daf66b37 100644 --- a/templates/repo/issue/milestones.tmpl +++ b/templates/repo/issue/milestones.tmpl @@ -12,13 +12,13 @@ </div> <div class="ui divider"></div> {{template "base/alert" .}} - <div class="ui tiny basic buttons"> - <a class="ui {{if not .IsShowClosed}}green active{{end}} basic button" href="{{.RepoLink}}/milestones?state=open"> - {{svg "octicon-milestone"}} + <div class="ui compact tiny menu"> + <a class="item{{if not .IsShowClosed}} active{{end}}" href="{{.RepoLink}}/milestones?state=open"> + {{svg "octicon-milestone" 16 "mr-3"}} {{.i18n.Tr "repo.milestones.open_tab" .OpenCount}} </a> - <a class="ui {{if .IsShowClosed}}red active{{end}} basic button" href="{{.RepoLink}}/milestones?state=closed"> - {{svg "octicon-milestone"}} + <a class="item{{if .IsShowClosed}} active{{end}}" href="{{.RepoLink}}/milestones?state=closed"> + {{svg "octicon-milestone" 16 "mr-3"}} {{.i18n.Tr "repo.milestones.close_tab" .ClosedCount}} </a> </div> diff --git a/templates/repo/issue/openclose.tmpl b/templates/repo/issue/openclose.tmpl new file mode 100644 index 0000000000..050660522a --- /dev/null +++ b/templates/repo/issue/openclose.tmpl @@ -0,0 +1,10 @@ +<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}}&assignee={{.AssigneeID}}"> + {{svg "octicon-issue-opened" 16 "mr-3"}} + {{.i18n.Tr "repo.issues.open_tab" .IssueStats.OpenCount}} + </a> + <a class="{{if .IsShowClosed}}active{{end}} item" href="{{$.Link}}?q={{$.Keyword}}&type={{.ViewType}}&sort={{$.SortType}}&state=closed&labels={{.SelectLabels}}&milestone={{.MilestoneID}}&assignee={{.AssigneeID}}"> + {{svg "octicon-issue-closed" 16 "mr-3"}} + {{.i18n.Tr "repo.issues.close_tab" .IssueStats.ClosedCount}} + </a> +</div> |