From 917ca5ded9914fb09d65cecaf5a716db0fac7686 Mon Sep 17 00:00:00 2001
From: Denys Konovalov <kontakt@denyskon.de>
Date: Fri, 7 Jul 2023 00:34:00 +0200
Subject: [PATCH] Several fixes for mobile UI (#25634) (#25689)
Backport #25634
Resolves https://github.com/go-gitea/gitea/issues/25622
<details>
<summary>Screenshots</summary>
</details>
---------
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
Co-authored-by: silverwind <me@silverwind.io>
Co-authored-by: Giteabot <teabot@gitea.io>
---
templates/repo/branch/list.tmpl | 2 +-
templates/repo/commits_list.tmpl | 2 +-
templates/repo/commits_table.tmpl | 14 ++--
.../issue/labels/labels_selector_field.tmpl | 2 +-
templates/repo/issue/new_form.tmpl | 12 ++--
.../repo/issue/view_content/sidebar.tmpl | 6 +-
templates/shared/combomarkdowneditor.tmpl | 2 +-
web_src/css/admin.css | 4 ++
web_src/css/editor/combomarkdowneditor.css | 2 +
web_src/css/repo.css | 69 ++++++++++++-------
web_src/js/components/RepoActionView.vue | 8 +--
11 files changed, 72 insertions(+), 51 deletions(-)
diff --git a/templates/repo/branch/list.tmpl b/templates/repo/branch/list.tmpl
index 8617bcafaf..ad077316fe 100644
--- a/templates/repo/branch/list.tmpl
+++ b/templates/repo/branch/list.tmpl
@@ -25,7 +25,7 @@
<a href="{{.RepoLink}}/src/branch/{{PathEscapeSegments .DefaultBranch}}">{{.DefaultBranch}}</a>
<p class="info gt-df gt-ac gt-my-2">{{svg "octicon-git-commit" 16 "gt-mr-2"}}<a href="{{.RepoLink}}/commit/{{PathEscape .DefaultBranchBranch.Commit.ID.String}}">{{ShortSha .DefaultBranchBranch.Commit.ID.String}}</a> · <span class="commit-message">{{RenderCommitMessage $.Context .DefaultBranchBranch.Commit.CommitMessage .RepoLink .Repository.ComposeMetas}}</span> · {{.locale.Tr "org.repo_updated"}} {{TimeSince .DefaultBranchBranch.Commit.Committer.When .locale}}</p>
</td>
- <td class="right aligned overflow-visible">
+ <td class="right aligned middle aligned overflow-visible">
{{if and $.IsWriter (not $.Repository.IsArchived) (not .IsDeleted)}}
<button class="btn interact-bg show-create-branch-modal gt-p-3"
data-modal="#create-branch-modal"
diff --git a/templates/repo/commits_list.tmpl b/templates/repo/commits_list.tmpl
index 36333c5540..45d857b1bb 100644
--- a/templates/repo/commits_list.tmpl
+++ b/templates/repo/commits_list.tmpl
@@ -1,5 +1,5 @@
<div class="ui attached table segment commit-table">
- <table class="ui very basic striped table unstackable fixed" id="commits-table">
+ <table class="ui very basic striped table unstackable" id="commits-table">
<thead>
<tr>
<th class="three wide">{{.locale.Tr "repo.commits.author"}}</th>
diff --git a/templates/repo/commits_table.tmpl b/templates/repo/commits_table.tmpl
index eeb50a219c..b64695eb0b 100644
--- a/templates/repo/commits_table.tmpl
+++ b/templates/repo/commits_table.tmpl
@@ -8,23 +8,23 @@
{{.locale.Tr "repo.commits.no_commits" $.BaseBranch $.HeadBranch}} {{if .RefName}}({{.RefName}}){{end}}
{{end}}
</div>
- <div class="commits-table-right gt-df gt-ac">
+ <div class="commits-table-right">
{{if .PageIsCommits}}
<form class="ignore-dirty" action="{{.RepoLink}}/commits/{{.BranchNameSubURL}}/search">
<div class="ui tiny search input">
<input name="q" placeholder="{{.locale.Tr "repo.commits.search"}}" value="{{.Keyword}}" autofocus>
</div>
-
- <div class="ui checkbox">
- <input type="checkbox" name="all" id="all" value="true" {{.All}}>
- <label for="all">{{.locale.Tr "repo.commits.search_all"}} </label>
+
+ <div class="ui tiny checkbox">
+ <input type="checkbox" name="all" value="true" {{.All}}>
+ <label>{{.locale.Tr "repo.commits.search_all"}}</label>
</div>
<button class="ui primary tiny button gt-mr-0" data-panel="#add-deploy-key-panel" data-tooltip-content={{.locale.Tr "repo.commits.search.tooltip"}}>{{.locale.Tr "repo.commits.find"}}</button>
</form>
{{else if .IsDiffCompare}}
- <a href="{{$.CommitRepoLink}}/commit/{{.BeforeCommitID | PathEscape}}" class="ui green sha label">{{if not .BaseIsCommit}}{{if .BaseIsBranch}}{{svg "octicon-git-branch"}}{{else if .BaseIsTag}}{{svg "octicon-tag"}}{{end}}{{.BaseBranch}}{{else}}{{ShortSha .BaseBranch}}{{end}}</a>
+ <a href="{{$.CommitRepoLink}}/commit/{{.BeforeCommitID | PathEscape}}" class="ui green sha label gt-mx-0">{{if not .BaseIsCommit}}{{if .BaseIsBranch}}{{svg "octicon-git-branch"}}{{else if .BaseIsTag}}{{svg "octicon-tag"}}{{end}}{{.BaseBranch}}{{else}}{{ShortSha .BaseBranch}}{{end}}</a>
...
- <a href="{{$.CommitRepoLink}}/commit/{{.AfterCommitID | PathEscape}}" class="ui green sha label">{{if not .HeadIsCommit}}{{if .HeadIsBranch}}{{svg "octicon-git-branch"}}{{else if .HeadIsTag}}{{svg "octicon-tag"}}{{end}}{{.HeadBranch}}{{else}}{{ShortSha .HeadBranch}}{{end}}</a>
+ <a href="{{$.CommitRepoLink}}/commit/{{.AfterCommitID | PathEscape}}" class="ui green sha label gt-mx-0">{{if not .HeadIsCommit}}{{if .HeadIsBranch}}{{svg "octicon-git-branch"}}{{else if .HeadIsTag}}{{svg "octicon-tag"}}{{end}}{{.HeadBranch}}{{else}}{{ShortSha .HeadBranch}}{{end}}</a>
{{end}}
</div>
</h4>
diff --git a/templates/repo/issue/labels/labels_selector_field.tmpl b/templates/repo/issue/labels/labels_selector_field.tmpl
index 05580ea41e..e1e90cc1c4 100644
--- a/templates/repo/issue/labels/labels_selector_field.tmpl
+++ b/templates/repo/issue/labels/labels_selector_field.tmpl
@@ -1,5 +1,5 @@
<div class="ui {{if or (not .HasIssuesOrPullsWritePermission) .Repository.IsArchived}}disabled{{end}} floating jump select-label dropdown">
- <span class="text gt-df gt-ac muted">
+ <span class="text muted flex-text-block">
<strong>{{.locale.Tr "repo.issues.new.labels"}}</strong>
{{if and .HasIssuesOrPullsWritePermission (not .Repository.IsArchived)}}
{{svg "octicon-gear" 16 "gt-ml-2"}}
diff --git a/templates/repo/issue/new_form.tmpl b/templates/repo/issue/new_form.tmpl
index 00da68eb06..b7e90e8e04 100644
--- a/templates/repo/issue/new_form.tmpl
+++ b/templates/repo/issue/new_form.tmpl
@@ -59,10 +59,10 @@
<input id="milestone_id" name="milestone_id" type="hidden" value="{{.milestone_id}}">
<div class="ui {{if not .HasIssuesOrPullsWritePermission}}disabled{{end}} floating jump select-milestone dropdown">
- <span class="text">
+ <span class="text flex-text-block">
<strong>{{.locale.Tr "repo.issues.new.milestone"}}</strong>
{{if .HasIssuesOrPullsWritePermission}}
- {{svg "octicon-gear"}}
+ {{svg "octicon-gear" 16 "gt-ml-2"}}
{{end}}
</span>
<div class="menu">
@@ -86,10 +86,10 @@
<input id="project_id" name="project_id" type="hidden" value="{{.project_id}}">
<div class="ui {{if not .HasIssuesOrPullsWritePermission}}disabled{{end}} floating jump select-project dropdown">
- <span class="text">
+ <span class="text flex-text-block">
<strong>{{.locale.Tr "repo.issues.new.projects"}}</strong>
{{if .HasIssuesOrPullsWritePermission}}
- {{svg "octicon-gear"}}
+ {{svg "octicon-gear" 16 "gt-ml-2"}}
{{end}}
</span>
<div class="menu">
@@ -144,10 +144,10 @@
<div class="ui divider"></div>
<input id="assignee_ids" name="assignee_ids" type="hidden" value="{{.assignee_ids}}">
<div class="ui {{if not .HasIssuesOrPullsWritePermission}}disabled{{end}} floating jump select-assignees dropdown">
- <span class="text">
+ <span class="text flex-text-block">
<strong>{{.locale.Tr "repo.issues.new.assignees"}}</strong>
{{if .HasIssuesOrPullsWritePermission}}
- {{svg "octicon-gear"}}
+ {{svg "octicon-gear" 16 "gt-ml-2"}}
{{end}}
</span>
<div class="filter menu" data-id="#assignee_ids">
diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl
index 2f32639220..3fcefcb417 100644
--- a/templates/repo/issue/view_content/sidebar.tmpl
+++ b/templates/repo/issue/view_content/sidebar.tmpl
@@ -127,7 +127,7 @@
<div class="ui divider"></div>
<div class="ui {{if or (not .HasIssuesOrPullsWritePermission) .Repository.IsArchived}}disabled{{end}} floating jump select-milestone dropdown">
- <a class="text gt-df gt-ac muted">
+ <a class="text muted flex-text-block">
<strong>{{.locale.Tr "repo.issues.new.milestone"}}</strong>
{{if and .HasIssuesOrPullsWritePermission (not .Repository.IsArchived)}}
{{svg "octicon-gear" 16 "gt-ml-2"}}
@@ -153,7 +153,7 @@
<div class="ui divider"></div>
<div class="ui {{if or (not .HasIssuesOrPullsWritePermission) .Repository.IsArchived}}disabled{{end}} floating jump select-project dropdown">
- <a class="text gt-df gt-ac muted">
+ <a class="text muted flex-text-block">
<strong>{{.locale.Tr "repo.issues.new.projects"}}</strong>
{{if and .HasIssuesOrPullsWritePermission (not .Repository.IsArchived)}}
{{svg "octicon-gear" 16 "gt-ml-2"}}
@@ -207,7 +207,7 @@
<input id="assignee_id" name="assignee_id" type="hidden" value="{{.assignee_id}}">
<div class="ui {{if or (not .HasIssuesOrPullsWritePermission) .Repository.IsArchived}}disabled{{end}} floating jump select-assignees-modify dropdown">
- <a class="text gt-df gt-ac muted">
+ <a class="text muted flex-text-block">
<strong>{{.locale.Tr "repo.issues.new.assignees"}}</strong>
{{if and .HasIssuesOrPullsWritePermission (not .Repository.IsArchived)}}
{{svg "octicon-gear" 16 "gt-ml-2"}}
diff --git a/templates/shared/combomarkdowneditor.tmpl b/templates/shared/combomarkdowneditor.tmpl
index 26a51b369c..4c1742d21f 100644
--- a/templates/shared/combomarkdowneditor.tmpl
+++ b/templates/shared/combomarkdowneditor.tmpl
@@ -19,7 +19,7 @@ Template Attributes:
</div>
{{end}}
<div class="ui tab active" data-tab-panel="markdown-writer">
- <markdown-toolbar class="gt-gap-3">
+ <markdown-toolbar>
<div class="markdown-toolbar-group">
<md-header class="markdown-toolbar-button" data-tooltip-content="{{.locale.Tr "editor.buttons.heading.tooltip"}}">{{svg "octicon-heading"}}</md-header>
<md-bold class="markdown-toolbar-button" data-tooltip-content="{{.locale.Tr "editor.buttons.bold.tooltip"}}">{{svg "octicon-bold"}}</md-bold>
diff --git a/web_src/css/admin.css b/web_src/css/admin.css
index 58e0527350..7e50b7f63d 100644
--- a/web_src/css/admin.css
+++ b/web_src/css/admin.css
@@ -47,3 +47,7 @@
.admin .ui.table.segment {
overflow-x: auto; /* if the screen width is small, many wide tables (eg: user list) need scroll bars */
}
+
+.admin .table th {
+ white-space: nowrap;
+}
diff --git a/web_src/css/editor/combomarkdowneditor.css b/web_src/css/editor/combomarkdowneditor.css
index cfdf074f8e..63f4ebf89b 100644
--- a/web_src/css/editor/combomarkdowneditor.css
+++ b/web_src/css/editor/combomarkdowneditor.css
@@ -7,6 +7,8 @@
display: flex;
align-items: center;
padding-bottom: 10px;
+ gap: .5rem;
+ flex-wrap: wrap;
}
.combo-markdown-editor .markdown-toolbar-group {
diff --git a/web_src/css/repo.css b/web_src/css/repo.css
index eb45a2229e..8228ef51c5 100644
--- a/web_src/css/repo.css
+++ b/web_src/css/repo.css
@@ -657,9 +657,26 @@
.repository.view.issue .issue-title {
flex-direction: column;
}
+ .repository.view.issue .issue-title-buttons,
+ .repository.view.issue .edit-buttons {
+ width: 100%;
+ justify-content: space-between;
+ }
.repository.view.issue .edit-buttons {
margin-top: .5rem;
}
+ .comment.form .issue-content-left .avatar {
+ display: none;
+ }
+ .comment.form .issue-content-left .content {
+ margin-left: 0 !important;
+ }
+ .comment.form .issue-content-left .content::before,
+ .comment.form .issue-content-left .content::after,
+ .comment.form .content .form::before,
+ .comment.form .content .form::after {
+ display: none;
+ }
}
.repository.view.issue .issue-title {
@@ -1199,7 +1216,14 @@
text-align: left;
}
-.repository.compare.pull .choose.branch .svg {
+.repository .choose.branch {
+ display: flex;
+ align-items: center;
+ gap: 8px;
+ flex-wrap: wrap;
+}
+
+.repository .choose.branch .svg {
margin-right: 10px;
}
@@ -1291,10 +1315,9 @@
padding: 5px 10px;
}
-.repository #commits-table thead th:first-of-type {
- padding-left: 15px;
+.repository #commits-table td:not(.message) {
+ white-space: nowrap;
}
-
.repository #commits-table thead .sha {
width: 200px;
}
@@ -2043,12 +2066,15 @@
.repository .ui.segment.sub-menu .list {
width: 100%;
display: flex;
- align-items: center;
+ align-items: stretch;
}
.repository .ui.segment.sub-menu .list .item {
width: 100%;
color: var(--color-text);
+ display: flex;
+ align-items: center;
+ justify-content: center;
}
.repository .ui.segment.sub-menu .list .item:first-of-type {
@@ -2664,6 +2690,7 @@ tbody.commit-list {
/* in the commit list, messages can wrap so we can use inline */
.commit-list .message-wrapper {
display: inline;
+ overflow-wrap: anywhere;
}
/* but in the repo-files-table we cannot */
@@ -3112,6 +3139,14 @@ tbody.commit-list {
box-shadow: 0 0.5rem 1rem var(--color-shadow) !important;
}
+.commits-table .commits-table-right form {
+ display: flex;
+ align-items: center;
+ gap: 0.75em;
+ justify-content: center;
+ flex-wrap: wrap;
+}
+
@media (max-width: 767.98px) {
.repository.file.list #repo-files-table .entry,
.repository.file.list #repo-files-table .commit-list {
@@ -3181,21 +3216,14 @@ tbody.commit-list {
align-items: initial !important;
margin-bottom: 6px;
}
- .commits-table .commits-table-right form {
- display: flex;
- flex-wrap: wrap;
- }
.commits-table .commits-table-right form > div:nth-child(1) {
- order: 1;
+ order: 1; /* the "commit search" input */
}
.commits-table .commits-table-right form > div:nth-child(2) {
- order: 3;
- margin-left: 0.5rem;
- margin-top: 0.5rem;
+ order: 3; /* the "search all" checkbox */
}
.commits-table .commits-table-right form > button:nth-child(3) {
- order: 2;
- margin-left: 0.25rem;
+ order: 2; /* the "search" button */
}
.commit-table {
overflow-x: auto;
@@ -3204,17 +3232,6 @@ tbody.commit-list {
.commit-table th.sha {
display: none !important;
}
- .commit-table .commit-list span.message-wrapper {
- max-width: none;
- }
- .commit-table .commit-list tr td:last-child {
- display: block;
- width: max-content;
- }
- .commit-table .commit-list td.author {
- display: block;
- width: calc(100% + 0.5rem);
- }
.commit-table .commit-list .copy-commit-sha {
display: none !important;
}
diff --git a/web_src/js/components/RepoActionView.vue b/web_src/js/components/RepoActionView.vue
index efdac0231e..3ef13d7d3c 100644
--- a/web_src/js/components/RepoActionView.vue
+++ b/web_src/js/components/RepoActionView.vue
@@ -516,6 +516,8 @@ export function ansiLogToHTML(line) {
<style scoped>
.action-view-body {
+ padding-top: 12px;
+ padding-bottom: 12px;
display: flex;
gap: 12px;
}
@@ -549,11 +551,6 @@ export function ansiLogToHTML(line) {
margin: 0 0 0 28px;
}
-.action-view-left, .action-view-right {
- padding-top: 12px;
- padding-bottom: 12px;
-}
-
/* ================ */
/* action view left */
@@ -767,6 +764,7 @@ export function ansiLogToHTML(line) {
background-color: var(--color-console-bg);
max-height: 100%;
border-radius: 0 0 var(--border-radius) var(--border-radius);
+ z-index: 0;
}
.job-step-container .job-step-summary {