From 0de546009e466486cd88dfa98d07d8775bd3087d Mon Sep 17 00:00:00 2001 From: silverwind Date: Sun, 15 Nov 2020 21:58:16 +0100 Subject: CSS color variables, less bold font weight and more (#13567) * CSS color variables, less bold font weight - Define color variables for fully saturated colors and apply them where it made sense - Add background color helper classes - Globally reduce bold font weight from 700 to 500 - Remove border from timeline icons - Unify dropzone styling - Various border style consolidations * attempt to fix test * another attempt at tests * fix contains --- templates/repo/issue/view_content/comments.tmpl | 6 ++-- templates/repo/issue/view_content/pull.tmpl | 38 ++++++++++++------------- 2 files changed, 22 insertions(+), 22 deletions(-) (limited to 'templates') diff --git a/templates/repo/issue/view_content/comments.tmpl b/templates/repo/issue/view_content/comments.tmpl index 6f18980072..77b02f67a5 100644 --- a/templates/repo/issue/view_content/comments.tmpl +++ b/templates/repo/issue/view_content/comments.tmpl @@ -91,7 +91,7 @@ {{else if eq .Type 1}}
- {{svg "octicon-dot-fill"}} + {{svg "octicon-dot-fill"}} @@ -106,7 +106,7 @@
{{else if eq .Type 2}}
- {{svg "octicon-circle-slash"}} + {{svg "octicon-circle-slash"}} @@ -121,7 +121,7 @@
{{else if eq .Type 28}}
- {{svg "octicon-git-merge"}} + {{svg "octicon-git-merge"}} diff --git a/templates/repo/issue/view_content/pull.tmpl b/templates/repo/issue/view_content/pull.tmpl index 6b62def2cc..347b3b15d3 100644 --- a/templates/repo/issue/view_content/pull.tmpl +++ b/templates/repo/issue/view_content/pull.tmpl @@ -97,7 +97,7 @@ {{$canAutoMerge := false}}
{{if .Issue.PullRequest.HasMerged}} -
+
{{if .Issue.PullRequest.MergedCommitID}} {{$link := printf "%s/commit/%s" $.Repository.HTMLURL .Issue.PullRequest.MergedCommitID}} {{$.i18n.Tr "repo.pulls.merged_as" $link (ShortSha .Issue.PullRequest.MergedCommitID) | Safe}} @@ -112,7 +112,7 @@
{{end}} {{else if .Issue.IsClosed}} -
+
{{if .IsPullRequestBroken}} {{$.i18n.Tr "repo.pulls.cant_reopen_deleted_branch"}} {{else}} @@ -126,7 +126,7 @@
{{end}} {{else if .IsPullFilesConflicted}} -
+
{{svg "octicon-x"}} {{$.i18n.Tr "repo.pulls.files_conflicted"}} {{range .ConflictedFiles}} @@ -134,38 +134,38 @@ {{end}}
{{else if .IsPullRequestBroken}} -
+
{{svg "octicon-x"}} {{$.i18n.Tr "repo.pulls.data_broken"}}
{{else if .IsPullWorkInProgress}} -
+
{{svg "octicon-x"}} {{$.i18n.Tr "repo.pulls.cannot_merge_work_in_progress" (.WorkInProgressPrefix|Escape) | Str2html}}
{{else if .Issue.PullRequest.IsChecking}} -
+
{{svg "octicon-sync"}} {{$.i18n.Tr "repo.pulls.is_checking"}}
{{else if .Issue.PullRequest.CanAutoMerge}} {{if .IsBlockedByApprovals}} -
+
{{svg "octicon-x"}} {{$.i18n.Tr "repo.pulls.blocked_by_approvals" .GrantedApprovals .Issue.PullRequest.ProtectedBranch.RequiredApprovals}}
{{else if .IsBlockedByRejection}} -
+
{{svg "octicon-x"}} {{$.i18n.Tr "repo.pulls.blocked_by_rejection"}}
{{else if .IsBlockedByOutdatedBranch}} -
+
{{svg "octicon-x"}} {{$.i18n.Tr "repo.pulls.blocked_by_outdated_branch"}}
{{else if .IsBlockedByChangedProtectedFiles}} -
+
{{svg "octicon-x" 16}} {{$.i18n.Tr (TrN $.i18n.Lang $.ChangedProtectedFilesNum "repo.pulls.blocked_by_changed_protected_files_1" "repo.pulls.blocked_by_changed_protected_files_n") | Safe }}
@@ -175,21 +175,21 @@
{{else if and .EnableStatusCheck (or .RequiredStatusCheckState.IsError .RequiredStatusCheckState.IsFailure)}} -
+
{{svg "octicon-x"}} {{$.i18n.Tr "repo.pulls.required_status_check_failed"}}
{{else if and .EnableStatusCheck (not .RequiredStatusCheckState.IsSuccess)}} -
+
{{svg "octicon-x"}} {{$.i18n.Tr "repo.pulls.required_status_check_missing"}}
{{else if and .AllowMerge .RequireSigned (not .WillSign)}} -
+
{{svg "octicon-x"}} {{$.i18n.Tr "repo.pulls.require_signed_wont_sign"}}
-
+
{{$.i18n.Tr (printf "repo.signing.wont_sign.%s" .WontSignReason) }}
@@ -197,23 +197,23 @@ {{$notAllOverridableChecksOk := or .IsBlockedByApprovals .IsBlockedByRejection .IsBlockedByOutdatedBranch .IsBlockedByChangedProtectedFiles (and .EnableStatusCheck (not .RequiredStatusCheckState.IsSuccess))}} {{if and (or $.IsRepoAdmin (not $notAllOverridableChecksOk)) (or (not .AllowMerge) (not .RequireSigned) .WillSign)}} {{if $notAllOverridableChecksOk}} -
+
{{svg "octicon-dot-fill"}} {{$.i18n.Tr "repo.pulls.required_status_check_administrator"}}
{{else}} -
+
{{svg "octicon-check"}} {{$.i18n.Tr "repo.pulls.can_auto_merge_desc"}}
{{end}} {{if .WillSign}} -
+
{{$.i18n.Tr "repo.signing.will_sign" .SigningKey}}
{{else if .IsSigned}} -
+
{{$.i18n.Tr (printf "repo.signing.wont_sign.%s" .WontSignReason) }}
@@ -223,7 +223,7 @@ {{$canAutoMerge = true}} {{if (gt .Issue.PullRequest.CommitsBehind 0)}}
-
+
{{svg "octicon-alert"}} {{$.i18n.Tr "repo.pulls.outdated_with_base_branch"}} -- cgit v1.2.3