diff --git a/public/css/index.css b/public/css/index.css index 0630cb6ed567..764cd325fc4c 100644 --- a/public/css/index.css +++ b/public/css/index.css @@ -982,7 +982,8 @@ tbody.commit-list{vertical-align:baseline} .ui.repository.list .item .time{font-size:12px;color:grey} .ui.repository.list .item .ui.tags{margin-bottom:1em} .ui.repository.list .item .ui.avatar.image{width:24px;height:24px} -.ui.repository.branches .time{font-size:12px;color:grey} +.ui.repository.branches .info{font-size:12px;color:grey} +.ui.repository.branches .info i{vertical-align:middle} .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 c5065a35bc24..bc47c7737764 100644 --- a/public/less/_explore.less +++ b/public/less/_explore.less @@ -62,9 +62,12 @@ } .ui.repository.branches { - .time { + .info { font-size: 12px; color: #808080; + i { + vertical-align: middle; + } } } diff --git a/templates/repo/branch/list.tmpl b/templates/repo/branch/list.tmpl index 04c9e1dad5b6..cd73cc2f4a82 100644 --- a/templates/repo/branch/list.tmpl +++ b/templates/repo/branch/list.tmpl @@ -14,11 +14,14 @@ {{range $branch := .Branches}} - {{if and .IsProtected (eq .Name $.DefaultBranch)}} - + {{if eq .Name $.DefaultBranch}} + {{if .IsProtected}} + + {{end}} + {{$.DefaultBranch}} +

{{ShortSha .Commit.ID.String}} · {{Safe (EllipsisString (Printf "%s" (RenderCommitMessage .Commit.CommitMessage $.RepoLink $.Repository.ComposeMetas)) 72)}} · {{$.i18n.Tr "org.repo_updated"}} {{TimeSince .Commit.Committer.When $.i18n.Lang}}

{{end}} {{end}} - {{.DefaultBranch}} @@ -48,13 +51,13 @@ {{if .IsDeleted}} {{.Name}} -

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

+

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

{{else}} {{if .IsProtected}} {{end}} {{.Name}} -

{{$.i18n.Tr "org.repo_updated"}} {{TimeSince .Commit.Committer.When $.i18n.Lang}}

+

{{ShortSha .Commit.ID.String}} · {{Safe (EllipsisString (Printf "%s" (RenderCommitMessage .Commit.CommitMessage $.RepoLink $.Repository.ComposeMetas)) 72)}} · {{$.i18n.Tr "org.repo_updated"}} {{TimeSince .Commit.Committer.When $.i18n.Lang}}

{{end}}