link-action
@@ -17,29 +16,20 @@
-
{{template "devtest/devtest-footer"}}
diff --git a/templates/devtest/form-fields.tmpl b/templates/devtest/form-fields.tmpl
new file mode 100644
index 00000000000..ee6df2e813f
--- /dev/null
+++ b/templates/devtest/form-fields.tmpl
@@ -0,0 +1,109 @@
+{{template "devtest/devtest-header"}}
+
form-fetch-action
Use "window.fetch" to send a form request to backend
-
-
+
+
+{{template "devtest/devtest-footer"}}
diff --git a/templates/devtest/toast.tmpl b/templates/devtest/toast-and-message.tmpl
similarity index 96%
rename from templates/devtest/toast.tmpl
rename to templates/devtest/toast-and-message.tmpl
index 597b4154695..c4056b6fc6b 100644
--- a/templates/devtest/toast.tmpl
+++ b/templates/devtest/toast-and-message.tmpl
@@ -1,5 +1,5 @@
{{template "devtest/devtest-header"}}
-
+
Toast
diff --git a/templates/install.tmpl b/templates/install.tmpl
index 45f14d5c575..bc6fed08e95 100644
--- a/templates/install.tmpl
+++ b/templates/install.tmpl
@@ -117,7 +117,7 @@
{{ctx.Locale.Tr "install.lfs_path_helper"}}
-
+
{{else if eq .Type 7}}
diff --git a/tests/integration/api_repo_compare_test.go b/tests/integration/api_repo_compare_test.go
index 9565e4d2090..8aa0035b0a9 100644
--- a/tests/integration/api_repo_compare_test.go
+++ b/tests/integration/api_repo_compare_test.go
@@ -5,46 +5,60 @@ package integration
import (
"net/http"
+ "net/url"
"testing"
auth_model "code.gitea.io/gitea/models/auth"
+ repo_model "code.gitea.io/gitea/models/repo"
"code.gitea.io/gitea/models/unittest"
user_model "code.gitea.io/gitea/models/user"
api "code.gitea.io/gitea/modules/structs"
"code.gitea.io/gitea/tests"
"github.com/stretchr/testify/assert"
+ "github.com/stretchr/testify/require"
)
func TestAPICompareBranches(t *testing.T) {
- defer tests.PrepareTestEnv(t)()
+ onGiteaRun(t, func(t *testing.T, _ *url.URL) {
+ session2 := loginUser(t, "user2")
+ token2 := getTokenForLoggedInUser(t, session2, auth_model.AccessTokenScopeWriteRepository)
- user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
- // Login as User2.
- session := loginUser(t, user.Name)
- token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteRepository)
+ t.Run("CompareBranches", func(t *testing.T) {
+ defer tests.PrintCurrentTest(t)()
- t.Run("CompareBranches", func(t *testing.T) {
- defer tests.PrintCurrentTest(t)()
- req := NewRequestf(t, "GET", "/api/v1/repos/user2/repo20/compare/add-csv...remove-files-b").AddTokenAuth(token)
- resp := MakeRequest(t, req, http.StatusOK)
+ req := NewRequestf(t, "GET", "/api/v1/repos/user2/repo20/compare/add-csv...remove-files-b").AddTokenAuth(token2)
+ resp := MakeRequest(t, req, http.StatusOK)
+ apiResp := DecodeJSON(t, resp, &api.Compare{})
+ assert.Equal(t, 2, apiResp.TotalCommits)
+ assert.Len(t, apiResp.Commits, 2)
+ })
- var apiResp *api.Compare
- DecodeJSON(t, resp, &apiResp)
+ t.Run("CompareCommits", func(t *testing.T) {
+ defer tests.PrintCurrentTest(t)()
- assert.Equal(t, 2, apiResp.TotalCommits)
- assert.Len(t, apiResp.Commits, 2)
- })
+ req := NewRequestf(t, "GET", "/api/v1/repos/user2/repo20/compare/808038d2f71b0ab02099...c8e31bc7688741a5287f").AddTokenAuth(token2)
+ resp := MakeRequest(t, req, http.StatusOK)
+ apiResp := DecodeJSON(t, resp, &api.Compare{})
+ assert.Equal(t, 1, apiResp.TotalCommits)
+ assert.Len(t, apiResp.Commits, 1)
+ })
- t.Run("CompareCommits", func(t *testing.T) {
- defer tests.PrintCurrentTest(t)()
- req := NewRequestf(t, "GET", "/api/v1/repos/user2/repo20/compare/808038d2f71b0ab02099...c8e31bc7688741a5287f").AddTokenAuth(token)
- resp := MakeRequest(t, req, http.StatusOK)
+ t.Run("CompareForkOnlyCommit", func(t *testing.T) {
+ defer tests.PrintCurrentTest(t)()
- var apiResp *api.Compare
- DecodeJSON(t, resp, &apiResp)
+ user13 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 13})
+ repo11 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 11})
+ user13Sess := loginUser(t, "user13")
+ user13Token := getTokenForLoggedInUser(t, user13Sess, auth_model.AccessTokenScopeWriteRepository)
- assert.Equal(t, 1, apiResp.TotalCommits)
- assert.Len(t, apiResp.Commits, 1)
+ _, err := createFileInBranch(user13, repo11, createFileInBranchOptions{OldBranch: "master", NewBranch: "new-branch"}, map[string]string{"file.txt": "content"})
+ require.NoError(t, err)
+ req := NewRequestf(t, "GET", "/api/v1/repos/user12/repo10/compare/master...user13:new-branch").AddTokenAuth(user13Token)
+ resp := MakeRequest(t, req, http.StatusOK)
+ apiResp := DecodeJSON(t, resp, &api.Compare{})
+ assert.Equal(t, 1, apiResp.TotalCommits)
+ assert.Len(t, apiResp.Commits, 1)
+ })
})
}
diff --git a/tests/integration/pull_merge_test.go b/tests/integration/pull_merge_test.go
index 53709e6ff4b..d0213962ee7 100644
--- a/tests/integration/pull_merge_test.go
+++ b/tests/integration/pull_merge_test.go
@@ -317,9 +317,8 @@ func TestPullCleanUpAfterMerge(t *testing.T) {
resp = session.MakeRequest(t, req, http.StatusOK)
htmlDoc := NewHTMLParser(t, resp.Body)
- resultMsg := htmlDoc.doc.Find(".ui.message>p").Text()
-
- assert.Equal(t, "Branch \"user1/repo1:feature/test\" has been deleted.", resultMsg)
+ resultMsg := strings.TrimSpace(htmlDoc.doc.Find(".ui.message.flash-message").Text())
+ assert.Equal(t, `Branch "user1/repo1:feature/test" has been deleted.`, resultMsg)
})
}
diff --git a/tests/integration/signin_test.go b/tests/integration/signin_test.go
index ff35baae9db..4000c7ebe1d 100644
--- a/tests/integration/signin_test.go
+++ b/tests/integration/signin_test.go
@@ -36,8 +36,7 @@ func testLoginFailed(t *testing.T, username, password, message string) {
resp := session.MakeRequest(t, req, http.StatusOK)
htmlDoc := NewHTMLParser(t, resp.Body)
- resultMsg := htmlDoc.doc.Find(".ui.message>p").Text()
-
+ resultMsg := strings.TrimSpace(htmlDoc.doc.Find(".ui.message.flash-message").Text())
assert.Equal(t, message, resultMsg)
}
diff --git a/tests/integration/user_settings_test.go b/tests/integration/user_settings_test.go
index 20c758dc85a..b3527dd467a 100644
--- a/tests/integration/user_settings_test.go
+++ b/tests/integration/user_settings_test.go
@@ -5,6 +5,7 @@ package integration
import (
"net/http"
+ "strings"
"testing"
"code.gitea.io/gitea/modules/container"
@@ -309,8 +310,7 @@ func TestUserSettingsApplications(t *testing.T) {
})
resp := session.MakeRequest(t, req, http.StatusOK)
doc := NewHTMLParser(t, resp.Body)
-
- msg := doc.Find(".flash-error p").Text()
+ msg := strings.TrimSpace(doc.Find(".ui.message.flash-message").Text())
assert.Equal(t, `form.RedirectURIs"ftp://127.0.0.1" is not a valid URL.`, msg)
})
diff --git a/web_src/css/actions.css b/web_src/css/actions.css
index c43ebe21a05..14cf65f273d 100644
--- a/web_src/css/actions.css
+++ b/web_src/css/actions.css
@@ -6,14 +6,6 @@
overflow-x: auto;
}
-.runner-container .runner-new-text {
- color: var(--color-white);
-}
-
-.runner-container #runner-new:hover .runner-new-text {
- color: var(--color-white) !important;
-}
-
.runner-container .task-status-success {
background-color: var(--color-green);
color: var(--color-white);
diff --git a/web_src/css/base.css b/web_src/css/base.css
index a8d9dea2a25..4448af68e0c 100644
--- a/web_src/css/base.css
+++ b/web_src/css/base.css
@@ -431,8 +431,9 @@ img.ui.avatar,
margin-top: calc(var(--page-spacing) - 1rem);
}
-.ui .message.flash-message {
- text-align: center;
+.ui.message.flash-message pre {
+ white-space: pre-line;
+ margin: 0;
}
.ui .header > i + .content {
@@ -643,10 +644,6 @@ overflow-menu .ui.label {
color: var(--color-primary-contrast);
}
-.archived-icon {
- color: var(--color-secondary-dark-2) !important;
-}
-
.oauth2-authorize-application-box {
margin-top: 3em !important;
}
@@ -670,10 +667,6 @@ overflow-menu .ui.label {
min-width: 50px;
}
-.lines-num span.bottom-line::after {
- border-bottom: 1px solid var(--color-secondary);
-}
-
.lines-num span::after {
content: attr(data-line-number);
line-height: var(--line-height-code) !important;
@@ -783,11 +776,6 @@ tr.top-line-blame:first-of-type {
border-top: none; /* merge code lines belonging to the same commit into one block */
}
-.lines-code .bottom-line,
-.lines-commit .bottom-line {
- border-bottom: 1px solid var(--color-secondary);
-}
-
.migrate .svg.gitea-git {
color: var(--color-git);
}
@@ -878,6 +866,13 @@ table th[data-sortt-desc] .svg {
align-items: stretch;
}
+/* can be used to replace "ui relaxed list" or "tw-flex tw-flex-col tw-gap-xxx" when we need more flexible layout */
+.flex-relaxed-list {
+ display: flex;
+ flex-direction: column;
+ gap: var(--gap-block);
+}
+
.ui.list.flex-items-block > .item,
.ui.vertical.menu.flex-items-block > .item,
.ui.form .field > label.flex-text-block, /* override fomantic "block" style */
diff --git a/web_src/css/devtest.css b/web_src/css/devtest.css
index a7b00e1e561..c344d99058b 100644
--- a/web_src/css/devtest.css
+++ b/web_src/css/devtest.css
@@ -1,3 +1,8 @@
+h1, h2 {
+ margin: 0;
+ padding: 10px 0;
+}
+
.button-sample-groups {
margin: 0; padding: 0;
}
@@ -10,7 +15,6 @@
margin-bottom: 5px;
}
-h1, h2 {
- margin: 0;
- padding: 10px 0;
+.fetch-action-demo-forms .form-fetch-action {
+ border: 1px red dashed; /* show the border for demo purpose */
}
diff --git a/web_src/css/markup/asciicast.css b/web_src/css/markup/asciicast.css
index 89696bc7105..a45daaa8e8b 100644
--- a/web_src/css/markup/asciicast.css
+++ b/web_src/css/markup/asciicast.css
@@ -3,6 +3,8 @@
height: auto;
}
-.ap-terminal {
+/* Related: https://github.com/asciinema/asciinema-player/blob/develop/src/components/Terminal.js :
{{ctx.Locale.Tr "install.run_user_helper"}}
diff --git a/templates/repo/commit_page.tmpl b/templates/repo/commit_page.tmpl
index 179f6018d3d..8451a6f3cf1 100644
--- a/templates/repo/commit_page.tmpl
+++ b/templates/repo/commit_page.tmpl
@@ -195,7 +195,7 @@
{{DateUtils.TimeSince .NoteCommit.Author.When}}
-
{{end}}
diff --git a/templates/repo/issue/view_content/comments.tmpl b/templates/repo/issue/view_content/comments.tmpl
index 8c08f1c1f1c..6a67ef754d7 100644
--- a/templates/repo/issue/view_content/comments.tmpl
+++ b/templates/repo/issue/view_content/comments.tmpl
@@ -164,7 +164,7 @@
{{.NoteRendered | SanitizeHTML}}
+ {{.NoteRendered}}
{{svg "octicon-git-commit"}}
{{/* the content is a link like message title (from CreateRefComment) */}}
- {{.Content | SanitizeHTML}}
+ {{.GetSanitizedContentHTML}}
+Old PR: Fix UI regression of asciinema player https://github.com/go-gitea/gitea/pull/26159 */
+.ap-term {
overflow: hidden !important;
}
diff --git a/web_src/css/markup/content.css b/web_src/css/markup/content.css
index e7a967a7c64..efa6947ef14 100644
--- a/web_src/css/markup/content.css
+++ b/web_src/css/markup/content.css
@@ -154,12 +154,6 @@ In markup content, we always use bottom margin for all elements */
padding-inline-start: 2em;
}
-.markup ul.no-list,
-.markup ol.no-list {
- padding: 0;
- list-style-type: none;
-}
-
.markup .task-list-item {
list-style-type: none;
}
@@ -357,69 +351,6 @@ html[data-gitea-theme-dark="false"] .markup img[src*="#gh-dark-mode-only"] {
color: var(--color-text);
}
-.markup span.align-center {
- display: block;
- overflow: hidden;
- clear: both;
-}
-
-.markup span.align-center > span {
- display: block;
- margin: 13px auto 0;
- overflow: hidden;
- text-align: center;
-}
-
-.markup span.align-center span img,
-.markup span.align-center span video {
- margin: 0 auto;
- text-align: center;
-}
-
-.markup span.align-right {
- display: block;
- overflow: hidden;
- clear: both;
-}
-
-.markup span.align-right > span {
- display: block;
- margin: 13px 0 0;
- overflow: hidden;
- text-align: right;
-}
-
-.markup span.align-right span img,
-.markup span.align-right span video {
- margin: 0;
- text-align: right;
-}
-
-.markup span.float-left {
- display: block;
- float: left;
- margin-inline-end: 13px;
- overflow: hidden;
-}
-
-.markup span.float-left span {
- margin: 13px 0 0;
-}
-
-.markup span.float-right {
- display: block;
- float: right;
- margin-inline-start: 13px;
- overflow: hidden;
-}
-
-.markup span.float-right > span {
- display: block;
- margin: 13px auto 0;
- overflow: hidden;
- text-align: right;
-}
-
.markup code,
.markup tt {
padding: 0.2em 0.4em;
diff --git a/web_src/css/modules/form.css b/web_src/css/modules/form.css
index 2d315786c6f..2999f64cf6b 100644
--- a/web_src/css/modules/form.css
+++ b/web_src/css/modules/form.css
@@ -99,6 +99,13 @@ textarea:focus,
color: var(--color-input-text);
}
+.ui.form input:not([type="checkbox"], [type="radio"])[readonly],
+.ui.form textarea[readonly],
+.ui.form select[readonly],
+.ui.form .ui.selection.dropdown[readonly] {
+ background: var(--color-secondary-bg);
+}
+
.ui.input {
color: var(--color-input-text);
}
@@ -198,7 +205,6 @@ textarea:focus,
background-color: var(--color-error-bg);
border-color: var(--color-error-border);
color: var(--color-error-text);
- border-radius: 0;
}
.ui.form .field.error textarea:focus,
.ui.form .field.error select:focus,
diff --git a/web_src/css/modules/modal.css b/web_src/css/modules/modal.css
index 5d686746cbe..d45e54b947b 100644
--- a/web_src/css/modules/modal.css
+++ b/web_src/css/modules/modal.css
@@ -159,19 +159,11 @@
display: block;
}
-.scrolling.dimmable.dimmed {
- overflow: hidden;
-}
-
.scrolling.dimmable > .dimmer {
justify-content: flex-start;
position: fixed;
}
-.scrolling.dimmable.dimmed > .dimmer {
- overflow: auto;
-}
-
.modals.dimmer .ui.scrolling.modal {
margin: 2rem auto;
}
diff --git a/web_src/css/repo.css b/web_src/css/repo.css
index 95d6ca21695..923aef04ba4 100644
--- a/web_src/css/repo.css
+++ b/web_src/css/repo.css
@@ -287,10 +287,6 @@ td .commit-summary {
min-width: 100px;
}
-.repository.view.issue .instruct-toggle {
- display: inline-block;
-}
-
/* issue title & meta & edit */
.issue-title-header {
width: 100%;
@@ -1463,11 +1459,6 @@ tbody.commit-list {
}
}
-.commit-list .commit-status-link {
- display: inline-block;
- vertical-align: middle;
-}
-
.commit-body {
margin: 0.25em 0;
white-space: pre-wrap;