From f6303f2b3cdedf9d0e48f380a14e6d7e25c6db1b Mon Sep 17 00:00:00 2001 From: silverwind Date: Tue, 23 Aug 2022 20:16:59 +0200 Subject: [PATCH 1/2] Change review buttons to icons to make space for text The layout on the review code view was broken depending on length of the text before. Change all three buttons to icons with tooltip to make more space for these long texts. Fixes: https://github.com/go-gitea/gitea/issues/20922 --- public/img/svg/gitea-join.svg | 1 + public/img/svg/gitea-split.svg | 1 + templates/repo/diff/box.tmpl | 2 +- templates/repo/diff/new_review.tmpl | 2 +- templates/repo/diff/options_dropdown.tmpl | 5 ++--- templates/repo/diff/whitespace_dropdown.tmpl | 6 +++--- web_src/less/_base.less | 6 ++++++ web_src/svg/gitea-join.svg | 1 + web_src/svg/gitea-split.svg | 1 + 9 files changed, 17 insertions(+), 8 deletions(-) create mode 100644 public/img/svg/gitea-join.svg create mode 100644 public/img/svg/gitea-split.svg create mode 100644 web_src/svg/gitea-join.svg create mode 100644 web_src/svg/gitea-split.svg diff --git a/public/img/svg/gitea-join.svg b/public/img/svg/gitea-join.svg new file mode 100644 index 0000000000000..678b9374f7313 --- /dev/null +++ b/public/img/svg/gitea-join.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/img/svg/gitea-split.svg b/public/img/svg/gitea-split.svg new file mode 100644 index 0000000000000..f819255cca68f --- /dev/null +++ b/public/img/svg/gitea-split.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/templates/repo/diff/box.tmpl b/templates/repo/diff/box.tmpl index 464b1359d8247..e913bef94e249 100644 --- a/templates/repo/diff/box.tmpl +++ b/templates/repo/diff/box.tmpl @@ -13,7 +13,7 @@

{{.locale.Tr "repo.diff.data_not_available"}}

{{else}}
-
+
{{svg "octicon-diff" 16 "mr-2"}}{{.locale.Tr "repo.diff.stats_desc" .Diff.NumFiles .Diff.TotalAddition .Diff.TotalDeletion | Str2html}}
diff --git a/templates/repo/diff/new_review.tmpl b/templates/repo/diff/new_review.tmpl index 91dae84e9a144..4b645937df9cc 100644 --- a/templates/repo/diff/new_review.tmpl +++ b/templates/repo/diff/new_review.tmpl @@ -1,5 +1,5 @@