diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 969a0953a289..18c3ffe606e4 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -1407,6 +1407,8 @@ branch.deleted_by = Deleted by %s branch.restore_success = Branch '%s' has been restored. branch.restore_failed = Failed to restore branch '%s'. branch.protected_deletion_failed = Branch '%s' is protected. It cannot be deleted. +branch.download = Download Branch '%s' +branch.restore = Restore Branch '%s' topic.manage_topics = Manage Topics topic.done = Done diff --git a/public/css/index.css b/public/css/index.css index 96dfcb0e8b7e..6a157e2f93f2 100644 --- a/public/css/index.css +++ b/public/css/index.css @@ -985,6 +985,7 @@ tbody.commit-list{vertical-align:baseline} .ui.repository.list .item .ui.avatar.image{width:24px;height:24px} .ui.repository.branches .info{font-size:12px;color:grey;display:flex;white-space:pre} .ui.repository.branches .info .commit-message{max-width:72em;overflow:hidden;text-overflow:ellipsis} +.ui.repository.branches .download-column{overflow:visible;text-align:right} .ui.user.list .item{padding-bottom:25px} .ui.user.list .item:not(:first-child){border-top:1px solid #eee;padding-top:25px} .ui.user.list .item .ui.avatar.image{width:40px;height:40px} diff --git a/public/less/_explore.less b/public/less/_explore.less index 11dacb7285b9..8534146314d0 100644 --- a/public/less/_explore.less +++ b/public/less/_explore.less @@ -73,6 +73,10 @@ text-overflow: ellipsis; } } + .download-column { + overflow: visible; + text-align: right; + } } .ui.user.list { diff --git a/templates/repo/branch/list.tmpl b/templates/repo/branch/list.tmpl index 7963f8877ff7..225e89ec7cf9 100644 --- a/templates/repo/branch/list.tmpl +++ b/templates/repo/branch/list.tmpl @@ -23,6 +23,15 @@ {{end}} {{end}} + + + @@ -34,21 +43,11 @@
- - - - - - {{if and $.IsWriter (not $.IsMirror)}} - - {{end}} - - {{range $branch := .Branches}} {{if ne .Name $.DefaultBranch}} - - - + {{if and $.IsWriter (not $.IsMirror)}} - {{end}}
{{.i18n.Tr "repo.branch.name"}}{{.i18n.Tr "repo.branch.delete_head"}}
+ {{if .IsDeleted}} {{.Name}}

{{$.i18n.Tr "repo.branch.deleted_by" .DeletedBranch.DeletedBy.Name}} {{TimeSinceUnix .DeletedBranch.DeletedUnix $.i18n.Lang}}

@@ -60,7 +59,7 @@

{{ShortSha .Commit.ID.String}} · {{RenderCommitMessage .Commit.CommitMessage $.RepoLink $.Repository.ComposeMetas}} · {{$.i18n.Tr "org.repo_updated"}} {{TimeSince .Commit.Committer.When $.i18n.Lang}}

{{end}}
+ {{if not .IsDeleted}}
@@ -69,12 +68,12 @@
{{.CommitsAhead}}
-
+
{{end}}
+ {{if not .LatestPullRequest}} {{if and (not .IsDeleted) $.AllowsPulls}} @@ -92,14 +91,25 @@ {{end}} {{end}} + {{if not .IsDeleted}} + + {{end}} + + {{if .IsProtected}} {{else if .IsDeleted}} - + {{else}} - + {{end}}