From b2adf3766572776644247c0ecd67a4cbba6a9ccf Mon Sep 17 00:00:00 2001 From: Sebastian Sauer Date: Sun, 9 Jul 2023 21:24:31 +0200 Subject: [PATCH 1/2] Don't stack PR tab menu on small screens the stacking takes up screen space - display the tabs as the navigation bar. github uses the same layout. --- templates/repo/pulls/tab_menu.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/repo/pulls/tab_menu.tmpl b/templates/repo/pulls/tab_menu.tmpl index c91d09d9e1ab6..cafced0790708 100644 --- a/templates/repo/pulls/tab_menu.tmpl +++ b/templates/repo/pulls/tab_menu.tmpl @@ -1,4 +1,4 @@ -
+
{{svg "octicon-comment-discussion"}} {{$.locale.Tr "repo.pulls.tab_conversation"}} From 41e88fb45e0555f43aef971750e4e5dbc7087b6d Mon Sep 17 00:00:00 2001 From: Sebastian Sauer Date: Mon, 10 Jul 2023 18:37:11 +0200 Subject: [PATCH 2/2] Fix not stackable tabs layout --- templates/repo/pulls/tab_menu.tmpl | 45 ++++++++++++++++-------------- web_src/css/repo.css | 9 +++++- 2 files changed, 32 insertions(+), 22 deletions(-) diff --git a/templates/repo/pulls/tab_menu.tmpl b/templates/repo/pulls/tab_menu.tmpl index cafced0790708..fe1d4e4de02e1 100644 --- a/templates/repo/pulls/tab_menu.tmpl +++ b/templates/repo/pulls/tab_menu.tmpl @@ -1,23 +1,26 @@ -
- - {{svg "octicon-comment-discussion"}} - {{$.locale.Tr "repo.pulls.tab_conversation"}} - {{.Issue.NumComments}} - - - {{svg "octicon-git-commit"}} - {{$.locale.Tr "repo.pulls.tab_commits"}} - {{if .NumCommits}}{{.NumCommits}}{{else}}-{{end}} - - - {{svg "octicon-diff"}} - {{$.locale.Tr "repo.pulls.tab_files"}} - {{if .NumFiles}}{{.NumFiles}}{{else}}-{{end}} - - - {{if .Diff.TotalAddition}}+{{.Diff.TotalAddition}}{{end}} {{if .Diff.TotalDeletion}}-{{.Diff.TotalDeletion}}{{end}} - -
+
+
+ + {{svg "octicon-comment-discussion"}} + {{$.locale.Tr "repo.pulls.tab_conversation"}} + {{.Issue.NumComments}} + + + {{svg "octicon-git-commit"}} + {{$.locale.Tr "repo.pulls.tab_commits"}} + {{if .NumCommits}}{{.NumCommits}}{{else}}-{{end}} + + + {{svg "octicon-diff"}} + {{$.locale.Tr "repo.pulls.tab_files"}} + {{if .NumFiles}}{{.NumFiles}}{{else}}-{{end}} + + + {{if .Diff.TotalAddition}}+{{.Diff.TotalAddition}}{{end}} {{if .Diff.TotalDeletion}}-{{.Diff.TotalDeletion}}{{end}} + +
+ - +
+
diff --git a/web_src/css/repo.css b/web_src/css/repo.css index da5cd06b3e8a4..e08cdf6d4b53f 100644 --- a/web_src/css/repo.css +++ b/web_src/css/repo.css @@ -746,8 +746,15 @@ right: 1px; } +.repository.view.issue .pull.tabs.container { + width: 100%; + max-width: 100%; +} + .repository.view.issue .pull.tabular.menu { - margin-bottom: 1rem; + margin-bottom: 0; + overflow-x: auto; + overflow-y: hidden; } .repository.view.issue .pull.tabular.menu .svg {