{{if .IsRepo}}{{template "repo/header" .}}{{end}}
{{ctx.Locale.Tr "auth.has_unconfirmed_mail" .SignedUser.Name .SignedUser.Email}}
+
+
{{ctx.Locale.Tr "auth.change_unconfirmed_mail_address"}}
+
+
+
+
+
diff --git a/templates/user/dashboard/milestones.tmpl b/templates/user/dashboard/milestones.tmpl
index 1829021ff41..737a0f7e2b4 100644
--- a/templates/user/dashboard/milestones.tmpl
+++ b/templates/user/dashboard/milestones.tmpl
@@ -141,7 +141,7 @@
{{if .Content}}
- {{.RenderedContent|Str2html}}
+ {{.RenderedContent}}
{{end}}
diff --git a/templates/user/profile.tmpl b/templates/user/profile.tmpl
index 426b5f042a5..37590fc2fa7 100644
--- a/templates/user/profile.tmpl
+++ b/templates/user/profile.tmpl
@@ -29,7 +29,7 @@
{{else if eq .TabName "followers"}}
{{template "repo/user_cards" .}}
{{else if eq .TabName "overview"}}
- {{.ProfileReadme | Str2html}}
+ {{.ProfileReadme}}
{{else}}
{{template "explore/repo_search" .}}
{{template "explore/repo_list" .}}
diff --git a/templates/user/settings/keys.tmpl b/templates/user/settings/keys.tmpl
index 93037e7e282..a44bf500482 100644
--- a/templates/user/settings/keys.tmpl
+++ b/templates/user/settings/keys.tmpl
@@ -2,6 +2,8 @@
{{template "user/settings/keys_ssh" .}}
{{template "user/settings/keys_principal" .}}
+ {{if not ($.UserDisabledFeatures.Contains "manage_gpg_keys")}}
{{template "user/settings/keys_gpg" .}}
+ {{end}}
{{template "user/settings/layout_footer" .}}
diff --git a/tests/integration/api_repo_file_create_test.go b/tests/integration/api_repo_file_create_test.go
index 0d192a1fe84..41ad7211ff8 100644
--- a/tests/integration/api_repo_file_create_test.go
+++ b/tests/integration/api_repo_file_create_test.go
@@ -17,10 +17,10 @@ import (
repo_model "code.gitea.io/gitea/models/repo"
"code.gitea.io/gitea/models/unittest"
user_model "code.gitea.io/gitea/models/user"
- "code.gitea.io/gitea/modules/context"
"code.gitea.io/gitea/modules/gitrepo"
"code.gitea.io/gitea/modules/setting"
api "code.gitea.io/gitea/modules/structs"
+ "code.gitea.io/gitea/services/context"
"github.com/stretchr/testify/assert"
)
diff --git a/tests/integration/api_repo_file_update_test.go b/tests/integration/api_repo_file_update_test.go
index 195a1090c7c..ac28e0c0a26 100644
--- a/tests/integration/api_repo_file_update_test.go
+++ b/tests/integration/api_repo_file_update_test.go
@@ -16,10 +16,10 @@ import (
repo_model "code.gitea.io/gitea/models/repo"
"code.gitea.io/gitea/models/unittest"
user_model "code.gitea.io/gitea/models/user"
- "code.gitea.io/gitea/modules/context"
"code.gitea.io/gitea/modules/gitrepo"
"code.gitea.io/gitea/modules/setting"
api "code.gitea.io/gitea/modules/structs"
+ "code.gitea.io/gitea/services/context"
"github.com/stretchr/testify/assert"
)
diff --git a/tests/integration/api_repo_files_change_test.go b/tests/integration/api_repo_files_change_test.go
index ab5cf19a9c8..fb3ae5e4ddb 100644
--- a/tests/integration/api_repo_files_change_test.go
+++ b/tests/integration/api_repo_files_change_test.go
@@ -15,10 +15,10 @@ import (
repo_model "code.gitea.io/gitea/models/repo"
"code.gitea.io/gitea/models/unittest"
user_model "code.gitea.io/gitea/models/user"
- "code.gitea.io/gitea/modules/context"
"code.gitea.io/gitea/modules/gitrepo"
"code.gitea.io/gitea/modules/setting"
api "code.gitea.io/gitea/modules/structs"
+ "code.gitea.io/gitea/services/context"
"github.com/stretchr/testify/assert"
)
diff --git a/tests/integration/editor_test.go b/tests/integration/editor_test.go
index de2a9d7d23b..045567ce77c 100644
--- a/tests/integration/editor_test.go
+++ b/tests/integration/editor_test.go
@@ -10,8 +10,8 @@ import (
"path"
"testing"
- gitea_context "code.gitea.io/gitea/modules/context"
"code.gitea.io/gitea/modules/json"
+ gitea_context "code.gitea.io/gitea/services/context"
"github.com/stretchr/testify/assert"
)
diff --git a/tests/integration/explore_user_test.go b/tests/integration/explore_user_test.go
new file mode 100644
index 00000000000..046caf378ef
--- /dev/null
+++ b/tests/integration/explore_user_test.go
@@ -0,0 +1,44 @@
+// Copyright 2024 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package integration
+
+import (
+ "net/http"
+ "testing"
+
+ "code.gitea.io/gitea/tests"
+
+ "github.com/stretchr/testify/assert"
+)
+
+func TestExploreUser(t *testing.T) {
+ defer tests.PrepareTestEnv(t)()
+
+ cases := []struct{ sortOrder, expected string }{
+ {"", "/explore/users?sort=newest&q="},
+ {"newest", "/explore/users?sort=newest&q="},
+ {"oldest", "/explore/users?sort=oldest&q="},
+ {"alphabetically", "/explore/users?sort=alphabetically&q="},
+ {"reversealphabetically", "/explore/users?sort=reversealphabetically&q="},
+ }
+ for _, c := range cases {
+ req := NewRequest(t, "GET", "/explore/users?sort="+c.sortOrder)
+ resp := MakeRequest(t, req, http.StatusOK)
+ h := NewHTMLParser(t, resp.Body)
+ href, _ := h.Find(`.ui.dropdown .menu a.active.item[href^="/explore/users"]`).Attr("href")
+ assert.Equal(t, c.expected, href)
+ }
+
+ // these sort orders shouldn't be supported, to avoid leaking user activity
+ cases404 := []string{
+ "/explore/users?sort=lastlogin",
+ "/explore/users?sort=reverselastlogin",
+ "/explore/users?sort=leastupdate",
+ "/explore/users?sort=reverseleastupdate",
+ }
+ for _, c := range cases404 {
+ req := NewRequest(t, "GET", c).SetHeader("Accept", "text/html")
+ MakeRequest(t, req, http.StatusNotFound)
+ }
+}
diff --git a/tests/integration/git_test.go b/tests/integration/git_test.go
index 95350d79caa..818e1fa6535 100644
--- a/tests/integration/git_test.go
+++ b/tests/integration/git_test.go
@@ -24,12 +24,12 @@ import (
repo_model "code.gitea.io/gitea/models/repo"
"code.gitea.io/gitea/models/unittest"
user_model "code.gitea.io/gitea/models/user"
- gitea_context "code.gitea.io/gitea/modules/context"
"code.gitea.io/gitea/modules/git"
"code.gitea.io/gitea/modules/gitrepo"
"code.gitea.io/gitea/modules/lfs"
"code.gitea.io/gitea/modules/setting"
api "code.gitea.io/gitea/modules/structs"
+ gitea_context "code.gitea.io/gitea/services/context"
files_service "code.gitea.io/gitea/services/repository/files"
"code.gitea.io/gitea/tests"
diff --git a/tests/integration/integration_test.go b/tests/integration/integration_test.go
index 1127de1afcd..f9bd352b622 100644
--- a/tests/integration/integration_test.go
+++ b/tests/integration/integration_test.go
@@ -24,7 +24,6 @@ import (
"code.gitea.io/gitea/models/auth"
"code.gitea.io/gitea/models/unittest"
- gitea_context "code.gitea.io/gitea/modules/context"
"code.gitea.io/gitea/modules/graceful"
"code.gitea.io/gitea/modules/json"
"code.gitea.io/gitea/modules/log"
@@ -33,6 +32,7 @@ import (
"code.gitea.io/gitea/modules/util"
"code.gitea.io/gitea/modules/web"
"code.gitea.io/gitea/routers"
+ gitea_context "code.gitea.io/gitea/services/context"
"code.gitea.io/gitea/tests"
"github.com/PuerkitoBio/goquery"
diff --git a/tests/integration/mirror_pull_test.go b/tests/integration/mirror_pull_test.go
index 2e71b80fbb5..77050c4bbc1 100644
--- a/tests/integration/mirror_pull_test.go
+++ b/tests/integration/mirror_pull_test.go
@@ -14,7 +14,6 @@ import (
"code.gitea.io/gitea/modules/git"
"code.gitea.io/gitea/modules/gitrepo"
"code.gitea.io/gitea/modules/migration"
- "code.gitea.io/gitea/modules/repository"
mirror_service "code.gitea.io/gitea/services/mirror"
release_service "code.gitea.io/gitea/services/release"
repo_service "code.gitea.io/gitea/services/repository"
@@ -52,7 +51,7 @@ func TestMirrorPull(t *testing.T) {
ctx := context.Background()
- mirror, err := repository.MigrateRepositoryGitData(ctx, user, mirrorRepo, opts, nil)
+ mirror, err := repo_service.MigrateRepositoryGitData(ctx, user, mirrorRepo, opts, nil)
assert.NoError(t, err)
gitRepo, err := gitrepo.OpenRepository(git.DefaultContext, repo)
diff --git a/tests/integration/mirror_push_test.go b/tests/integration/mirror_push_test.go
index 3dc719593c3..1c262b33496 100644
--- a/tests/integration/mirror_push_test.go
+++ b/tests/integration/mirror_push_test.go
@@ -15,10 +15,10 @@ import (
repo_model "code.gitea.io/gitea/models/repo"
"code.gitea.io/gitea/models/unittest"
user_model "code.gitea.io/gitea/models/user"
- gitea_context "code.gitea.io/gitea/modules/context"
"code.gitea.io/gitea/modules/git"
"code.gitea.io/gitea/modules/gitrepo"
"code.gitea.io/gitea/modules/setting"
+ gitea_context "code.gitea.io/gitea/services/context"
"code.gitea.io/gitea/services/migrations"
mirror_service "code.gitea.io/gitea/services/mirror"
repo_service "code.gitea.io/gitea/services/repository"
diff --git a/tests/integration/repo_fork_test.go b/tests/integration/repo_fork_test.go
index 594fba67965..ca5d61ecc2a 100644
--- a/tests/integration/repo_fork_test.go
+++ b/tests/integration/repo_fork_test.go
@@ -29,14 +29,14 @@ func testRepoFork(t *testing.T, session *TestSession, ownerName, repoName, forkO
// Step2: click the fork button
htmlDoc := NewHTMLParser(t, resp.Body)
- link, exists := htmlDoc.doc.Find("a.ui.button[href^=\"/repo/fork/\"]").Attr("href")
+ link, exists := htmlDoc.doc.Find(`a.ui.button[href*="/fork"]`).Attr("href")
assert.True(t, exists, "The template has changed")
req = NewRequest(t, "GET", link)
resp = session.MakeRequest(t, req, http.StatusOK)
// Step3: fill the form of the forking
htmlDoc = NewHTMLParser(t, resp.Body)
- link, exists = htmlDoc.doc.Find("form.ui.form[action^=\"/repo/fork/\"]").Attr("action")
+ link, exists = htmlDoc.doc.Find(`form.ui.form[action*="/fork"]`).Attr("action")
assert.True(t, exists, "The template has changed")
_, exists = htmlDoc.doc.Find(fmt.Sprintf(".owner.dropdown .item[data-value=\"%d\"]", forkOwner.ID)).Attr("data-value")
assert.True(t, exists, fmt.Sprintf("Fork owner '%s' is not present in select box", forkOwnerName))
@@ -70,6 +70,6 @@ func TestRepoForkToOrg(t *testing.T) {
req := NewRequest(t, "GET", "/user2/repo1")
resp := session.MakeRequest(t, req, http.StatusOK)
htmlDoc := NewHTMLParser(t, resp.Body)
- _, exists := htmlDoc.doc.Find("a.ui.button[href^=\"/repo/fork/\"]").Attr("href")
+ _, exists := htmlDoc.doc.Find(`a.ui.button[href*="/fork"]`).Attr("href")
assert.False(t, exists, "Forking should not be allowed anymore")
}
diff --git a/tests/integration/repofiles_change_test.go b/tests/integration/repofiles_change_test.go
index 19fbd1754cc..49abeb83fb1 100644
--- a/tests/integration/repofiles_change_test.go
+++ b/tests/integration/repofiles_change_test.go
@@ -12,11 +12,11 @@ import (
repo_model "code.gitea.io/gitea/models/repo"
"code.gitea.io/gitea/models/unittest"
- "code.gitea.io/gitea/modules/contexttest"
"code.gitea.io/gitea/modules/git"
"code.gitea.io/gitea/modules/gitrepo"
"code.gitea.io/gitea/modules/setting"
api "code.gitea.io/gitea/modules/structs"
+ "code.gitea.io/gitea/services/contexttest"
files_service "code.gitea.io/gitea/services/repository/files"
"github.com/stretchr/testify/assert"
diff --git a/tests/integration/signup_test.go b/tests/integration/signup_test.go
index fbf586f6964..e9a05201eef 100644
--- a/tests/integration/signup_test.go
+++ b/tests/integration/signup_test.go
@@ -107,13 +107,25 @@ func TestSignupEmailActive(t *testing.T) {
resp := MakeRequest(t, req, http.StatusOK)
assert.Contains(t, resp.Body.String(), `A new confirmation email has been sent to email-1@example.com.`)
- // access "user/active" means trying to re-send the activation email
+ // access "user/activate" means trying to re-send the activation email
session := loginUserWithPassword(t, "test-user-1", "password1")
resp = session.MakeRequest(t, NewRequest(t, "GET", "/user/activate"), http.StatusOK)
assert.Contains(t, resp.Body.String(), "You have already requested an activation email recently")
- // access "user/active" with a valid activation code, then get the "verify password" page
+ // access anywhere else will see a "Activate Your Account" prompt, and there is a chance to change email
+ resp = session.MakeRequest(t, NewRequest(t, "GET", "/user/issues"), http.StatusOK)
+ assert.Contains(t, resp.Body.String(), ` .button,
.ui.basic.buttons .button,
.ui.basic.button,
diff --git a/web_src/css/themes/theme-gitea-dark.css b/web_src/css/themes/theme-gitea-dark.css
index bac002e3db5..ac77b7bbd94 100644
--- a/web_src/css/themes/theme-gitea-dark.css
+++ b/web_src/css/themes/theme-gitea-dark.css
@@ -3,72 +3,72 @@
:root {
--is-dark-theme: true;
- --color-primary: #87ab63;
+ --color-primary: #4183c4;
--color-primary-contrast: #ffffff;
- --color-primary-dark-1: #93b373;
- --color-primary-dark-2: #9fbc82;
- --color-primary-dark-3: #abc492;
- --color-primary-dark-4: #b7cda1;
- --color-primary-dark-5: #cfddc1;
- --color-primary-dark-6: #e7eee0;
- --color-primary-dark-7: #f8faf6;
- --color-primary-light-1: #7a9e55;
- --color-primary-light-2: #6c8c4c;
- --color-primary-light-3: #5f7b42;
- --color-primary-light-4: #516939;
- --color-primary-light-5: #364626;
- --color-primary-light-6: #1b2313;
- --color-primary-light-7: #080b06;
- --color-primary-alpha-10: #87ab6319;
- --color-primary-alpha-20: #87ab6333;
- --color-primary-alpha-30: #87ab634b;
- --color-primary-alpha-40: #87ab6366;
- --color-primary-alpha-50: #87ab6380;
- --color-primary-alpha-60: #87ab6399;
- --color-primary-alpha-70: #87ab63b3;
- --color-primary-alpha-80: #87ab63cc;
- --color-primary-alpha-90: #87ab63e1;
+ --color-primary-dark-1: #548fca;
+ --color-primary-dark-2: #679cd0;
+ --color-primary-dark-3: #7aa8d6;
+ --color-primary-dark-4: #8db5dc;
+ --color-primary-dark-5: #b3cde7;
+ --color-primary-dark-6: #d9e6f3;
+ --color-primary-dark-7: #f4f8fb;
+ --color-primary-light-1: #3876b3;
+ --color-primary-light-2: #31699f;
+ --color-primary-light-3: #2b5c8b;
+ --color-primary-light-4: #254f77;
+ --color-primary-light-5: #193450;
+ --color-primary-light-6: #0c1a28;
+ --color-primary-light-7: #04080c;
+ --color-primary-alpha-10: #4183c419;
+ --color-primary-alpha-20: #4183c433;
+ --color-primary-alpha-30: #4183c44b;
+ --color-primary-alpha-40: #4183c466;
+ --color-primary-alpha-50: #4183c480;
+ --color-primary-alpha-60: #4183c499;
+ --color-primary-alpha-70: #4183c4b3;
+ --color-primary-alpha-80: #4183c4cc;
+ --color-primary-alpha-90: #4183c4e1;
--color-primary-hover: var(--color-primary-light-1);
--color-primary-active: var(--color-primary-light-2);
- --color-secondary: #525767;
- --color-secondary-dark-1: #5c6374;
- --color-secondary-dark-2: #666e81;
- --color-secondary-dark-3: #7c8497;
- --color-secondary-dark-4: #8990a1;
- --color-secondary-dark-5: #959cab;
- --color-secondary-dark-6: #a2a8b5;
- --color-secondary-dark-7: #afb4c0;
- --color-secondary-dark-8: #bcc0ca;
- --color-secondary-dark-9: #c9cbd4;
- --color-secondary-dark-10: #d6d7de;
- --color-secondary-dark-11: #e2e3e8;
- --color-secondary-dark-12: #eeeff2;
- --color-secondary-dark-13: #fbfbfc;
- --color-secondary-light-1: #454a57;
- --color-secondary-light-2: #383c47;
- --color-secondary-light-3: #2c2f37;
- --color-secondary-light-4: #1f2226;
- --color-secondary-alpha-10: #52576719;
- --color-secondary-alpha-20: #52576733;
- --color-secondary-alpha-30: #5257674b;
- --color-secondary-alpha-40: #52576766;
- --color-secondary-alpha-50: #52576780;
- --color-secondary-alpha-60: #52576799;
- --color-secondary-alpha-70: #525767b3;
- --color-secondary-alpha-80: #525767cc;
- --color-secondary-alpha-90: #525767e1;
+ --color-secondary: #3f4346;
+ --color-secondary-dark-1: #464a4d;
+ --color-secondary-dark-2: #4f5356;
+ --color-secondary-dark-3: #5f6366;
+ --color-secondary-dark-4: #72767a;
+ --color-secondary-dark-5: #7f8488;
+ --color-secondary-dark-6: #8d9297;
+ --color-secondary-dark-7: #999ea3;
+ --color-secondary-dark-8: #a6abaf;
+ --color-secondary-dark-9: #aeb3b8;
+ --color-secondary-dark-10: #babfc4;
+ --color-secondary-dark-11: #c5cbd0;
+ --color-secondary-dark-12: #ced4da;
+ --color-secondary-dark-13: #d1d7dd;
+ --color-secondary-light-1: #313538;
+ --color-secondary-light-2: #272b2e;
+ --color-secondary-light-3: #1e2225;
+ --color-secondary-light-4: #171b1e;
+ --color-secondary-alpha-10: #3f434619;
+ --color-secondary-alpha-20: #3f434633;
+ --color-secondary-alpha-30: #3f43464b;
+ --color-secondary-alpha-40: #3f434666;
+ --color-secondary-alpha-50: #3f434680;
+ --color-secondary-alpha-60: #3f434699;
+ --color-secondary-alpha-70: #3f4346b3;
+ --color-secondary-alpha-80: #3f4346cc;
+ --color-secondary-alpha-90: #3f4346e1;
--color-secondary-button: var(--color-secondary-dark-4);
--color-secondary-hover: var(--color-secondary-dark-3);
--color-secondary-active: var(--color-secondary-dark-2);
/* console colors - used for actions console and console files */
- --color-console-fg: #eeeff2;
- --color-console-fg-subtle: #959cab;
- --color-console-bg: #262936;
- --color-console-border: #383c47;
+ --color-console-fg: #d9dde2;
+ --color-console-fg-subtle: #95989c;
+ --color-console-bg: #1c2023;
+ --color-console-border: #272b2e;
--color-console-hover-bg: #ffffff16;
- --color-console-active-bg: #454a57;
- --color-console-menu-bg: #383c47;
- --color-console-menu-border: #5c6374;
+ --color-console-active-bg: #313538;
+ --color-console-menu-bg: #272b2e;
+ --color-console-menu-border: #464a4d;
/* named colors */
--color-red: #cc4848;
--color-orange: #cc580c;
@@ -81,7 +81,7 @@
--color-purple: #b259d0;
--color-pink: #d22e8b;
--color-brown: #a47252;
- --color-black: #2e323e;
+ --color-black: #1f2326;
/* light variants - produced via Sass scale-color(color, $lightness: +10%) */
--color-red-light: #d15a5a;
--color-orange-light: #f6a066;
@@ -94,7 +94,7 @@
--color-purple-light: #ba6ad5;
--color-pink-light: #d74397;
--color-brown-light: #b08061;
- --color-black-light: #3f4555;
+ --color-black-light: #46494d;
/* dark 1 variants - produced via Sass scale-color(color, $lightness: -10%) */
--color-red-dark-1: #c23636;
--color-orange-dark-1: #f38236;
@@ -107,7 +107,7 @@
--color-purple-dark-1: #a742c9;
--color-pink-dark-1: #be297d;
--color-brown-dark-1: #94674a;
- --color-black-dark-1: #292d38;
+ --color-black-dark-1: #2c2f35;
/* dark 2 variants - produced via Sass scale-color(color, $lightness: -20%) */
--color-red-dark-2: #ad3030;
--color-orange-dark-2: #f16e17;
@@ -120,7 +120,7 @@
--color-purple-dark-2: #9834b9;
--color-pink-dark-2: #a9246f;
--color-brown-dark-2: #835b42;
- --color-black-dark-2: #252832;
+ --color-black-dark-2: #292a2e;
/* ansi colors used for actions console and console files */
--color-ansi-black: var(--color-black);
--color-ansi-red: var(--color-red);
@@ -139,8 +139,8 @@
--color-ansi-bright-cyan: var(--color-teal-light);
--color-ansi-bright-white: var(--color-console-fg);
/* other colors */
- --color-grey: #505665;
- --color-grey-light: #a1a6b7;
+ --color-grey: #3c4043;
+ --color-grey-light: #898e92;
--color-gold: #b1983b;
--color-white: #ffffff;
--color-diff-removed-word-bg: #6f3333;
@@ -151,7 +151,7 @@
--color-diff-removed-row-border: #634343;
--color-diff-moved-row-border: #bcca6f;
--color-diff-added-row-border: #314a37;
- --color-diff-inactive: #353846;
+ --color-diff-inactive: #24282b;
--color-error-border: #a04141;
--color-error-bg: #522;
--color-error-bg-active: #744;
@@ -180,40 +180,40 @@
--color-orange-badge-hover-bg: #f2711c4d;
--color-git: #f05133;
/* target-based colors */
- --color-body: #2e323e;
- --color-box-header: #303340;
- --color-box-body: #222733;
- --color-box-body-highlight: #262b36;
- --color-text-dark: #dbe0ea;
- --color-text: #cbd0da;
- --color-text-light: #bbbfca;
- --color-text-light-1: #aaafb9;
- --color-text-light-2: #9a9ea9;
- --color-text-light-3: #8a8e99;
- --color-footer: #232834;
- --color-timeline: #4c525e;
- --color-input-text: #dfe3ec;
- --color-input-background: #1e252e;
- --color-input-toggle-background: #454a57;
+ --color-body: #1f2326;
+ --color-box-header: #202427;
+ --color-box-body: #191d20;
+ --color-box-body-highlight: #1d2124;
+ --color-text-dark: #f8f8f9;
+ --color-text: #ced2d5;
+ --color-text-light: #bec4c8;
+ --color-text-light-1: #acb3b8;
+ --color-text-light-2: #8d969c;
+ --color-text-light-3: #747f87;
+ --color-footer: var(--color-nav-bg);
+ --color-timeline: #383c3f;
+ --color-input-text: var(--color-text-dark);
+ --color-input-background: #161a1d;
+ --color-input-toggle-background: #313538;
--color-input-border: var(--color-secondary);
--color-input-border-hover: var(--color-secondary-dark-1);
- --color-header-wrapper: #202430;
+ --color-header-wrapper: #191d20;
--color-light: #00000028;
--color-light-mimic-enabled: rgba(0, 0, 0, calc(40 / 255 * 222 / 255 / var(--opacity-disabled)));
--color-light-border: #ffffff28;
--color-hover: #ffffff19;
--color-active: #ffffff24;
- --color-menu: #1e252e;
- --color-card: #1e252e;
+ --color-menu: #161a1d;
+ --color-card: #161a1d;
--color-markup-table-row: #ffffff06;
--color-markup-code-block: #ffffff16;
- --color-button: #1e252e;
- --color-code-bg: #222733;
- --color-code-sidebar-bg: #232834;
+ --color-button: #161a1d;
+ --color-code-bg: #191d20;
+ --color-code-sidebar-bg: #1b1f22;
--color-shadow: #00000058;
- --color-secondary-bg: #2a2e3a;
- --color-expand-button: #3c404d;
- --color-placeholder-text: #8a8e99;
+ --color-secondary-bg: #2f3135;
+ --color-expand-button: #414348;
+ --color-placeholder-text: var(--color-text-light-3);
--color-editor-line-highlight: var(--color-primary-light-5);
--color-project-board-bg: var(--color-secondary-light-2);
--color-project-board-dark-label: #111111;
@@ -224,13 +224,13 @@
--color-reaction-active-bg: var(--color-primary-light-5);
--color-tooltip-text: #ffffff;
--color-tooltip-bg: #000000f0;
- --color-nav-bg: #232834;
- --color-nav-hover-bg: #383c47;
+ --color-nav-bg: #1b1f22;
+ --color-nav-hover-bg: #272b2e;
--color-nav-text: var(--color-text);
- --color-label-text: #dfe3ec;
- --color-label-bg: #7c84974b;
- --color-label-hover-bg: #7c8497a0;
- --color-label-active-bg: #7c8497ff;
+ --color-label-text: var(--color-text);
+ --color-label-bg: #7a7f834b;
+ --color-label-hover-bg: #7a7f83a0;
+ --color-label-active-bg: #7a7f83ff;
--color-accent: var(--color-primary-light-1);
--color-small-accent: var(--color-primary-light-5);
--color-active-line: #534d1b;
diff --git a/web_src/css/themes/theme-gitea-light.css b/web_src/css/themes/theme-gitea-light.css
index ca5d15cd25b..5c375712d84 100644
--- a/web_src/css/themes/theme-gitea-light.css
+++ b/web_src/css/themes/theme-gitea-light.css
@@ -190,9 +190,9 @@
--color-text-light-1: #6a6a6a;
--color-text-light-2: #808080;
--color-text-light-3: #a0a0a0;
- --color-footer: #ffffff;
+ --color-footer: var(--color-nav-bg);
--color-timeline: #ececec;
- --color-input-text: #212121;
+ --color-input-text: var(--color-text-dark);
--color-input-background: #fafafa;
--color-input-toggle-background: #dedede;
--color-input-border: var(--color-secondary);
@@ -213,7 +213,7 @@
--color-shadow: #00000026;
--color-secondary-bg: #f4f4f4;
--color-expand-button: #d8efff;
- --color-placeholder-text: #aaa;
+ --color-placeholder-text: var(--color-text-light-3);
--color-editor-line-highlight: var(--color-primary-light-6);
--color-project-board-bg: var(--color-secondary-light-4);
--color-project-board-dark-label: #111111;
@@ -227,7 +227,7 @@
--color-nav-bg: #ffffff;
--color-nav-hover-bg: #ebebeb;
--color-nav-text: var(--color-text);
- --color-label-text: #232323;
+ --color-label-text: var(--color-text);
--color-label-bg: #cacaca5b;
--color-label-hover-bg: #cacacaa0;
--color-label-active-bg: #cacacaff;
diff --git a/web_src/js/bootstrap.js b/web_src/js/bootstrap.js
index e46c91e5e6d..c0047b0ac24 100644
--- a/web_src/js/bootstrap.js
+++ b/web_src/js/bootstrap.js
@@ -1,5 +1,6 @@
// DO NOT IMPORT window.config HERE!
-// to make sure the error handler always works, we should never import `window.config`, because some user's custom template breaks it.
+// to make sure the error handler always works, we should never import `window.config`, because
+// some user's custom template breaks it.
// This sets up the URL prefix used in webpack's chunk loading.
// This file must be imported before any lazy-loading is being attempted.
@@ -26,29 +27,42 @@ export function showGlobalErrorMessage(msg) {
}
/**
- * @param {ErrorEvent} e
+ * @param {ErrorEvent|PromiseRejectionEvent} event - Event
+ * @param {string} event.message - Only present on ErrorEvent
+ * @param {string} event.error - Only present on ErrorEvent
+ * @param {string} event.type - Only present on ErrorEvent
+ * @param {string} event.filename - Only present on ErrorEvent
+ * @param {number} event.lineno - Only present on ErrorEvent
+ * @param {number} event.colno - Only present on ErrorEvent
+ * @param {string} event.reason - Only present on PromiseRejectionEvent
+ * @param {number} event.promise - Only present on PromiseRejectionEvent
*/
-function processWindowErrorEvent(e) {
- const err = e.error ?? e.reason;
+function processWindowErrorEvent({error, reason, message, type, filename, lineno, colno}) {
+ const err = error ?? reason;
const assetBaseUrl = String(new URL(__webpack_public_path__, window.location.origin));
+ const {runModeIsProd} = window.config ?? {};
- // error is likely from browser extension or inline script. Do not show these in production builds.
- if (!err.stack?.includes(assetBaseUrl) && window.config?.runModeIsProd) return;
-
- let message;
- if (e.type === 'unhandledrejection') {
- message = `JavaScript promise rejection: ${err.message}.`;
- } else {
- message = `JavaScript error: ${e.message} (${e.filename} @ ${e.lineno}:${e.colno}).`;
+ // `error` and `reason` are not guaranteed to be errors. If the value is falsy, it is likly a
+ // non-critical event from the browser. We log them but don't show them to users. Examples:
+ // - https://developer.mozilla.org/en-US/docs/Web/API/ResizeObserver#observation_errors
+ // - https://github.com/mozilla-mobile/firefox-ios/issues/10817
+ // - https://github.com/go-gitea/gitea/issues/20240
+ if (!err) {
+ if (message) console.error(new Error(message));
+ if (runModeIsProd) return;
}
- if (!e.error && e.lineno === 0 && e.colno === 0 && e.filename === '' && window.navigator.userAgent.includes('FxiOS/')) {
- // At the moment, Firefox (iOS) (10x) has an engine bug. See https://github.com/go-gitea/gitea/issues/20240
- // If a script inserts a newly created (and content changed) element into DOM, there will be a nonsense error event reporting: Script error: line 0, col 0.
- return; // ignore such nonsense error event
+ // If the error stack trace does not include the base URL of our script assets, it likely came
+ // from a browser extension or inline script. Do not show such errors in production.
+ if (err instanceof Error && !err.stack?.includes(assetBaseUrl) && runModeIsProd) {
+ return;
}
- showGlobalErrorMessage(`${message} Open browser console to see more details.`);
+ let msg = err?.message ?? message;
+ if (lineno) msg += ` (${filename} @ ${lineno}:${colno})`;
+ const dot = msg.endsWith('.') ? '' : '.';
+ const renderedType = type === 'unhandledrejection' ? 'promise rejection' : type;
+ showGlobalErrorMessage(`JavaScript ${renderedType}: ${msg}${dot} Open browser console to see more details.`);
}
function initGlobalErrorHandler() {
@@ -59,13 +73,14 @@ function initGlobalErrorHandler() {
if (!window.config) {
showGlobalErrorMessage(`Gitea JavaScript code couldn't run correctly, please check your custom templates`);
}
- // we added an event handler for window error at the very beginning of