From fd1967c3a49e1945a456a53a60b17dfd7fa899ec Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Wed, 24 May 2023 15:05:50 +0900 Subject: [PATCH 01/31] =?UTF-8?q?Fix=20can=E2=80=99t=20move=20anymore=20it?= =?UTF-8?q?ems=20in=20repo=20project=20boards=20(#24892)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix #24879 Related to #24589 In #24589, I changed the css, but didn't reflect the changes in repo-level projects template. --- templates/repo/projects/view.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/repo/projects/view.tmpl b/templates/repo/projects/view.tmpl index 73548701d4..f297470d25 100644 --- a/templates/repo/projects/view.tmpl +++ b/templates/repo/projects/view.tmpl @@ -77,7 +77,7 @@
-
+
{{range $board := .Boards}}
From 37895b61c0ea6594dc562f0058429418c48eb339 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Wed, 24 May 2023 14:21:39 +0800 Subject: [PATCH 02/31] Rename docs packages title from xxx Packages Repository -> xxx Package Registry (#24895) As title. --- docs/content/doc/usage/packages/alpine.en-us.md | 4 ++-- docs/content/doc/usage/packages/cargo.en-us.md | 4 ++-- docs/content/doc/usage/packages/chef.en-us.md | 4 ++-- docs/content/doc/usage/packages/composer.en-us.md | 4 ++-- docs/content/doc/usage/packages/conan.en-us.md | 4 ++-- docs/content/doc/usage/packages/conda.en-us.md | 4 ++-- docs/content/doc/usage/packages/cran.en-us.md | 4 ++-- docs/content/doc/usage/packages/debian.en-us.md | 4 ++-- docs/content/doc/usage/packages/generic.en-us.md | 4 ++-- docs/content/doc/usage/packages/go.en-us.md | 4 ++-- docs/content/doc/usage/packages/maven.en-us.md | 4 ++-- docs/content/doc/usage/packages/npm.en-us.md | 4 ++-- docs/content/doc/usage/packages/nuget.en-us.md | 4 ++-- docs/content/doc/usage/packages/pub.en-us.md | 4 ++-- docs/content/doc/usage/packages/pypi.en-us.md | 4 ++-- docs/content/doc/usage/packages/rpm.en-us.md | 4 ++-- docs/content/doc/usage/packages/rubygems.en-us.md | 4 ++-- docs/content/doc/usage/packages/swift.en-us.md | 4 ++-- docs/content/doc/usage/packages/vagrant.en-us.md | 4 ++-- 19 files changed, 38 insertions(+), 38 deletions(-) diff --git a/docs/content/doc/usage/packages/alpine.en-us.md b/docs/content/doc/usage/packages/alpine.en-us.md index aeb86093f0..f393c19596 100644 --- a/docs/content/doc/usage/packages/alpine.en-us.md +++ b/docs/content/doc/usage/packages/alpine.en-us.md @@ -1,6 +1,6 @@ --- date: "2023-03-25T00:00:00+00:00" -title: "Alpine Packages Repository" +title: "Alpine Package Registry" slug: "packages/alpine" draft: false toc: false @@ -12,7 +12,7 @@ menu: identifier: "alpine" --- -# Alpine Packages Repository +# Alpine Package Registry Publish [Alpine](https://pkgs.alpinelinux.org/) packages for your user or organization. diff --git a/docs/content/doc/usage/packages/cargo.en-us.md b/docs/content/doc/usage/packages/cargo.en-us.md index f16d914224..d341eb9f83 100644 --- a/docs/content/doc/usage/packages/cargo.en-us.md +++ b/docs/content/doc/usage/packages/cargo.en-us.md @@ -1,6 +1,6 @@ --- date: "2022-11-20T00:00:00+00:00" -title: "Cargo Packages Repository" +title: "Cargo Package Registry" slug: "cargo" weight: 5 draft: false @@ -13,7 +13,7 @@ menu: identifier: "cargo" --- -# Cargo Packages Repository +# Cargo Package Registry Publish [Cargo](https://doc.rust-lang.org/stable/cargo/) packages for your user or organization. diff --git a/docs/content/doc/usage/packages/chef.en-us.md b/docs/content/doc/usage/packages/chef.en-us.md index dc5ca21e98..ee77957551 100644 --- a/docs/content/doc/usage/packages/chef.en-us.md +++ b/docs/content/doc/usage/packages/chef.en-us.md @@ -1,6 +1,6 @@ --- date: "2023-01-20T00:00:00+00:00" -title: "Chef Packages Repository" +title: "Chef Package Registry" slug: "chef" weight: 5 draft: false @@ -13,7 +13,7 @@ menu: identifier: "chef" --- -# Chef Packages Repository +# Chef Package Registry Publish [Chef](https://chef.io/) cookbooks for your user or organization. diff --git a/docs/content/doc/usage/packages/composer.en-us.md b/docs/content/doc/usage/packages/composer.en-us.md index 16c367eb2c..092518c9f0 100644 --- a/docs/content/doc/usage/packages/composer.en-us.md +++ b/docs/content/doc/usage/packages/composer.en-us.md @@ -1,6 +1,6 @@ --- date: "2021-07-20T00:00:00+00:00" -title: "Composer Packages Repository" +title: "Composer Package Registry" slug: "composer" weight: 10 draft: false @@ -13,7 +13,7 @@ menu: identifier: "composer" --- -# Composer Packages Repository +# Composer Package Registry Publish [Composer](https://getcomposer.org/) packages for your user or organization. diff --git a/docs/content/doc/usage/packages/conan.en-us.md b/docs/content/doc/usage/packages/conan.en-us.md index 8c8fe4e262..5ca3ca7a26 100644 --- a/docs/content/doc/usage/packages/conan.en-us.md +++ b/docs/content/doc/usage/packages/conan.en-us.md @@ -1,6 +1,6 @@ --- date: "2021-07-20T00:00:00+00:00" -title: "Conan Packages Repository" +title: "Conan Package Registry" slug: "conan" weight: 20 draft: false @@ -13,7 +13,7 @@ menu: identifier: "conan" --- -# Conan Packages Repository +# Conan Package Registry Publish [Conan](https://conan.io/) packages for your user or organization. diff --git a/docs/content/doc/usage/packages/conda.en-us.md b/docs/content/doc/usage/packages/conda.en-us.md index c9a852239f..6178b6237d 100644 --- a/docs/content/doc/usage/packages/conda.en-us.md +++ b/docs/content/doc/usage/packages/conda.en-us.md @@ -1,6 +1,6 @@ --- date: "2022-12-28T00:00:00+00:00" -title: "Conda Packages Repository" +title: "Conda Package Registry" slug: "conda" weight: 25 draft: false @@ -13,7 +13,7 @@ menu: identifier: "conda" --- -# Conda Packages Repository +# Conda Package Registry Publish [Conda](https://docs.conda.io/en/latest/) packages for your user or organization. diff --git a/docs/content/doc/usage/packages/cran.en-us.md b/docs/content/doc/usage/packages/cran.en-us.md index cd323e5c5d..fafe49429b 100644 --- a/docs/content/doc/usage/packages/cran.en-us.md +++ b/docs/content/doc/usage/packages/cran.en-us.md @@ -1,6 +1,6 @@ --- date: "2023-01-01T00:00:00+00:00" -title: "CRAN Packages Repository" +title: "CRAN Package Registry" slug: "cran" draft: false toc: false @@ -12,7 +12,7 @@ menu: identifier: "cran" --- -# CRAN Packages Repository +# CRAN Package Registry Publish [R](https://www.r-project.org/) packages to a [CRAN](https://cran.r-project.org/)-like registry for your user or organization. diff --git a/docs/content/doc/usage/packages/debian.en-us.md b/docs/content/doc/usage/packages/debian.en-us.md index dc73da27cf..5f40abd093 100644 --- a/docs/content/doc/usage/packages/debian.en-us.md +++ b/docs/content/doc/usage/packages/debian.en-us.md @@ -1,6 +1,6 @@ --- date: "2023-01-07T00:00:00+00:00" -title: "Debian Packages Repository" +title: "Debian Package Registry" slug: "packages/debian" draft: false toc: false @@ -12,7 +12,7 @@ menu: identifier: "debian" --- -# Debian Packages Repository +# Debian Package Registry Publish [Debian](https://www.debian.org/distrib/packages) packages for your user or organization. diff --git a/docs/content/doc/usage/packages/generic.en-us.md b/docs/content/doc/usage/packages/generic.en-us.md index 447eb692fd..9ff8930722 100644 --- a/docs/content/doc/usage/packages/generic.en-us.md +++ b/docs/content/doc/usage/packages/generic.en-us.md @@ -1,6 +1,6 @@ --- date: "2021-07-20T00:00:00+00:00" -title: "Generic Packages Repository" +title: "Generic Package Registry" slug: "generic" weight: 40 draft: false @@ -13,7 +13,7 @@ menu: identifier: "generic" --- -# Generic Packages Repository +# Generic Package Registry Publish generic files, like release binaries or other output, for your user or organization. diff --git a/docs/content/doc/usage/packages/go.en-us.md b/docs/content/doc/usage/packages/go.en-us.md index 92f5eb5e93..04452c3516 100644 --- a/docs/content/doc/usage/packages/go.en-us.md +++ b/docs/content/doc/usage/packages/go.en-us.md @@ -1,6 +1,6 @@ --- date: "2023-05-10T00:00:00+00:00" -title: "Go Packages Repository" +title: "Go Package Registry" slug: "go" weight: 45 draft: false @@ -13,7 +13,7 @@ menu: identifier: "go" --- -# Go Packages Repository +# Go Package Registry Publish Go packages for your user or organization. diff --git a/docs/content/doc/usage/packages/maven.en-us.md b/docs/content/doc/usage/packages/maven.en-us.md index 81c3e22197..85b37fe464 100644 --- a/docs/content/doc/usage/packages/maven.en-us.md +++ b/docs/content/doc/usage/packages/maven.en-us.md @@ -1,6 +1,6 @@ --- date: "2021-07-20T00:00:00+00:00" -title: "Maven Packages Repository" +title: "Maven Package Registry" slug: "maven" weight: 60 draft: false @@ -13,7 +13,7 @@ menu: identifier: "maven" --- -# Maven Packages Repository +# Maven Package Registry Publish [Maven](https://maven.apache.org) packages for your user or organization. diff --git a/docs/content/doc/usage/packages/npm.en-us.md b/docs/content/doc/usage/packages/npm.en-us.md index a15cdb9a2b..58edcd02a4 100644 --- a/docs/content/doc/usage/packages/npm.en-us.md +++ b/docs/content/doc/usage/packages/npm.en-us.md @@ -1,6 +1,6 @@ --- date: "2021-07-20T00:00:00+00:00" -title: "npm Packages Repository" +title: "npm Package Registry" slug: "npm" weight: 70 draft: false @@ -13,7 +13,7 @@ menu: identifier: "npm" --- -# npm Packages Repository +# npm Package Registry Publish [npm](https://www.npmjs.com/) packages for your user or organization. diff --git a/docs/content/doc/usage/packages/nuget.en-us.md b/docs/content/doc/usage/packages/nuget.en-us.md index aa88fa625e..ccda2cc49c 100644 --- a/docs/content/doc/usage/packages/nuget.en-us.md +++ b/docs/content/doc/usage/packages/nuget.en-us.md @@ -1,6 +1,6 @@ --- date: "2021-07-20T00:00:00+00:00" -title: "NuGet Packages Repository" +title: "NuGet Package Registry" slug: "nuget" weight: 80 draft: false @@ -13,7 +13,7 @@ menu: identifier: "nuget" --- -# NuGet Packages Repository +# NuGet Package Registry Publish [NuGet](https://www.nuget.org/) packages for your user or organization. The package registry supports the V2 and V3 API protocol and you can work with [NuGet Symbol Packages](https://docs.microsoft.com/en-us/nuget/create-packages/symbol-packages-snupkg) too. diff --git a/docs/content/doc/usage/packages/pub.en-us.md b/docs/content/doc/usage/packages/pub.en-us.md index f2df2016ac..823984d54d 100644 --- a/docs/content/doc/usage/packages/pub.en-us.md +++ b/docs/content/doc/usage/packages/pub.en-us.md @@ -1,6 +1,6 @@ --- date: "2022-07-31T00:00:00+00:00" -title: "Pub Packages Repository" +title: "Pub Package Registry" slug: "pub" weight: 90 draft: false @@ -13,7 +13,7 @@ menu: identifier: "pub" --- -# Pub Packages Repository +# Pub Package Registry Publish [Pub](https://dart.dev/guides/packages) packages for your user or organization. diff --git a/docs/content/doc/usage/packages/pypi.en-us.md b/docs/content/doc/usage/packages/pypi.en-us.md index 84d9453daa..822e3ab97c 100644 --- a/docs/content/doc/usage/packages/pypi.en-us.md +++ b/docs/content/doc/usage/packages/pypi.en-us.md @@ -1,6 +1,6 @@ --- date: "2021-07-20T00:00:00+00:00" -title: "PyPI Packages Repository" +title: "PyPI Package Registry" slug: "pypi" weight: 100 draft: false @@ -13,7 +13,7 @@ menu: identifier: "pypi" --- -# PyPI Packages Repository +# PyPI Package Registry Publish [PyPI](https://pypi.org/) packages for your user or organization. diff --git a/docs/content/doc/usage/packages/rpm.en-us.md b/docs/content/doc/usage/packages/rpm.en-us.md index 7b256046c5..3590edb17e 100644 --- a/docs/content/doc/usage/packages/rpm.en-us.md +++ b/docs/content/doc/usage/packages/rpm.en-us.md @@ -1,6 +1,6 @@ --- date: "2023-03-08T00:00:00+00:00" -title: "RPM Packages Repository" +title: "RPM Package Registry" slug: "packages/rpm" draft: false toc: false @@ -12,7 +12,7 @@ menu: identifier: "rpm" --- -# RPM Packages Repository +# RPM Package Registry Publish [RPM](https://rpm.org/) packages for your user or organization. diff --git a/docs/content/doc/usage/packages/rubygems.en-us.md b/docs/content/doc/usage/packages/rubygems.en-us.md index be60ed37af..5cfebfc84a 100644 --- a/docs/content/doc/usage/packages/rubygems.en-us.md +++ b/docs/content/doc/usage/packages/rubygems.en-us.md @@ -1,6 +1,6 @@ --- date: "2021-07-20T00:00:00+00:00" -title: "RubyGems Packages Repository" +title: "RubyGems Package Registry" slug: "rubygems" weight: 110 draft: false @@ -13,7 +13,7 @@ menu: identifier: "rubygems" --- -# RubyGems Packages Repository +# RubyGems Package Registry Publish [RubyGems](https://guides.rubygems.org/) packages for your user or organization. diff --git a/docs/content/doc/usage/packages/swift.en-us.md b/docs/content/doc/usage/packages/swift.en-us.md index 3164f8d170..6d4d0f24b4 100644 --- a/docs/content/doc/usage/packages/swift.en-us.md +++ b/docs/content/doc/usage/packages/swift.en-us.md @@ -1,6 +1,6 @@ --- date: "2023-01-10T00:00:00+00:00" -title: "Swift Packages Repository" +title: "Swift Package Registry" slug: "swift" weight: 95 draft: false @@ -13,7 +13,7 @@ menu: identifier: "swift" --- -# Swift Packages Repository +# Swift Package Registry Publish [Swift](https://www.swift.org/) packages for your user or organization. diff --git a/docs/content/doc/usage/packages/vagrant.en-us.md b/docs/content/doc/usage/packages/vagrant.en-us.md index 5c633b4f71..583bbc199b 100644 --- a/docs/content/doc/usage/packages/vagrant.en-us.md +++ b/docs/content/doc/usage/packages/vagrant.en-us.md @@ -1,6 +1,6 @@ --- date: "2022-08-23T00:00:00+00:00" -title: "Vagrant Packages Repository" +title: "Vagrant Package Registry" slug: "vagrant" weight: 120 draft: false @@ -13,7 +13,7 @@ menu: identifier: "vagrant" --- -# Vagrant Packages Repository +# Vagrant Package Registry Publish [Vagrant](https://www.vagrantup.com/) packages for your user or organization. From a523bd58895405f8ca8c8a8b3468b8a9ebed0c42 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Wed, 24 May 2023 15:30:55 +0800 Subject: [PATCH 03/31] Only validate changed columns when update user (#24867) Fix #23211 Replace #23496 --- models/user/user.go | 25 ++++++++++++++++--------- models/user/user_test.go | 18 ++++++++++++++++++ 2 files changed, 34 insertions(+), 9 deletions(-) diff --git a/models/user/user.go b/models/user/user.go index 0be36e69ab..57b2117bb9 100644 --- a/models/user/user.go +++ b/models/user/user.go @@ -621,7 +621,7 @@ func CreateUser(u *User, overwriteDefault ...*CreateUserOverwriteOptions) (err e } // validate data - if err := validateUser(u); err != nil { + if err := ValidateUser(u); err != nil { return err } @@ -767,19 +767,26 @@ func checkDupEmail(ctx context.Context, u *User) error { return nil } -// validateUser check if user is valid to insert / update into database -func validateUser(u *User) error { - if !setting.Service.AllowedUserVisibilityModesSlice.IsAllowedVisibility(u.Visibility) && !u.IsOrganization() { - return fmt.Errorf("visibility Mode not allowed: %s", u.Visibility.String()) +// ValidateUser check if user is valid to insert / update into database +func ValidateUser(u *User, cols ...string) error { + if len(cols) == 0 || util.SliceContainsString(cols, "visibility", true) { + if !setting.Service.AllowedUserVisibilityModesSlice.IsAllowedVisibility(u.Visibility) && !u.IsOrganization() { + return fmt.Errorf("visibility Mode not allowed: %s", u.Visibility.String()) + } } - u.Email = strings.ToLower(u.Email) - return ValidateEmail(u.Email) + if len(cols) == 0 || util.SliceContainsString(cols, "email", true) { + u.Email = strings.ToLower(u.Email) + if err := ValidateEmail(u.Email); err != nil { + return err + } + } + return nil } // UpdateUser updates user's information. func UpdateUser(ctx context.Context, u *User, changePrimaryEmail bool, cols ...string) error { - err := validateUser(u) + err := ValidateUser(u, cols...) if err != nil { return err } @@ -845,7 +852,7 @@ func UpdateUser(ctx context.Context, u *User, changePrimaryEmail bool, cols ...s // UpdateUserCols update user according special columns func UpdateUserCols(ctx context.Context, u *User, cols ...string) error { - if err := validateUser(u); err != nil { + if err := ValidateUser(u, cols...); err != nil { return err } diff --git a/models/user/user_test.go b/models/user/user_test.go index cbfcd15463..44eaf63556 100644 --- a/models/user/user_test.go +++ b/models/user/user_test.go @@ -526,3 +526,21 @@ func TestIsUserVisibleToViewer(t *testing.T) { test(user31, user33, true) test(user31, nil, false) } + +func Test_ValidateUser(t *testing.T) { + oldSetting := setting.Service.AllowedUserVisibilityModesSlice + defer func() { + setting.Service.AllowedUserVisibilityModesSlice = oldSetting + }() + setting.Service.AllowedUserVisibilityModesSlice = []bool{true, false, true} + kases := map[*user_model.User]bool{ + {ID: 1, Visibility: structs.VisibleTypePublic}: true, + {ID: 2, Visibility: structs.VisibleTypeLimited}: false, + {ID: 2, Visibility: structs.VisibleTypeLimited, Email: "invalid"}: false, + {ID: 2, Visibility: structs.VisibleTypePrivate, Email: "valid@valid.com"}: true, + } + for kase, expected := range kases { + err := user_model.ValidateUser(kase) + assert.EqualValues(t, expected, err == nil, fmt.Sprintf("case: %+v", kase)) + } +} From 9ad5cadc07d8163821c11eb4d680b224d4f01529 Mon Sep 17 00:00:00 2001 From: HesterG Date: Wed, 24 May 2023 16:29:44 +0800 Subject: [PATCH 04/31] Fix in administration/config-cheat-sheet.en-us.md (#24905) Before Screen Shot 2023-05-24 at 15 54 02 Screen Shot 2023-05-24 at 15 50 05 Screen Shot 2023-05-24 at 15 50 16 After Screen Shot 2023-05-24 at 15 52 53 Screen Shot 2023-05-24 at 15 53 03 Screen Shot 2023-05-24 at 15 53 13 --- .../doc/administration/config-cheat-sheet.en-us.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/content/doc/administration/config-cheat-sheet.en-us.md b/docs/content/doc/administration/config-cheat-sheet.en-us.md index 035c94cd27..18321ee883 100644 --- a/docs/content/doc/administration/config-cheat-sheet.en-us.md +++ b/docs/content/doc/administration/config-cheat-sheet.en-us.md @@ -514,7 +514,7 @@ And the following unique queues: - `INSTALL_LOCK`: **false**: Controls access to the installation page. When set to "true", the installation page is not accessible. - `SECRET_KEY`: **\**: Global secret key. This key is VERY IMPORTANT, if you lost it, the data encrypted by it (like 2FA secret) can't be decrypted anymore. -- `SECRET_KEY_URI`: ****: Instead of defining SECRET_KEY, this option can be used to use the key stored in a file (example value: `file:/etc/gitea/secret_key`). It shouldn't be lost like SECRET_KEY. +- `SECRET_KEY_URI`: **\**: Instead of defining SECRET_KEY, this option can be used to use the key stored in a file (example value: `file:/etc/gitea/secret_key`). It shouldn't be lost like SECRET_KEY. - `LOGIN_REMEMBER_DAYS`: **7**: Cookie lifetime, in days. - `COOKIE_USERNAME`: **gitea\_awesome**: Name of the cookie used to store the current username. - `COOKIE_REMEMBER_NAME`: **gitea\_incredible**: Name of cookie used to store authentication @@ -540,7 +540,7 @@ And the following unique queues: - `ONLY_ALLOW_PUSH_IF_GITEA_ENVIRONMENT_SET`: **true**: Set to `false` to allow local users to push to gitea-repositories without setting up the Gitea environment. This is not recommended and if you want local users to push to Gitea repositories you should set the environment appropriately. - `IMPORT_LOCAL_PATHS`: **false**: Set to `false` to prevent all users (including admin) from importing local path on server. - `INTERNAL_TOKEN`: **\**: Secret used to validate communication within Gitea binary. -- `INTERNAL_TOKEN_URI`: ****: Instead of defining INTERNAL_TOKEN in the configuration, this configuration option can be used to give Gitea a path to a file that contains the internal token (example value: `file:/etc/gitea/internal_token`) +- `INTERNAL_TOKEN_URI`: **\**: Instead of defining INTERNAL_TOKEN in the configuration, this configuration option can be used to give Gitea a path to a file that contains the internal token (example value: `file:/etc/gitea/internal_token`) - `PASSWORD_HASH_ALGO`: **pbkdf2**: The hash algorithm to use \[argon2, pbkdf2, pbkdf2_v1, pbkdf2_hi, scrypt, bcrypt\], argon2 and scrypt will spend significant amounts of memory. - Note: The default parameters for `pbkdf2` hashing have changed - the previous settings are available as `pbkdf2_v1` but are not recommended. - The hash functions may be tuned by using `$` after the algorithm: @@ -571,8 +571,8 @@ And the following unique queues: ## Camo (`camo`) - `ENABLED`: **false**: Enable media proxy, we support images only at the moment. -- `SERVER_URL`: ****: URL of camo server, it **is required** if camo is enabled. -- `HMAC_KEY`: ****: Provide the HMAC key for encoding URLs, it **is required** if camo is enabled. +- `SERVER_URL`: **\**: URL of camo server, it **is required** if camo is enabled. +- `HMAC_KEY`: **\**: Provide the HMAC key for encoding URLs, it **is required** if camo is enabled. - `ALLWAYS`: **false**: Set to true to use camo for both HTTP and HTTPS content, otherwise only non-HTTPS URLs are proxied ## OpenID (`openid`) From 1fd7e3d6bea0453b851afec6c7f74b7cf7b10a06 Mon Sep 17 00:00:00 2001 From: silverwind Date: Wed, 24 May 2023 11:00:29 +0200 Subject: [PATCH 05/31] Improve Actions CSS (#24864) - Various color tweaks - Add sticky positioning to left sidebar, right header and right step header - Adjust margins and border radiuses Screenshot 2023-05-23 at 11 18 06 Screenshot 2023-05-23 at 11 18 18 ![](https://github.com/go-gitea/gitea/assets/115237/643910f2-a582-405d-bc93-36f2e54b5fda) ![](https://github.com/go-gitea/gitea/assets/115237/382a8a54-f1e3-4f08-affc-ea3108c02352) --------- Co-authored-by: yp05327 <576951401@qq.com> --- web_src/css/base.css | 4 +- web_src/css/themes/theme-arc-green.css | 9 +++- web_src/js/components/RepoActionView.vue | 63 ++++++++++++++++-------- 3 files changed, 53 insertions(+), 23 deletions(-) diff --git a/web_src/css/base.css b/web_src/css/base.css index 04fc2a0f25..eee364bf1d 100644 --- a/web_src/css/base.css +++ b/web_src/css/base.css @@ -70,8 +70,10 @@ --color-secondary-alpha-90: #dededee1; /* console colors */ --color-console-fg: #ffffff; - --color-console-bg: #171717; + --color-console-bg: #252a2f; + --color-console-border: #ffffff16; --color-console-hover-bg: #ffffff16; + --color-console-active-bg: #353a3f; /* named colors */ --color-red: #db2828; --color-orange: #f2711c; diff --git a/web_src/css/themes/theme-arc-green.css b/web_src/css/themes/theme-arc-green.css index d5db18b55a..5f2b329457 100644 --- a/web_src/css/themes/theme-arc-green.css +++ b/web_src/css/themes/theme-arc-green.css @@ -56,7 +56,13 @@ --color-secondary-alpha-70: #525767b3; --color-secondary-alpha-80: #525767cc; --color-secondary-alpha-90: #525767e1; - /* colors */ + /* console colors */ + --color-console-fg: #ffffff; + --color-console-bg: #262936; + --color-console-border: #ffffff16; + --color-console-hover-bg: #ffffff16; + --color-console-active-bg: #383c47; + /* named colors */ --color-red: #cc4848; --color-orange: #cc580c; --color-yellow: #cc9903; @@ -175,7 +181,6 @@ --color-accent: var(--color-primary-light-1); --color-small-accent: var(--color-primary-light-5); --color-active-line: #534d1b; - accent-color: var(--color-accent); color-scheme: dark; } diff --git a/web_src/js/components/RepoActionView.vue b/web_src/js/components/RepoActionView.vue index da05491146..c0b54d5693 100644 --- a/web_src/js/components/RepoActionView.vue +++ b/web_src/js/components/RepoActionView.vue @@ -14,7 +14,7 @@ -
@@ -422,20 +422,20 @@ export function ansiLogToHTML(line) {