diff --git a/modules/templates/helper.go b/modules/templates/helper.go index 7e33f262094ee..6c911e72d5514 100644 --- a/modules/templates/helper.go +++ b/modules/templates/helper.go @@ -515,6 +515,7 @@ func NewTextFuncMap() []texttmpl.FuncMap { var widthRe = regexp.MustCompile(`width="[0-9]+?"`) var heightRe = regexp.MustCompile(`height="[0-9]+?"`) +var classRe = regexp.MustCompile(`class="(.*?)"`) func parseOthers(defaultSize int, defaultClass string, others ...interface{}) (int, string) { size := defaultSize @@ -555,7 +556,8 @@ func SVG(icon string, others ...interface{}) template.HTML { svgStr = heightRe.ReplaceAllString(svgStr, fmt.Sprintf(`height="%d"`, size)) } if class != "" { - svgStr = strings.Replace(svgStr, `class="`, fmt.Sprintf(`class="%s `, class), 1) + matches := classRe.FindStringSubmatch(svgStr) + svgStr = strings.Replace(svgStr, matches[0], fmt.Sprintf(`class="%s %s"`, matches[1], class), 1) } return template.HTML(svgStr) } diff --git a/templates/org/home.tmpl b/templates/org/home.tmpl index 25cd68291ce75..9b20da128db50 100644 --- a/templates/org/home.tmpl +++ b/templates/org/home.tmpl @@ -70,8 +70,10 @@
{{.Name}}

- {{.NumMembers}} {{$.i18n.Tr "org.lower_members"}} · - {{.NumRepos}} {{$.i18n.Tr "org.lower_repositories"}} + {{- /* p */ -}} + {{.NumMembers}}{{$.i18n.Tr "org.lower_members"}}{{/* p */ -}} + ·{{/* p */ -}} + {{.NumRepos}}{{$.i18n.Tr "org.lower_repositories"}}{{/* p */ -}}

{{end}} diff --git a/templates/org/team/navbar.tmpl b/templates/org/team/navbar.tmpl index 18d638796c138..fe586984d62dd 100644 --- a/templates/org/team/navbar.tmpl +++ b/templates/org/team/navbar.tmpl @@ -1,4 +1,4 @@
- {{svg "octicon-person"}} {{.Team.NumMembers}}  {{$.i18n.Tr "org.lower_members"}} - {{svg "octicon-repo"}} {{.Team.NumRepos}}  {{$.i18n.Tr "org.lower_repositories"}} + {{svg "octicon-person"}}{{.Team.NumMembers}}{{$.i18n.Tr "org.lower_members"}} + {{svg "octicon-repo"}}{{.Team.NumRepos}}{{$.i18n.Tr "org.lower_repositories"}}
diff --git a/templates/org/team/teams.tmpl b/templates/org/team/teams.tmpl index 4e877bef2a1a4..41f15477da390 100644 --- a/templates/org/team/teams.tmpl +++ b/templates/org/team/teams.tmpl @@ -37,7 +37,12 @@ {{end}}
-

{{.NumMembers}} {{$.i18n.Tr "org.lower_members"}} · {{.NumRepos}} {{$.i18n.Tr "org.lower_repositories"}}

+

+ {{- .NumMembers}}{{/* p */ -}} + {{$.i18n.Tr "org.lower_members"}}{{/* p */ -}} + ·{{.NumRepos}}{{/* p */ -}} + {{$.i18n.Tr "org.lower_repositories"}}{{/* p */ -}} +

{{end}} diff --git a/templates/repo/branch/list.tmpl b/templates/repo/branch/list.tmpl index de4f0fb57e9e4..7f2721f4b8871 100644 --- a/templates/repo/branch/list.tmpl +++ b/templates/repo/branch/list.tmpl @@ -8,27 +8,34 @@ {{.i18n.Tr "repo.default_branch"}} -
- +
+
- - @@ -42,7 +49,7 @@ {{.i18n.Tr "repo.branches"}}
-
+ {{range .Branches}} {{if eq .Name $.DefaultBranch}} + {{$renderedCommitMessage := RenderCommitMessage .Commit.CommitMessage $.RepoLink $.Repository.ComposeMetas}} {{if .IsProtected}} {{svg "octicon-shield-lock"}} {{end}} {{$.DefaultBranch}} -

{{svg "octicon-git-commit" 16 "mr-2"}}{{ShortSha .Commit.ID.String}} · {{RenderCommitMessage .Commit.CommitMessage $.RepoLink $.Repository.ComposeMetas}} · {{$.i18n.Tr "org.repo_updated"}} {{TimeSince .Commit.Committer.When $.i18n.Lang}}

+

+ {{- svg "octicon-git-commit" 16 "mr-2"}}{{/* p */ -}} + {{ShortSha .Commit.ID.String}}{{/* p */ -}} + ·{{$renderedCommitMessage}}{{/* p */ -}} + ·{{$.i18n.Tr "org.repo_updated"}}{{/* p */ -}} + {{TimeSince .Commit.Committer.When $.i18n.Lang}}{{/* p */ -}} +

{{end}} {{end}} 		+
{{svg "octicon-download"}}
- {{svg "octicon-file-zip"}} ZIP - {{svg "octicon-file-zip"}} TAR.GZ + {{svg "octicon-file-zip" 16 "mr-2"}}ZIP + {{svg "octicon-file-zip" 16 "mr-2"}}TAR.GZ
+
{{range .Branches}} {{if ne .Name $.DefaultBranch}} @@ -50,13 +57,23 @@
{{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}}{{/* p */ -}} + {{TimeSinceUnix .DeletedBranch.DeletedUnix $.i18n.Lang}}{{/* p */ -}} +

{{else}} + {{$renderedCommitMessage := RenderCommitMessage .Commit.CommitMessage $.RepoLink $.Repository.ComposeMetas}} {{if .IsProtected}} {{svg "octicon-shield-lock"}} {{end}} {{.Name}} -

{{svg "octicon-git-commit" 16 "mr-2"}}{{ShortSha .Commit.ID.String}} · {{RenderCommitMessage .Commit.CommitMessage $.RepoLink $.Repository.ComposeMetas}} · {{$.i18n.Tr "org.repo_updated"}} {{TimeSince .Commit.Committer.When $.i18n.Lang}}

+

+ {{- svg "octicon-git-commit" 16 "mr-2"}}{{/* p */ -}} + {{ShortSha .Commit.ID.String}}{{/* p */ -}} + ·{{$renderedCommitMessage}}{{/* p */ -}} + ·{{$.i18n.Tr "org.repo_updated"}}{{/* p */ -}} + {{TimeSince .Commit.Committer.When $.i18n.Lang}}{{/* p */ -}} +

{{end}} 		@@ -106,8 +123,8 @@
{{svg "octicon-download"}}
- {{svg "octicon-file-zip"}} ZIP - {{svg "octicon-file-zip"}} TAR.GZ + {{svg "octicon-file-zip" 16 "mr-2"}}ZIP + {{svg "octicon-file-zip" 16 "mr-2"}}TAR.GZ
{{end}} diff --git a/templates/repo/commit_page.tmpl b/templates/repo/commit_page.tmpl index 6260d2e9652ba..8133fef5c389e 100644 --- a/templates/repo/commit_page.tmpl +++ b/templates/repo/commit_page.tmpl @@ -28,63 +28,56 @@ 
{{RenderCommitBody .Commit.Message $.RepoLink $.Repository.ComposeMetas}}
{{end}} {{if .BranchName}} - {{svg "octicon-git-branch"}}{{.BranchName}} + {{svg "octicon-git-branch" 16 "mr-2"}}{{.BranchName}} {{end}} {{if .TagName}} - {{svg "octicon-tag"}}{{.TagName}} + {{svg "octicon-tag" 16 "mr-2"}}{{.TagName}} {{end}} -
-
-
- {{if .Author}} - {{avatar .Author}} - {{if .Author.FullName}} - {{.Author.FullName}} - {{else}} - {{.Commit.Author.Name}} - {{end}} +
+
+ {{if .Author}} + {{avatar .Author}} + {{if .Author.FullName}} + {{.Author.FullName}} {{else}} - {{avatarByEmail .Commit.Author.Email .Commit.Author.Email 12}} - {{.Commit.Author.Name}} + {{.Commit.Author.Name}} {{end}} - {{TimeSince .Commit.Author.When $.Lang}} - {{if or (ne .Commit.Committer.Name .Commit.Author.Name) (ne .Commit.Committer.Email .Commit.Author.Email)}} -
- {{svg "octicon-git-commit"}}{{.i18n.Tr "repo.diff.committed_by"}} - {{if ne .Verification.CommittingUser.ID 0}} - {{avatar .Verification.CommittingUser}} - {{.Commit.Committer.Name}} - {{else}} - {{avatarByEmail .Commit.Committer.Email .Commit.Committer.Name}} - {{.Commit.Committer.Name}} + {{else}} + {{avatarByEmail .Commit.Author.Email .Commit.Author.Email 12}} + {{.Commit.Author.Name}} + {{end}} + {{TimeSince .Commit.Author.When $.Lang}} + {{if or (ne .Commit.Committer.Name .Commit.Author.Name) (ne .Commit.Committer.Email .Commit.Author.Email)}} +
+ {{svg "octicon-git-commit"}}{{.i18n.Tr "repo.diff.committed_by"}} + {{if ne .Verification.CommittingUser.ID 0}} + {{avatar .Verification.CommittingUser}} + {{.Commit.Committer.Name}} + {{else}} + {{avatarByEmail .Commit.Committer.Email .Commit.Committer.Name}} + {{.Commit.Committer.Name}} + {{end}} +
+ {{end}} +
+
+
+ {{- if .Parents -}} +
+ {{.i18n.Tr "repo.diff.parent"}} + {{range .Parents}} + {{$subpath := or (and $.PageIsWiki "/wiki/commit/") "/commit/" }} + {{ShortSha .}} {{end}}
- {{end}} - -
-
-
- {{if .Parents}} -
- {{.i18n.Tr "repo.diff.parent"}} -
-
- {{range .Parents}} - {{if $.PageIsWiki}} - {{ShortSha .}} - {{else}} - {{ShortSha .}} - {{end}} - {{end}} -
- {{end}} -
-
{{.i18n.Tr "repo.diff.commit"}}
-
{{ShortSha .CommitID}}
+ {{- end -}} +
+ {{.i18n.Tr "repo.diff.commit"}} + {{ShortSha .CommitID}}
-
-
+
+
{{if .Commit.Signature}}
diff --git a/templates/repo/commits.tmpl b/templates/repo/commits.tmpl index 5a8a89fe147c8..250edd915b869 100644 --- a/templates/repo/commits.tmpl +++ b/templates/repo/commits.tmpl @@ -3,7 +3,7 @@ {{template "repo/header" .}}
{{template "repo/sub_menu" .}} -
+
{{template "repo/branch_dropdown" .}}
diff --git a/templates/repo/commits_list.tmpl b/templates/repo/commits_list.tmpl index 66138e21389db..ac4479cecc804 100644 --- a/templates/repo/commits_list.tmpl +++ b/templates/repo/commits_list.tmpl @@ -1,11 +1,11 @@ -
- +
+
- + - + @@ -18,9 +18,10 @@ {{if .User.FullName}} {{$userName = .User.FullName}} {{end}} - {{avatar .User 28 "mr-2"}}{{$userName}} + {{avatar .User 28}} + {{$userName}} {{else}} - {{avatarByEmail .Author.Email .Author.Name 28 "mr-2"}} + {{avatarByEmail .Author.Email .Author.Name 28}} {{$userName}} {{end}} @@ -47,7 +48,7 @@ {{else}} {{end}} - {{ShortSha .ID.String}} + {{ShortSha .ID.String}} {{if .Signature}} {{template "repo/shabox_badge" dict "root" $ "verification" .Verification}} {{end}} @@ -65,9 +66,8 @@ {{ $commitLink:= printf "%s/%s/%s/commit/%s" AppSubUrl $.Username $.Reponame .ID }} {{RenderCommitMessageLinkSubject .Message $.RepoLink $commitLink $.Repository.ComposeMetas}} {{end}} - {{if IsMultilineCommitMessage .Message}} - + {{end}} {{if eq (CommitType .) "SignCommitWithStatuses"}} {{template "repo/commit_statuses" dict "Status" .Status "Statuses" .Statuses "root" $}} @@ -75,8 +75,9 @@ {{if IsMultilineCommitMessage .Message}} {{end}} + - + {{end}} diff --git a/templates/repo/commits_list_small.tmpl b/templates/repo/commits_list_small.tmpl index acab040a45040..44b2d323295e1 100644 --- a/templates/repo/commits_list_small.tmpl +++ b/templates/repo/commits_list_small.tmpl @@ -38,7 +38,7 @@ {{else}} {{end}} - {{ShortSha .ID.String}} + {{ShortSha .ID.String}} {{if .Signature}} {{template "repo/shabox_badge" dict "root" $.root "verification" .Verification}} {{end}} @@ -52,9 +52,7 @@ {{ $commitLink:= printf "%s/%s/%s/commit/%s" AppSubUrl $.comment.Issue.PullRequest.BaseRepo.OwnerName $.comment.Issue.PullRequest.BaseRepo.Name .ID }} {{RenderCommitMessageLinkSubject .Message ($.comment.Issue.PullRequest.BaseRepo.Link|Escape) $commitLink $.comment.Issue.PullRequest.BaseRepo.ComposeMetas}} {{if IsMultilineCommitMessage .Message}} - - {{end}} - {{if IsMultilineCommitMessage .Message}} + {{end}} diff --git a/templates/repo/commits_table.tmpl b/templates/repo/commits_table.tmpl index 623df6f63ea6d..7d2ec9016d488 100644 --- a/templates/repo/commits_table.tmpl +++ b/templates/repo/commits_table.tmpl @@ -1,28 +1,51 @@ -

-
+

+
{{if or .PageIsCommits (gt .CommitCount 0)}} - {{.CommitCount}} {{.i18n.Tr "repo.commits.commits"}} {{if .Branch}}({{.Branch}}){{end}} + {{.CommitCount}} {{.i18n.Tr "repo.commits.commits"}} {{if .Branch}}({{.Branch}}){{end}} {{else}} - {{.i18n.Tr "repo.commits.no_commits" $.BaseBranch $.HeadBranch }} {{if .Branch}}({{.Branch}}){{end}} + {{.i18n.Tr "repo.commits.no_commits" $.BaseBranch $.HeadBranch }} {{if .Branch}}({{.Branch}}){{end}} {{end}}
{{if .PageIsCommits}} -
-
+ +
-   -
- - +
+
+ + +
+
- {{else if .IsDiffCompare}} - {{if not .BaseIsCommit}}{{if .BaseIsBranch}}{{svg "octicon-git-branch"}}{{else if .BaseIsTag}}{{svg "octicon-tag"}}{{end}}{{.BaseBranch}}{{else}}{{ShortSha .BaseBranch}}{{end}} + + {{if not .BaseIsCommit}} + {{if .BaseIsBranch}} + {{svg "octicon-git-branch"}} + {{else if .BaseIsTag}} + {{svg "octicon-tag"}} + {{end}} + {{.BaseBranch}} + {{else}} + {{ShortSha .BaseBranch}} + {{end}} + ... - {{if not .HeadIsCommit}}{{if .HeadIsBranch}}{{svg "octicon-git-branch"}}{{else if .HeadIsTag}}{{svg "octicon-tag"}}{{end}}{{.HeadBranch}}{{else}}{{ShortSha .HeadBranch}}{{end}} + + {{if not .HeadIsCommit}} + {{if .HeadIsBranch}} + {{svg "octicon-git-branch"}} + {{else if .HeadIsTag}} + {{svg "octicon-tag"}} + {{end}} + {{.HeadBranch}} + {{else}} + {{ShortSha .HeadBranch}} + {{end}} + {{end}}

diff --git a/templates/repo/graph/commits.tmpl b/templates/repo/graph/commits.tmpl index 8cd6adb04d8e2..4ccec7aa08bf4 100644 --- a/templates/repo/graph/commits.tmpl +++ b/templates/repo/graph/commits.tmpl @@ -22,10 +22,10 @@ {{end}} {{end}} - {{ShortSha $commit.Commit.ID.String}} - {{- if $commit.Commit.Signature -}} - {{template "repo/shabox_badge" dict "root" $ "verification" $commit.Verification}} - {{- end -}} + {{ShortSha $commit.Commit.ID.String}} + {{if $commit.Commit.Signature}} + {{template "repo/shabox_badge" dict "root" $ "verification" $commit.Verification}} + {{end}} {{RenderCommitMessage $commit.Subject $.RepoLink $.Repository.ComposeMetas}} diff --git a/templates/repo/home.tmpl b/templates/repo/home.tmpl index b77f28f9207c6..3d066745eaaae 100644 --- a/templates/repo/home.tmpl +++ b/templates/repo/home.tmpl @@ -3,13 +3,36 @@ {{template "repo/header" .}}
{{template "base/alert" .}} -
-
- {{if .Repository.DescriptionHTML}}{{.Repository.DescriptionHTML}}{{else if .IsRepositoryAdmin}}{{.i18n.Tr "repo.no_desc"}}{{end}} - {{.Repository.Website}} +
+
+
+ {{if .Repository.DescriptionHTML}}{{.Repository.DescriptionHTML}}{{else if .IsRepositoryAdmin}}{{.i18n.Tr "repo.no_desc"}}{{end}} + {{.Repository.Website}} +
+
+ {{range .Topics}}{{.Name}}{{end}} + {{if and .Permission.IsAdmin (not .Repository.IsArchived)}}{{.i18n.Tr "repo.topic.manage_topics"}}{{end}} +
+ {{if and .Permission.IsAdmin (not .Repository.IsArchived)}} + + {{end}} +
{{if .RepoSearchEnabled}} -
+

{{.i18n.Tr "repo.commits.author"}}SHA1SHA1 {{.i18n.Tr "repo.commits.message"}}{{.i18n.Tr "repo.commits.date"}}{{.i18n.Tr "repo.commits.date"}}
{{TimeSince .Author.When $.Lang}}{{TimeSince .Author.When $.Lang}}
@@ -18,7 +18,7 @@ diff --git a/templates/repo/settings/lfs_file_find.tmpl b/templates/repo/settings/lfs_file_find.tmpl index 83a2e317d57fc..37f0e7cdf32da 100644 --- a/templates/repo/settings/lfs_file_find.tmpl +++ b/templates/repo/settings/lfs_file_find.tmpl @@ -30,12 +30,12 @@ {{if .ParentHashes}} {{$.i18n.Tr "repo.diff.parent"}} {{range .ParentHashes}} - {{ShortSha .String}} + {{ShortSha .String}} {{end}} {{end}}
{{$.i18n.Tr "repo.diff.commit"}} - {{ShortSha .SHA}} + {{ShortSha .SHA}} diff --git a/templates/repo/settings/lfs_pointers.tmpl b/templates/repo/settings/lfs_pointers.tmpl index bf23062ae3cc7..3000dc1429d65 100644 --- a/templates/repo/settings/lfs_pointers.tmpl +++ b/templates/repo/settings/lfs_pointers.tmpl @@ -38,7 +38,7 @@ @@ -46,11 +46,11 @@ {{if and .Exists .InRepo}} - {{ShortSha .Oid}} + {{ShortSha .Oid}} {{else}} - {{ShortSha .Oid}} + {{ShortSha .Oid}} {{end}} diff --git a/templates/repo/settings/webhook/history.tmpl b/templates/repo/settings/webhook/history.tmpl index cf4884531db7a..f2e962acb3016 100644 --- a/templates/repo/settings/webhook/history.tmpl +++ b/templates/repo/settings/webhook/history.tmpl @@ -18,7 +18,7 @@ {{else}} {{svg "octicon-alert"}} {{end}} - {{.UUID}} + {{.UUID}}
{{.DeliveredString}} diff --git a/templates/repo/shabox_badge.tmpl b/templates/repo/shabox_badge.tmpl index a10334bdd016f..c5e0db0a8db45 100644 --- a/templates/repo/shabox_badge.tmpl +++ b/templates/repo/shabox_badge.tmpl @@ -1,15 +1,13 @@ -
- {{if .verification.Verified}} -
- {{if ne .verification.SigningUser.ID 0}} - {{svg "gitea-lock"}} - {{avatar .verification.SigningUser 28 "signature"}} - {{else}} - {{svg "gitea-lock-cog"}} - {{avatarByEmail .verification.SigningEmail "" 28 "signature"}} - {{end}} -
+{{if .verification.Verified}} +
+ {{if ne .verification.SigningUser.ID 0}} + {{svg "gitea-lock" 14}} + {{avatar .verification.SigningUser 14 "signature"}} {{else}} - {{svg "gitea-unlock"}} + {{svg "gitea-lock-cog" 14}} + {{avatarByEmail .verification.SigningEmail "" 14 "signature"}} {{end}} -
+
+{{else}} + {{svg "gitea-unlock" 14}} +{{end}} diff --git a/templates/repo/sub_menu.tmpl b/templates/repo/sub_menu.tmpl index f00237047e875..ce93ce7b8c097 100644 --- a/templates/repo/sub_menu.tmpl +++ b/templates/repo/sub_menu.tmpl @@ -1,4 +1,4 @@ -
+
{{if and (.Permission.CanRead $.UnitTypeCode) (not .IsEmptyRepo)}} diff --git a/templates/repo/view_file.tmpl b/templates/repo/view_file.tmpl index 76c0ac76fe713..f73e2718e951e 100644 --- a/templates/repo/view_file.tmpl +++ b/templates/repo/view_file.tmpl @@ -63,7 +63,7 @@
{{end}} -
+
{{if .IsMarkup}} {{if .FileContent}}{{.FileContent | Safe}}{{end}} diff --git a/templates/repo/view_list.tmpl b/templates/repo/view_list.tmpl index fc66fb6b2d5b7..9c9febacdb864 100644 --- a/templates/repo/view_list.tmpl +++ b/templates/repo/view_list.tmpl @@ -1,36 +1,49 @@ -
- {{ShortSha .Oid}} + {{ShortSha .Oid}} {{TimeSince .When $.Lang}}
- {{ShortSha .SHA}} + {{ShortSha .SHA}}
- - +
+ + + + + + + - @@ -44,7 +57,7 @@ {{$commit := $item.Commit}} {{$subModuleFile := $item.SubModuleFile}} - - - + {{end}} diff --git a/web_src/js/index.js b/web_src/js/index.js index 28f2087e38043..d5be2c24cc0bb 100644 --- a/web_src/js/index.js +++ b/web_src/js/index.js @@ -32,6 +32,11 @@ const {AppSubUrl, StaticUrlPrefix, csrf} = window.config; let previewFileModes; const commentMDEditors = {}; +// Override close icon for labels in fomantic dropdown +$.fn.dropdown.settings.templates.label = function(_, text, preserveHTML) { + return $.fn.dropdown.settings.templates.escape(text, preserveHTML) + svg('octicon-x', 16, 'delete icon'); +}; + // Silence fomantic's error logging when tabs are used without a target content element $.fn.tab.settings.silent = true; @@ -3660,7 +3665,7 @@ function initTopicbar() { basic: true, }, className: { - label: 'ui small label' + label: 'ui small label topic' }, apiSettings: { url: `${AppSubUrl}/api/v1/topics/search?q={query}`, @@ -3727,7 +3732,12 @@ function initTopicbar() { if (!status) { topics.last().removeClass('green').addClass('red'); } - return status && topicDropdown.children('a.ui.label.red').length === 0; + if (topicDropdown.children('a.ui.label.red').length > 0) { + saveBtn.removeClass('primary').addClass(['grey', 'disabled']); + } else { + saveBtn.addClass('primary').removeClass(['grey', 'disabled']); + } + return status && !saveBtn.hasClass('disabled'); }; topicForm.form({ diff --git a/web_src/js/svg.js b/web_src/js/svg.js index b7d8c7535074e..07c0d721cf33a 100644 --- a/web_src/js/svg.js +++ b/web_src/js/svg.js @@ -12,6 +12,7 @@ import octiconProject from '../../public/img/svg/octicon-project.svg'; import octiconRepo from '../../public/img/svg/octicon-repo.svg'; import octiconRepoForked from '../../public/img/svg/octicon-repo-forked.svg'; import octiconRepoTemplate from '../../public/img/svg/octicon-repo-template.svg'; +import octiconX from '../../public/img/svg/octicon-x.svg'; export const svgs = { 'octicon-chevron-down': octiconChevronDown, @@ -28,6 +29,7 @@ export const svgs = { 'octicon-repo': octiconRepo, 'octicon-repo-forked': octiconRepoForked, 'octicon-repo-template': octiconRepoTemplate, + 'octicon-x': octiconX, }; const parser = new DOMParser(); diff --git a/web_src/less/_base.less b/web_src/less/_base.less index bbd80c45f7ac9..1a748069b715b 100644 --- a/web_src/less/_base.less +++ b/web_src/less/_base.less @@ -73,6 +73,22 @@ --color-black: #1b1c1d; --color-gold: #a1882b; --color-white: #ffffff; + --color-green-ok-bg: #fcfff5; + --color-green-ok-border: #a3c293; + --color-green-ok-header: #1a531b; + --color-green-ok-text: #2c662d; + --color-red-err-bg: #fff6f6; + --color-red-err-border: #e0b4b4; + --color-red-err-header: #912d2b; + --color-red-err-text: #9f3a38; + --color-red-sha-bg: rgba(219, 40, 40, .1); + --color-red-sha-hover: rgba(219, 40, 40, .3); + --color-orange-sha-bg: rgba(242, 113, 28, .1); + --color-orange-sha-hover: rgba(242, 113, 28, .3); + --color-yellow-sha-bg: rgba(251, 189, 8, .1); + --color-yellow-sha-hover: rgba(251, 189, 8, .3); + --color-green-sha-bg: rgba(33, 186, 69, .1); + --color-green-sha-hover: rgba(33, 186, 69, .3); --color-diff-removed-word-bg: #fdb8c0; --color-diff-added-word-bg: #acf2bd; --color-diff-removed-row-bg: #ffeef0; @@ -108,6 +124,16 @@ --color-code-bg: #ffffff; --color-secondary-bg: #f4f4f4; --color-expand-button: #d8efff; + --color-dropdown-error-hover: #fbe7e7; + --color-dropdown-error-active: #fdcfcf; + --color-dropdown-error-active-hover: #f5c2c2; + --color-dropdown-error-bg: #eacbcb; + --color-dropdown-error-text: var(--color-red-err-text); + --color-dropdown-error-red-bg: #871717; + --color-dropdown-error-red-text: var(--color-dropdown-error-bg); + --color-dropdown-error-red-hover: #d80e0e; + --color-dropdown-error-red-active: #bb0202; + --color-dropdown-error-red-active-hover: #990a0a; --color-placeholder-text: #aaa; /* backgrounds */ --checkbox-mask-checked: url('data:image/svg+xml;utf8,'); @@ -169,6 +195,7 @@ table { ::-webkit-scrollbar { width: 10px; + height: 10px; } ::-webkit-scrollbar-thumb { box-shadow: inset 0 0 0 6px var(--color-primary); @@ -322,6 +349,11 @@ a.muted:hover, margin-bottom: -.25rem; } +.ui.multiple.selection.dropdown .ui.label svg.delete.icon { + margin: -3px -.25rem -3px .25rem; + vertical-align: baseline; +} + .ui.selection.dropdown .menu > .item { border-color: var(--color-secondary); } @@ -644,10 +676,12 @@ a.ui.card:hover, .ui { &.left:not(.action) { float: left; + margin-left: 0; } &.right:not(.action) { float: right; + margin-right: 0; } &.button, @@ -904,12 +938,40 @@ a.ui.card:hover, } } - .sha.label { - font-family: var(--fonts-monospace); - font-size: 13px; - padding: 6px 10px 4px; + .ui.sha.label { + padding: 4px 7px; + height: 24px; // 14px + 4px * 2 + 1px * 2 + border: 1px solid transparent !important; + font-size: 14px; font-weight: normal; margin: 0 6px; + display: inline-flex; + align-items: baseline; + + &::before { + content: "\200b"; + } + + .mono + * { + margin: -4px -2.5px -4px 7px; + height: inherit; + display: flex; + align-items: center; + align-self: center; + border-left: 1px solid; + + > * { + line-height: 0; + margin: 0 0 0 4.5px; // 7px - 2.5px + } + } + + .ui.avatar.image { + min-width: 14px; + width: 14px !important; + height: 14px !important; + border-radius: calc(var(--border-radius) / 24 * 14); + } } .button.truncate { @@ -1371,6 +1433,52 @@ i.icon.centerlock { color: var(--color-text-light); } +.ui.active.label { + background: var(--color-secondary); + border-color: var(--color-secondary); + color: var(--color-text-dark); +} + +.ui.active.label:hover, +a.ui.active.label:hover { + background: var(--color-secondary-dark-1); + color: var(--color-text-dark); +} + +.ui.form .field.error .ui.multiple.selection.dropdown > .label { + color: var(--color-dropdown-error-text); + background: var(--color-dropdown-error-bg); + + &:hover { + background: var(--color-dropdown-error-hover); + } + + &.active { + background: var(--color-dropdown-error-active); + + &:hover { + background: var(--color-dropdown-error-active-hover); + } + } + + &.red { + color: var(--color-dropdown-error-red-text); + background: var(--color-dropdown-error-red-bg); + + &:hover { + background: var(--color-dropdown-error-red-hover); + } + + &.active { + background: var(--color-dropdown-error-red-active); + + &:hover { + background: var(--color-dropdown-error-red-active-hover); + } + } + } +} + .ui.labels a.label:hover, a.ui.label:hover { background: var(--color-hover); @@ -1535,8 +1643,10 @@ a.ui.label:hover { } } -.octicon-tiny { - font-size: .85714286rem; +.octicon-tiny > .svg { + margin-top: -2px; + margin-bottom: -2px; + vertical-align: -2px; } .ui.button { diff --git a/web_src/less/_explore.less b/web_src/less/_explore.less index aa7dee0f552d7..840d44300d15e 100644 --- a/web_src/less/_explore.less +++ b/web_src/less/_explore.less @@ -40,6 +40,7 @@ } .ui.tags { + margin-top: -.5rem; margin-bottom: .5rem; } } @@ -50,7 +51,7 @@ font-size: 12px; color: var(--color-text-light); display: flex; - white-space: pre; + .commit-message { max-width: 72em; overflow: hidden; diff --git a/web_src/less/_repository.less b/web_src/less/_repository.less index 14d2f3ddd46d8..a79cb0456d547 100644 --- a/web_src/less/_repository.less +++ b/web_src/less/_repository.less @@ -185,12 +185,6 @@ } #clone-panel { - width: 350px; - - @media @mediaSm { - width: 100%; - } - input { border-radius: 0; padding: 5px 10px; @@ -224,14 +218,24 @@ } &.file.list { - .repo-description { - display: flex; - justify-content: space-between; - align-items: center; + .repo-description .item { + align-self: flex-start; + flex-direction: column; + align-items: flex-start; + } + + .repo-desc-wrapper { + flex: 1; + min-width: 0; } #repo-desc { - font-size: 1.2em; + font-size: 16px; + line-height: 24px; + + & ~ div { + margin-top: calc(.5rem - 4px); + } } .choose.reference { @@ -241,7 +245,6 @@ } .repo-path { - .section, .divider { display: inline; @@ -268,15 +271,60 @@ } #repo-files-table { - thead { - th { - padding-top: 8px; - padding-bottom: 5px; - font-weight: normal; + thead th { + padding-top: 11px; + padding-bottom: 11px; + font-weight: normal; + + &.name, + &.message { + padding: 0; + border: 0; } - .ui.avatar { - margin-bottom: 5px; + &.age { + width: 120px; + } + + @media @mediaLg { + &.name { + width: 31.25%; + } + &.message { + width: 68.75%; + } + } + + @media @mediaMd { + &.name { + width: 37.5%; + } + &.message { + width: 62.5%; + } + } + + @media @mediaSm { + &.name { + width: 43.75%; + } + &.message { + width: 56.25%; + } + } + + @media (max-width: 480px) { + &.name { + width: 100%; + } + &.message { + width: 0%; + } + + div.sha { + overflow: hidden; + width: 6px; + } } } @@ -302,18 +350,6 @@ padding-bottom: 0; overflow: initial; - &.name { - max-width: 150px; - } - - &.message { - max-width: 400px; - } - - &.age { - width: 120px; - } - .truncate { display: inline-block; overflow: hidden; @@ -804,11 +840,9 @@ } } - .avatar.image, - .avatar.image img { + .avatar.image { width: 20px; height: 20px; - margin-right: .5rem; } &:first-child:not(.commit) { @@ -864,73 +898,12 @@ .singular-commit { line-height: 34px; /* this must be same as .badge height, to avoid overflow */ - > .avatar.image, - > .avatar.image img { - position: relative; - top: -2px; + .avatar.image:not(.signature) { + margin-top: -2px; } - .shabox { - .sha.label { - margin: 0; - border: 1px solid var(--color-light-border); - - &.isSigned.isWarning { - border: 1px solid #db2828; - background: fade(#db2828, 10%); - - .shortsha { - display: inline-block; - padding-top: 1px; - } - - &:hover { - background: fade(#db2828, 30%) !important; - } - } - - &.isSigned.isVerified { - border: 1px solid #21ba45; - background: fade(#21ba45, 10%); - - .shortsha { - display: inline-block; - padding-top: 1px; - } - - &:hover { - background: fade(#21ba45, 30%) !important; - } - } - - &.isSigned.isVerifiedUntrusted { - border: 1px solid #fbbd08; - background: fade(#fbbd08, 10%); - - .shortsha { - display: inline-block; - padding-top: 1px; - } - - &:hover { - background: fade(#fbbd08, 30%) !important; - } - } - - &.isSigned.isVerifiedUnmatched { - border: 1px solid #f2711c; - background: fade(#f2711c, 10%); - - .shortsha { - display: inline-block; - padding-top: 1px; - } - - &:hover { - background: fade(#f2711c, 30%) !important; - } - } - } + .shabox .sha.label { + margin-right: 0; } } } @@ -1223,7 +1196,7 @@ } .choose.branch { - .svg { + > .svg { margin-right: 10px; } } @@ -1252,6 +1225,13 @@ } &.branches { + td.ui, + td.ui + td { + @media @mediaSm { + display: none; + } + } + .commit-divergence { .bar-group { position: relative; @@ -1301,21 +1281,63 @@ padding: 5px 10px; } } + + @media @mediaSm { + flex-direction: column; + + > * + * { + margin-top: .5em; + } + } + + @media (max-width: 480px) { + form { + flex-direction: column; + align-items: stretch !important; + + > * + * { + margin-top: .5em; + } + } + } + } + } + + .commits-table-left { + white-space: nowrap; + min-width: 0; + + span { + overflow: hidden; + text-overflow: ellipsis; } } #commits-table { + @media (max-width: 480px) { + .ui.avatar, + th.sha, + td.sha { + display: none; + } + } + thead { th:first-of-type { padding-left: 15px; } - .sha { - &td { - text-align: center; + .sha.mono { + font-size: 1em !important; + width: calc(9ch + 82px); // 60px + 11px * 2 + + span { + font-family: var(--fonts-regular); } + } - width: 175px; + .age { + width: 120px; } } @@ -1336,112 +1358,39 @@ #repo-files-table .sha.label, #rev-list .sha.label, .timeline-item.commits-list .singular-commit .sha.label { - border: 1px solid var(--color-light-border); - - .ui.signature.avatar { - height: 16px; - margin-bottom: 0; - width: 16px; - } - - .detail.icon { - background: var(--color-light); - margin: -6px -10px -4px 0; - padding: 5px 4px 5px 6px; - border-left: 1px solid var(--color-light-border); - border-top: 0; - border-right: 0; - border-bottom: 0; - border-top-left-radius: 0; - border-bottom-left-radius: 0; - - img { - margin-right: 0; - } - - .svg { - margin: 0 .25em 0 0; - } - - > div { - display: flex; - align-items: center; - } - } - - &.isSigned.isWarning { - border: 1px solid #db2828; - background: fade(#db2828, 10%); - - .shortsha { - display: inline-block; - padding-top: 1px; - } + border: 1px solid var(--color-light-border) !important; - .detail.icon { - border-left: 1px solid #db2828; - color: #db2828; - } - - &:hover { - background: fade(#db2828, 30%) !important; - } + .mono { + color: var(--color-text-light); } - &.isSigned.isVerified { - border: 1px solid #21ba45; - background: fade(#21ba45, 10%); - - .shortsha { - display: inline-block; - padding-top: 1px; - } - - .detail.icon { - border-left: 1px solid #21ba45; - color: #21ba45; - } + .override-sha-label-colors(@color) { + color: ~"var(--color-@{color})"; + background: ~"var(--color-@{color}-sha-bg)"; &:hover { - background: fade(#21ba45, 30%) !important; + background: ~"var(--color-@{color}-sha-hover)"; } } - &.isSigned.isVerifiedUntrusted { - border: 1px solid #fbbd08; - background: fade(#fbbd08, 10%); - - .shortsha { - display: inline-block; - padding-top: 1px; - } - - .detail.icon { - border-left: 1px solid #fbbd08; - color: #fbbd08; - } + &.isSigned { + border: 1px solid currentColor !important; + color: var(--color-text-light-3); - &:hover { - background: fade(#fbbd08, 30%) !important; + &.isWarning { + .override-sha-label-colors(red); } - } - - &.isSigned.isVerifiedUnmatched { - border: 1px solid #f2711c; - background: fade(#f2711c, 10%); - .shortsha { - display: inline-block; - padding-top: 1px; + &.isVerified { + .override-sha-label-colors(green); } - .detail.icon { - border-left: 1px solid #f2711c; - color: #f2711c; + &.isVerifiedUntrusted { + .override-sha-label-colors(yellow); } - &:hover { - background: fade(#f2711c, 30%) !important; + &.isVerifiedUnmatched { + .override-sha-label-colors(orange); } } } @@ -2397,6 +2346,24 @@ } } } + + &.diff .shalist > *, + &.diff .message { + overflow: auto; + white-space: nowrap; + } + + &.diff .info { + .author, + .shalist { + max-width: 100%; + } + + .sha.label { + margin-left: .75em; + margin-right: 0; + } + } } // End of .repository @@ -2760,53 +2727,34 @@ display: inline-block !important; } -tbody.commit-list { - vertical-align: baseline; +.commit-list tr { + line-height: 2rem; + vertical-align: top; } .message-wrapper { - overflow: hidden; - text-overflow: ellipsis; - max-width: calc(100% - 50px); - display: inline-block; - vertical-align: middle; -} - -@media @mediaSm { - tr.commit-list { - width: 100%; - } - th .message-wrapper { - display: block; - max-width: calc(100vw - 70px); - } -} + display: flex; + flex-wrap: wrap; + align-items: center; + text-align: left; -@media @mediaMd { - tr.commit-list { - width: 723px; - } - th .message-wrapper { - max-width: 280px; + > :first-child { + overflow: hidden; + text-overflow: ellipsis; + flex: 1; + max-width: max-content; + min-width: .5em; } -} -@media @mediaLg { - tr.commit-list { - width: 933px; - } - th .message-wrapper { - max-width: 490px; + .commit-button + * { + flex: 100%; } } -@media @mediaXl { - tr.commit-list { - width: 1127px; - } - th .message-wrapper { - max-width: 680px; - } +.repository .ui.button.commit-button { + margin-right: 0; + margin-left: .25rem; + padding: 1px 7px; } .commit-summary a { @@ -2836,6 +2784,7 @@ tbody.commit-list { .repository:not(.diff) { .commit-body { // commit history list margin: 0; + min-width: .5rem; } .timeline-item .commit-body { // PR-comment @@ -2847,31 +2796,38 @@ tbody.commit-list { text-align: left; } -@media @mediaSm { - .ui.stackable.menu { - &.mobile--margin-between-items > .item { - margin-top: 5px; - margin-bottom: 5px; - } +.ui.secondary.menu { + .item > .input, + .item > .button { + margin: 0; + } - &.mobile--no-negative-margins { - margin-left: 0; - margin-right: 0; + &.flex-wrappable { + margin-bottom: 0; + + .item { + margin-bottom: 1rem; } } -} -#topic_edit { - margin-top: 5px; + @media @mediaSm { + &.stackable { + width: 100% !important; + } + } } #repo-topics { - margin-top: 5px; + line-height: 2rem; display: flex; align-items: center; flex-wrap: wrap; } +.ui.label.topic { + word-break: break-word; +} + .repo-topic { font-weight: normal !important; cursor: pointer; @@ -2897,12 +2853,13 @@ tbody.commit-list { font-size: 12px; } -.label + #manage_topic { - margin-left: 5px; +#topic_edit .ui.multiple input.search { + width: 10em; + min-width: 10em; } -.ui.small.label.topic { - margin-bottom: 4px; +.label + #manage_topic { + margin-left: .35rem; } .repo-header { diff --git a/web_src/less/features/gitgraph.less b/web_src/less/features/gitgraph.less index dd01ae4bc5682..36bc8aa4f6d81 100644 --- a/web_src/less/features/gitgraph.less +++ b/web_src/less/features/gitgraph.less @@ -73,6 +73,7 @@ .author { color: #666666; + min-width: max-content; } .time { @@ -116,27 +117,23 @@ } .sha.label { - padding-top: 5px; - padding-bottom: 3px; - } + display: flex; + height: 21.6px; // 14px + 2.8px * 2 + 1px * 2 + padding: 2.8px 6px; - .sha.label .shortsha { - padding-top: 0; - } + .mono + * { + margin: -2.8px -3.2px -2.8px 6px; - .sha.label .shortsha-pad { - padding-right: 10px; - } - - .sha.label .ui.detail.icon.button { - padding-top: 3px; - margin-top: -5px; - padding-bottom: 1px; + > * { + margin-left: 2.8px; // 6px - 3.2px + } + } } .author .ui.avatar.image { width: auto; height: 18px; + border-radius: calc(var(--border-radius) / 24 * 18); } } diff --git a/web_src/less/themes/theme-arc-green.less b/web_src/less/themes/theme-arc-green.less index 2f9bd4a4b182d..2606aaacc96a3 100644 --- a/web_src/less/themes/theme-arc-green.less +++ b/web_src/less/themes/theme-arc-green.less @@ -68,6 +68,14 @@ --color-black: #1e222e; --color-gold: #a1882b; --color-white: #ffffff; + --color-red-sha-bg: rgba(219, 40, 40, .1); + --color-red-sha-hover: rgba(219, 40, 40, .3); + --color-orange-sha-bg: rgba(242, 113, 28, .1); + --color-orange-sha-hover: rgba(242, 113, 28, .3); + --color-yellow-sha-bg: rgba(251, 189, 8, .1); + --color-yellow-sha-hover: rgba(251, 189, 8, .3); + --color-green-sha-bg: rgba(33, 186, 69, .1); + --color-green-sha-hover: rgba(33, 186, 69, .3); --color-diff-removed-word-bg: #6f3333; --color-diff-added-word-bg: #3c653c; --color-diff-removed-row-bg: #3c2626; @@ -476,12 +484,6 @@ td.blob-excerpt { color: #dbdbdb; } -.ui.active.label { - background: #393d4a; - border-color: #393d4a; - color: #dbdbdb; -} - .repository .ui.attached.message.isSigned.isVerified { background-color: #394829; color: var(--color-secondary-dark-6);
{{if .LatestCommit.Author}}{{TimeSince .LatestCommit.Author.When $.Lang}}{{end}}
- {{if .LatestCommitUser}} - {{avatar .LatestCommitUser 24}} - {{if .LatestCommitUser.FullName}} - {{.LatestCommitUser.FullName}} +
+ {{if .LatestCommitUser}} + {{avatar .LatestCommitUser 28}} + {{if .LatestCommitUser.FullName}} + {{.LatestCommitUser.FullName}} + {{else}} + {{if .LatestCommit.Author}}{{.LatestCommit.Author.Name}}{{else}}{{.LatestCommitUser.Name}}{{end}} + {{end}} {{else}} - {{if .LatestCommit.Author}}{{.LatestCommit.Author.Name}}{{else}}{{.LatestCommitUser.Name}}{{end}} - {{end}} - {{else}} - {{if .LatestCommit.Author}} - {{avatarByEmail .LatestCommit.Author.Email .LatestCommit.Author.Name 24}} - {{.LatestCommit.Author.Name}} - {{end}} - {{end}} - - {{ShortSha .LatestCommit.ID.String}} - {{if .LatestCommit.Signature}} - {{template "repo/shabox_badge" dict "root" $ "verification" .LatestCommitVerification}} + {{if .LatestCommit.Author}} + {{avatarByEmail .LatestCommit.Author.Email .LatestCommit.Author.Name 28}} + {{.LatestCommit.Author.Name}} + {{end}} {{end}} - - {{template "repo/commit_statuses" dict "Status" .LatestCommitStatus "Statuses" .LatestCommitStatuses "root" $}} - {{ $commitLink:= printf "%s/commit/%s" .RepoLink .LatestCommit.ID }} - {{RenderCommitMessageLinkSubject .LatestCommit.Message $.RepoLink $commitLink $.Repository.ComposeMetas}} - {{if IsMultilineCommitMessage .LatestCommit.Message}} - - - {{end}} - +
+
+ + {{ShortSha .LatestCommit.ID.String}} + {{if .LatestCommit.Signature}} + {{template "repo/shabox_badge" dict "root" $ "verification" .LatestCommitVerification}} + {{end}} + +
+
+ {{template "repo/commit_statuses" dict "Status" .LatestCommitStatus "Statuses" .LatestCommitStatuses "root" $}} + {{ $commitLink:= printf "%s/commit/%s" .RepoLink .LatestCommit.ID }} + + + {{RenderCommitMessageLinkSubject .LatestCommit.Message $.RepoLink $commitLink $.Repository.ComposeMetas}} + + {{if IsMultilineCommitMessage .LatestCommit.Message}} + + + {{end}} + +
{{if .LatestCommit.Author}}{{TimeSince .LatestCommit.Author.When $.Lang}}{{end}}
+ {{if $entry.IsSubModule}} {{svg "octicon-file-submodule"}} @@ -73,12 +86,12 @@ {{end}} + {{$commit.Summary | RenderEmoji}} {{TimeSince $commit.Committer.When $.Lang}}{{TimeSince $commit.Committer.When $.Lang}}