From 8099238618f6573f1eb5cfeeb0902b641e7121ab Mon Sep 17 00:00:00 2001 From: silverwind Date: Tue, 19 Sep 2023 00:05:31 +0200 Subject: Change green buttons to primary color (#27099) I think it's better if the primary actions have primary color instead of green which fits better into the overall single-color UI design. This PR currently replaces every green button with primary: Screenshot 2023-09-16 at 14 07 59 Screenshot 2023-09-16 at 14 07 51 Modal actions now use uncolored/primary instead of previous green/red colors. I also removed the box-shadow on all basic buttons: Screenshot 2023-09-16 at 14 16 39 Screenshot 2023-09-16 at 14 17 42 The change currently includes the "Merge PR" button, for which we might want to make an exception to match the icon color there: Screenshot 2023-09-16 at 14 33 53 --- templates/repo/diff/box.tmpl | 4 ++-- templates/repo/diff/comment_form.tmpl | 6 +++--- templates/repo/diff/compare.tmpl | 6 +++--- templates/repo/diff/conversation.tmpl | 2 +- templates/repo/diff/new_review.tmpl | 6 +++--- 5 files changed, 12 insertions(+), 12 deletions(-) (limited to 'templates/repo/diff') diff --git a/templates/repo/diff/box.tmpl b/templates/repo/diff/box.tmpl index 0b5bf86371..2e1461226a 100644 --- a/templates/repo/diff/box.tmpl +++ b/templates/repo/diff/box.tmpl @@ -232,8 +232,8 @@ "DropzoneParentContainer" ".ui.form" )}}
- - + +
diff --git a/templates/repo/diff/comment_form.tmpl b/templates/repo/diff/comment_form.tmpl index 5aad8d9590..dff030a0b4 100644 --- a/templates/repo/diff/comment_form.tmpl +++ b/templates/repo/diff/comment_form.tmpl @@ -24,14 +24,14 @@ {{svg "octicon-markup"}} {{$.root.locale.Tr "repo.diff.comment.markdown_info"}}
{{if $.reply}} - + {{else}} {{if $.root.CurrentReview}} - + {{else}} - + {{end}} {{end}} diff --git a/templates/repo/diff/compare.tmpl b/templates/repo/diff/compare.tmpl index e4ae7d4dc8..4d57fd6148 100644 --- a/templates/repo/diff/compare.tmpl +++ b/templates/repo/diff/compare.tmpl @@ -180,7 +180,7 @@ {{if and $.IsSigned $.AllowEmptyPr (not .Repository.IsArchived)}}
{{.locale.Tr "repo.pulls.nothing_to_compare_and_allow_empty_pr"}}
- +
{{else}} {{if and $.IsSigned (not .Repository.IsArchived)}}
- +
{{else if .Repository.IsArchived}}
diff --git a/templates/repo/diff/conversation.tmpl b/templates/repo/diff/conversation.tmpl index 639dd9cd04..c6ada10caf 100644 --- a/templates/repo/diff/conversation.tmpl +++ b/templates/repo/diff/conversation.tmpl @@ -56,7 +56,7 @@ {{end}} {{if and $.SignedUserID (not $.Repository.IsArchived)}} - {{end}} diff --git a/templates/repo/diff/new_review.tmpl b/templates/repo/diff/new_review.tmpl index 6a3fa7a823..908f488975 100644 --- a/templates/repo/diff/new_review.tmpl +++ b/templates/repo/diff/new_review.tmpl @@ -1,5 +1,5 @@
- + {{else}} - + {{end}} {{if $showSelfTooltip}} -- cgit v1.2.3