From 48e3e38ee040c9cfec6ea2adea2da49a7f21f2c7 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Thu, 4 May 2023 02:32:10 +0800 Subject: [PATCH 01/97] Clean up polluted styles and remove dead CSS code (#24497) Follow #24393 The funny history: * At the beginning, `.ui.message` was polluted by `text-align: center` * Then people do `
` * But `.ui.left` is polluted by `float: left` * Then people do `#xxx .ui.message { width: 100% !important;}` The code just becomes more and more hacky. After removing the pollution, everything becomes clear and straight. And, this PR also does: 1. Remove the `package.css`, its styles could be provided by `top aligned` 2. Remove `#avatar-arrow`, dead code Screenshot: ![image](https://user-images.githubusercontent.com/2114189/235862130-a9eb5d8f-7d01-457c-99f7-21d0abc3075e.png) ![image](https://user-images.githubusercontent.com/2114189/235862222-139709a7-95c2-4f89-a40f-100b2d76d9bb.png) Co-authored-by: Giteabot --- templates/base/alert.tmpl | 8 ++--- templates/package/content/container.tmpl | 6 ++-- templates/package/settings.tmpl | 2 +- templates/repo/issue/view_content/pull.tmpl | 2 +- .../repo/issue/view_content/sidebar.tmpl | 2 +- templates/repo/migrate/migrating.tmpl | 2 +- templates/repo/settings/options.tmpl | 10 +++--- web_src/css/base.css | 2 +- web_src/css/index.css | 1 - web_src/css/package.css | 7 ---- web_src/css/repository.css | 33 ------------------- 11 files changed, 17 insertions(+), 58 deletions(-) delete mode 100644 web_src/css/package.css diff --git a/templates/base/alert.tmpl b/templates/base/alert.tmpl index b8a04b89a95..160584f769b 100644 --- a/templates/base/alert.tmpl +++ b/templates/base/alert.tmpl @@ -1,20 +1,20 @@ {{if .Flash.ErrorMsg}} -
+

{{.Flash.ErrorMsg | Str2html}}

{{end}} {{if .Flash.SuccessMsg}} -
+

{{.Flash.SuccessMsg | Str2html}}

{{end}} {{if .Flash.InfoMsg}} -
+

{{.Flash.InfoMsg | Str2html}}

{{end}} {{if .Flash.WarningMsg}} -
+

{{.Flash.WarningMsg | Str2html}}

{{end}} diff --git a/templates/package/content/container.tmpl b/templates/package/content/container.tmpl index 3370ebca3f1..d928b36e604 100644 --- a/templates/package/content/container.tmpl +++ b/templates/package/content/container.tmpl @@ -69,7 +69,7 @@ {{if .PackageDescriptor.Metadata.Labels}}

{{.locale.Tr "packages.container.labels"}}

- +
@@ -79,8 +79,8 @@ {{range $key, $value := .PackageDescriptor.Metadata.Labels}} - - + + {{end}} diff --git a/templates/package/settings.tmpl b/templates/package/settings.tmpl index 7beb3da0621..205d875c3ee 100644 --- a/templates/package/settings.tmpl +++ b/templates/package/settings.tmpl @@ -51,7 +51,7 @@ {{.locale.Tr "packages.settings.delete"}}
-
+
{{.locale.Tr "packages.settings.delete.notice" .PackageDescriptor.Package.Name .PackageDescriptor.Version.Version}}
diff --git a/templates/repo/issue/view_content/pull.tmpl b/templates/repo/issue/view_content/pull.tmpl index ec957161b1a..29d8d9d47ce 100644 --- a/templates/repo/issue/view_content/pull.tmpl +++ b/templates/repo/issue/view_content/pull.tmpl @@ -47,7 +47,7 @@ {{$.locale.Tr "repo.issues.dismiss_review"}}
-
+
{{$.locale.Tr "repo.issues.dismiss_review_warning"}}
diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl index e07ef0fa374..86796a91cbb 100644 --- a/templates/repo/issue/view_content/sidebar.tmpl +++ b/templates/repo/issue/view_content/sidebar.tmpl @@ -560,7 +560,7 @@ {{end}}
-
+
{{if .Issue.IsLocked}} {{.locale.Tr "repo.issues.unlock.notice_1"}}
{{.locale.Tr "repo.issues.unlock.notice_2"}}
diff --git a/templates/repo/migrate/migrating.tmpl b/templates/repo/migrate/migrating.tmpl index 51caa28aa18..72c3fe56648 100644 --- a/templates/repo/migrate/migrating.tmpl +++ b/templates/repo/migrate/migrating.tmpl @@ -50,7 +50,7 @@ {{.locale.Tr "repo.settings.delete"}}
-
+
{{.locale.Tr "repo.settings.delete_notices_1" | Safe}}
{{.locale.Tr "repo.settings.delete_notices_2" .Repository.FullName | Safe}} {{if .Repository.NumForks}}
diff --git a/templates/repo/settings/options.tmpl b/templates/repo/settings/options.tmpl index 515854609a1..af753ba670a 100644 --- a/templates/repo/settings/options.tmpl +++ b/templates/repo/settings/options.tmpl @@ -803,7 +803,7 @@ {{.locale.Tr "repo.settings.convert"}}
-
+
{{.locale.Tr "repo.settings.convert_notices_1"}}
@@ -834,7 +834,7 @@ {{.locale.Tr "repo.settings.convert_fork"}}
-
+
{{.locale.Tr "repo.settings.convert_fork_notices_1"}}
@@ -864,7 +864,7 @@ {{.locale.Tr "repo.settings.transfer"}}
-
+
{{.locale.Tr "repo.settings.transfer_notices_1"}}
{{.locale.Tr "repo.settings.transfer_notices_2"}}
{{.locale.Tr "repo.settings.transfer_notices_3"}} @@ -900,7 +900,7 @@ {{.locale.Tr "repo.settings.delete"}}
-
+
{{.locale.Tr "repo.settings.delete_notices_1" | Safe}}
{{.locale.Tr "repo.settings.delete_notices_2" .Repository.FullName | Safe}} {{if .Repository.NumForks}}
@@ -935,7 +935,7 @@ {{.locale.Tr "repo.settings.wiki_delete"}}
-
+
{{.locale.Tr "repo.settings.delete_notices_1" | Safe}}
{{.locale.Tr "repo.settings.wiki_delete_notices_1" .Repository.Name | Safe}}
diff --git a/web_src/css/base.css b/web_src/css/base.css index 0f94d22312d..d854f9badd7 100644 --- a/web_src/css/base.css +++ b/web_src/css/base.css @@ -1556,7 +1556,7 @@ img.ui.avatar, vertical-align: middle; } -.ui .message { +.ui .message.flash-message { text-align: center; } diff --git a/web_src/css/index.css b/web_src/css/index.css index 12cb94c0418..6fb92f2ecb2 100644 --- a/web_src/css/index.css +++ b/web_src/css/index.css @@ -41,6 +41,5 @@ @import "./admin.css"; @import "./explore.css"; @import "./review.css"; -@import "./package.css"; @import "./runner.css"; @import "./helpers.css"; diff --git a/web_src/css/package.css b/web_src/css/package.css deleted file mode 100644 index c229e176f52..00000000000 --- a/web_src/css/package.css +++ /dev/null @@ -1,7 +0,0 @@ -.container-labels td:nth-child(1) { - vertical-align: top; -} - -.container-labels td:nth-child(2) { - overflow-wrap: anywhere; -} diff --git a/web_src/css/repository.css b/web_src/css/repository.css index 5b32fbb95ed..d724dc400a2 100644 --- a/web_src/css/repository.css +++ b/web_src/css/repository.css @@ -2600,39 +2600,6 @@ height: 15px; } -#avatar-arrow::before, -#avatar-arrow::after { - right: 100%; - top: 20px; - border: solid transparent; - content: " "; - height: 0; - width: 0; - position: absolute; - pointer-events: none; -} - -#avatar-arrow::before { - border-right-color: var(--color-secondary); - border-width: 9px; - margin-top: -9px; -} - -#avatar-arrow::after { - border-right-color: var(--color-box-header); - border-width: 8px; - margin-top: -8px; -} - -#transfer-repo-modal .ui.message, -#delete-repo-modal .ui.message, -#delete-wiki-modal .ui.message, -#convert-fork-repo-modal .ui.message, -#convert-mirror-repo-modal .ui.message, -#fork-repo-modal .ui.message { - width: 100% !important; -} - .tab-size-1 { tab-size: 1 !important; -moz-tab-size: 1 !important; From 723598b803919bfc074fee05f830421a99881c3b Mon Sep 17 00:00:00 2001 From: KN4CK3R Date: Wed, 3 May 2023 22:58:43 +0200 Subject: [PATCH 02/97] Implement Cargo HTTP index (#24452) This implements the HTTP index [RFC](https://rust-lang.github.io/rfcs/2789-sparse-index.html) for Cargo registries. Currently this is a preview feature and you need to use the nightly of `cargo`: `cargo +nightly -Z sparse-registry update` See https://github.com/rust-lang/cargo/issues/9069 for more information. --------- Co-authored-by: Giteabot --- routers/api/packages/api.go | 6 ++ routers/api/packages/cargo/cargo.go | 30 ++++++ services/packages/cargo/index.go | 36 +++++-- tests/integration/api_packages_cargo_test.go | 102 ++++++++++++++----- 4 files changed, 136 insertions(+), 38 deletions(-) diff --git a/routers/api/packages/api.go b/routers/api/packages/api.go index 04b0c0ab08d..ee1feb1414c 100644 --- a/routers/api/packages/api.go +++ b/routers/api/packages/api.go @@ -119,6 +119,12 @@ func CommonRoutes(ctx gocontext.Context) *web.Route { r.Get("/owners", cargo.ListOwners) }) }) + r.Get("/config.json", cargo.RepositoryConfig) + r.Get("/1/{package}", cargo.EnumeratePackageVersions) + r.Get("/2/{package}", cargo.EnumeratePackageVersions) + // Use dummy placeholders because these parts are not of interest + r.Get("/3/{_}/{package}", cargo.EnumeratePackageVersions) + r.Get("/{_}/{__}/{package}", cargo.EnumeratePackageVersions) }, reqPackageAccess(perm.AccessModeRead)) r.Group("/chef", func() { r.Group("/api/v1", func() { diff --git a/routers/api/packages/cargo/cargo.go b/routers/api/packages/cargo/cargo.go index 18c93d328ab..b666bdde6c9 100644 --- a/routers/api/packages/cargo/cargo.go +++ b/routers/api/packages/cargo/cargo.go @@ -4,6 +4,7 @@ package cargo import ( + "errors" "fmt" "net/http" "strconv" @@ -45,6 +46,35 @@ func apiError(ctx *context.Context, status int, obj interface{}) { }) } +// https://rust-lang.github.io/rfcs/2789-sparse-index.html +func RepositoryConfig(ctx *context.Context) { + ctx.JSON(http.StatusOK, cargo_service.BuildConfig(ctx.Package.Owner)) +} + +func EnumeratePackageVersions(ctx *context.Context) { + p, err := packages_model.GetPackageByName(ctx, ctx.Package.Owner.ID, packages_model.TypeCargo, ctx.Params("package")) + if err != nil { + if errors.Is(err, util.ErrNotExist) { + apiError(ctx, http.StatusNotFound, err) + } else { + apiError(ctx, http.StatusInternalServerError, err) + } + return + } + + b, err := cargo_service.BuildPackageIndex(ctx, p) + if err != nil { + apiError(ctx, http.StatusInternalServerError, err) + return + } + if b == nil { + apiError(ctx, http.StatusNotFound, nil) + return + } + + ctx.PlainTextBytes(http.StatusOK, b.Bytes()) +} + type SearchResult struct { Crates []*SearchResultCrate `json:"crates"` Meta SearchResultMeta `json:"meta"` diff --git a/services/packages/cargo/index.go b/services/packages/cargo/index.go index e58a4728162..1c2d17b504f 100644 --- a/services/packages/cargo/index.go +++ b/services/packages/cargo/index.go @@ -137,21 +137,21 @@ type IndexVersionEntry struct { Links string `json:"links,omitempty"` } -func addOrUpdatePackageIndex(ctx context.Context, t *files_service.TemporaryUploadRepository, p *packages_model.Package) error { +func BuildPackageIndex(ctx context.Context, p *packages_model.Package) (*bytes.Buffer, error) { pvs, _, err := packages_model.SearchVersions(ctx, &packages_model.PackageSearchOptions{ PackageID: p.ID, Sort: packages_model.SortVersionAsc, }) if err != nil { - return fmt.Errorf("SearchVersions[%s]: %w", p.Name, err) + return nil, fmt.Errorf("SearchVersions[%s]: %w", p.Name, err) } if len(pvs) == 0 { - return nil + return nil, nil } pds, err := packages_model.GetPackageDescriptors(ctx, pvs) if err != nil { - return fmt.Errorf("GetPackageDescriptors[%s]: %w", p.Name, err) + return nil, fmt.Errorf("GetPackageDescriptors[%s]: %w", p.Name, err) } var b bytes.Buffer @@ -179,14 +179,26 @@ func addOrUpdatePackageIndex(ctx context.Context, t *files_service.TemporaryUplo Links: metadata.Links, }) if err != nil { - return err + return nil, err } b.Write(entry) b.WriteString("\n") } - return writeObjectToIndex(t, BuildPackagePath(pds[0].Package.LowerName), &b) + return &b, nil +} + +func addOrUpdatePackageIndex(ctx context.Context, t *files_service.TemporaryUploadRepository, p *packages_model.Package) error { + b, err := BuildPackageIndex(ctx, p) + if err != nil { + return err + } + if b == nil { + return nil + } + + return writeObjectToIndex(t, BuildPackagePath(p.LowerName), b) } func getOrCreateIndexRepository(ctx context.Context, doer, owner *user_model.User) (*repo_model.Repository, error) { @@ -212,6 +224,13 @@ type Config struct { APIURL string `json:"api"` } +func BuildConfig(owner *user_model.User) *Config { + return &Config{ + DownloadURL: setting.AppURL + "api/packages/" + owner.Name + "/cargo/api/v1/crates", + APIURL: setting.AppURL + "api/packages/" + owner.Name + "/cargo", + } +} + func createOrUpdateConfigFile(ctx context.Context, repo *repo_model.Repository, doer, owner *user_model.User) error { return alterRepositoryContent( ctx, @@ -220,10 +239,7 @@ func createOrUpdateConfigFile(ctx context.Context, repo *repo_model.Repository, "Initialize Cargo Config", func(t *files_service.TemporaryUploadRepository) error { var b bytes.Buffer - err := json.NewEncoder(&b).Encode(Config{ - DownloadURL: setting.AppURL + "api/packages/" + owner.Name + "/cargo/api/v1/crates", - APIURL: setting.AppURL + "api/packages/" + owner.Name + "/cargo", - }) + err := json.NewEncoder(&b).Encode(BuildConfig(owner)) if err != nil { return err } diff --git a/tests/integration/api_packages_cargo_test.go b/tests/integration/api_packages_cargo_test.go index 0c542eaf1e8..608f1929681 100644 --- a/tests/integration/api_packages_cargo_test.go +++ b/tests/integration/api_packages_cargo_test.go @@ -98,7 +98,7 @@ func testPackageCargo(t *testing.T, _ *neturl.URL) { url := fmt.Sprintf("%s/api/v1/crates", root) t.Run("Index", func(t *testing.T) { - t.Run("Config", func(t *testing.T) { + t.Run("Git/Config", func(t *testing.T) { defer tests.PrintCurrentTest(t)() content := readGitContent(t, cargo_service.ConfigFileName) @@ -110,6 +110,20 @@ func testPackageCargo(t *testing.T, _ *neturl.URL) { assert.Equal(t, url, config.DownloadURL) assert.Equal(t, root, config.APIURL) }) + + t.Run("HTTP/Config", func(t *testing.T) { + defer tests.PrintCurrentTest(t)() + + req := NewRequest(t, "GET", root+"/"+cargo_service.ConfigFileName) + resp := MakeRequest(t, req, http.StatusOK) + + var config cargo_service.Config + err := json.Unmarshal(resp.Body.Bytes(), &config) + assert.NoError(t, err) + + assert.Equal(t, url, config.DownloadURL) + assert.Equal(t, root, config.APIURL) + }) }) t.Run("Upload", func(t *testing.T) { @@ -192,40 +206,72 @@ func testPackageCargo(t *testing.T, _ *neturl.URL) { MakeRequest(t, req, http.StatusConflict) t.Run("Index", func(t *testing.T) { - t.Run("Entry", func(t *testing.T) { - defer tests.PrintCurrentTest(t)() + t.Run("Git", func(t *testing.T) { + t.Run("Entry", func(t *testing.T) { + defer tests.PrintCurrentTest(t)() - content := readGitContent(t, cargo_service.BuildPackagePath(packageName)) + content := readGitContent(t, cargo_service.BuildPackagePath(packageName)) - var entry cargo_service.IndexVersionEntry - err := json.Unmarshal([]byte(content), &entry) - assert.NoError(t, err) + var entry cargo_service.IndexVersionEntry + err := json.Unmarshal([]byte(content), &entry) + assert.NoError(t, err) - assert.Equal(t, packageName, entry.Name) - assert.Equal(t, packageVersion, entry.Version) - assert.Equal(t, pb.HashSHA256, entry.FileChecksum) - assert.False(t, entry.Yanked) - assert.Len(t, entry.Dependencies, 1) - dep := entry.Dependencies[0] - assert.Equal(t, "dep", dep.Name) - assert.Equal(t, "1.0", dep.Req) - assert.Equal(t, "normal", dep.Kind) - assert.True(t, dep.DefaultFeatures) - assert.Empty(t, dep.Features) - assert.False(t, dep.Optional) - assert.Nil(t, dep.Target) - assert.NotNil(t, dep.Registry) - assert.Equal(t, "https://gitea.io/user/_cargo-index", *dep.Registry) - assert.Nil(t, dep.Package) + assert.Equal(t, packageName, entry.Name) + assert.Equal(t, packageVersion, entry.Version) + assert.Equal(t, pb.HashSHA256, entry.FileChecksum) + assert.False(t, entry.Yanked) + assert.Len(t, entry.Dependencies, 1) + dep := entry.Dependencies[0] + assert.Equal(t, "dep", dep.Name) + assert.Equal(t, "1.0", dep.Req) + assert.Equal(t, "normal", dep.Kind) + assert.True(t, dep.DefaultFeatures) + assert.Empty(t, dep.Features) + assert.False(t, dep.Optional) + assert.Nil(t, dep.Target) + assert.NotNil(t, dep.Registry) + assert.Equal(t, "https://gitea.io/user/_cargo-index", *dep.Registry) + assert.Nil(t, dep.Package) + }) + + t.Run("Rebuild", func(t *testing.T) { + defer tests.PrintCurrentTest(t)() + + err := cargo_service.RebuildIndex(db.DefaultContext, user, user) + assert.NoError(t, err) + + _ = readGitContent(t, cargo_service.BuildPackagePath(packageName)) + }) }) - t.Run("Rebuild", func(t *testing.T) { - defer tests.PrintCurrentTest(t)() + t.Run("HTTP", func(t *testing.T) { + t.Run("Entry", func(t *testing.T) { + defer tests.PrintCurrentTest(t)() - err := cargo_service.RebuildIndex(db.DefaultContext, user, user) - assert.NoError(t, err) + req := NewRequest(t, "GET", root+"/"+cargo_service.BuildPackagePath(packageName)) + resp := MakeRequest(t, req, http.StatusOK) - _ = readGitContent(t, cargo_service.BuildPackagePath(packageName)) + var entry cargo_service.IndexVersionEntry + err := json.Unmarshal(resp.Body.Bytes(), &entry) + assert.NoError(t, err) + + assert.Equal(t, packageName, entry.Name) + assert.Equal(t, packageVersion, entry.Version) + assert.Equal(t, pb.HashSHA256, entry.FileChecksum) + assert.False(t, entry.Yanked) + assert.Len(t, entry.Dependencies, 1) + dep := entry.Dependencies[0] + assert.Equal(t, "dep", dep.Name) + assert.Equal(t, "1.0", dep.Req) + assert.Equal(t, "normal", dep.Kind) + assert.True(t, dep.DefaultFeatures) + assert.Empty(t, dep.Features) + assert.False(t, dep.Optional) + assert.Nil(t, dep.Target) + assert.NotNil(t, dep.Registry) + assert.Equal(t, "https://gitea.io/user/_cargo-index", *dep.Registry) + assert.Nil(t, dep.Package) + }) }) }) }) From 4a722c9a45659e7732258397bbb3dd1039ea1952 Mon Sep 17 00:00:00 2001 From: silverwind Date: Wed, 3 May 2023 23:58:59 +0200 Subject: [PATCH 03/97] Make Issue/PR/projects more compact, misc CSS tweaks (#24459) - Remove various horizontal dividers on repo pages that didn't provide visual benefit - Remove label/milestone pills on single issue/pr page - Remove issue-related pill buttons on projects page - Increase contrast of color-secondary on arc-green - Improve notifications icon, make circle bigger - Remove some inline styles - Fix focus in issue/pr title edit and select all text on button click ### Issue and PR before and after Screenshot 2023-05-01 at 11 44 22 Screenshot 2023-05-01 at 11 58 51 ### Projects before and after Screenshot 2023-05-01 at 11 41 02 Screenshot 2023-05-01 at 11 40 03 ### Releases before and after Screenshot 2023-05-01 at 11 41 12 Screenshot 2023-05-01 at 11 40 10 ### Misc Screenshot 2023-05-01 at 10 49 13 Screenshot 2023-05-01 at 18 57 08 Issue title edit and wrap: Screenshot 2023-05-01 at 12 34 40 Screenshot 2023-05-01 at 12 06 24 --------- Co-authored-by: wxiaoguang --- templates/org/member/members.tmpl | 2 +- templates/projects/list.tmpl | 2 +- templates/repo/actions/openclose.tmpl | 2 +- templates/repo/branch_dropdown.tmpl | 9 +- templates/repo/commits.tmpl | 2 +- templates/repo/home.tmpl | 2 +- templates/repo/issue/labels.tmpl | 3 +- templates/repo/issue/list.tmpl | 3 - templates/repo/issue/milestones.tmpl | 5 +- templates/repo/issue/navbar.tmpl | 2 +- templates/repo/issue/new.tmpl | 4 - templates/repo/issue/openclose.tmpl | 2 +- templates/repo/issue/view.tmpl | 25 +-- templates/repo/issue/view_content.tmpl | 9 - templates/repo/issue/view_title.tmpl | 194 ++++++++++-------- templates/repo/projects/list.tmpl | 62 +++--- templates/repo/pulls/commits.tmpl | 11 +- templates/repo/pulls/files.tmpl | 14 +- templates/repo/release/list.tmpl | 10 +- templates/repo/settings/options.tmpl | 6 +- templates/repo/sub_menu_release_tag.tmpl | 2 +- templates/user/dashboard/issues.tmpl | 2 +- templates/user/dashboard/milestones.tmpl | 2 +- .../notification_subscriptions.tmpl | 2 +- tests/integration/issue_test.go | 2 +- web_src/css/base.css | 10 +- web_src/css/repository.css | 110 +++++----- web_src/css/repository/issue-list.css | 1 + web_src/css/repository/list-header.css | 4 +- web_src/css/repository/release-tag.css | 27 +-- web_src/css/themes/theme-arc-green.css | 52 ++--- .../js/components/RepoBranchTagSelector.vue | 2 +- web_src/js/features/repo-issue.js | 4 +- web_src/js/features/repo-legacy.js | 6 +- 34 files changed, 265 insertions(+), 330 deletions(-) diff --git a/templates/org/member/members.tmpl b/templates/org/member/members.tmpl index d6ab265ea84..3d5b3beebd0 100644 --- a/templates/org/member/members.tmpl +++ b/templates/org/member/members.tmpl @@ -7,7 +7,7 @@
{{range .Members}}
-
+
{{avatar $.Context . 48}}
{{.Name}}
diff --git a/templates/projects/list.tmpl b/templates/projects/list.tmpl index 1ef0b0be974..e9e86e5d5d5 100644 --- a/templates/projects/list.tmpl +++ b/templates/projects/list.tmpl @@ -10,7 +10,7 @@ {{end}} {{template "base/alert" .}} -
+
{{svg "octicon-project-symlink" 16 "gt-mr-3"}} {{.locale.PrettyNumber .OpenCount}} {{.locale.Tr "repo.issues.open_title"}} diff --git a/templates/repo/actions/openclose.tmpl b/templates/repo/actions/openclose.tmpl index 74630187cdc..6874115a19f 100644 --- a/templates/repo/actions/openclose.tmpl +++ b/templates/repo/actions/openclose.tmpl @@ -1,4 +1,4 @@ -
+
{{svg "octicon-issue-opened" 16 "gt-mr-3"}} {{.locale.Tr "actions.runs.open_tab" $.NumOpenActionRuns}} diff --git a/templates/repo/branch_dropdown.tmpl b/templates/repo/branch_dropdown.tmpl index 0f79474d102..984899552dc 100644 --- a/templates/repo/branch_dropdown.tmpl +++ b/templates/repo/branch_dropdown.tmpl @@ -1,3 +1,8 @@ +{{/* Attributes: +* root +* ContainerClasses +* (TODO: search "branch_dropdown" in the template direcotry) +*/}} {{$defaultBranch := $.root.BranchName}} {{if and .root.IsViewTag (not .noTag)}} {{$defaultBranch = .root.TagName}} @@ -62,10 +67,10 @@ window.config.pageData.branchDropdownDataList.push(data); -
+
{{/* show dummy elements before Vue componment is mounted, this code must match the code in BranchTagSelector.vue */}}
- - {{end}} -

- {{RenderIssueTitle $.Context .Issue.Title $.RepoLink $.Repository.ComposeMetas | RenderCodeBlock}} - #{{.Issue.Index}} -
+

+ {{RenderIssueTitle $.Context .Issue.Title $.RepoLink $.Repository.ComposeMetas | RenderCodeBlock}} #{{.Issue.Index}} + +

+
+ {{if and (or .HasIssuesOrPullsWritePermission .IsIssuePoster) (not .Repository.IsArchived)}} + + {{end}} + {{if not .Issue.IsPull}} + {{.locale.Tr "repo.issues.new"}} + {{end}} +
{{if and (or .HasIssuesOrPullsWritePermission .IsIssuePoster) (not .Repository.IsArchived)}}
- - + +
{{end}}
- {{if .HasMerged}} -
{{svg "octicon-git-merge" 16}} {{if eq .Issue.PullRequest.Status 3}}{{.locale.Tr "repo.pulls.manually_merged"}}{{else}}{{.locale.Tr "repo.pulls.merged"}}{{end}}
- {{else if .Issue.IsClosed}} -
{{if .Issue.IsPull}}{{svg "octicon-git-pull-request"}}{{else}}{{svg "octicon-issue-closed"}}{{end}} {{.locale.Tr "repo.issues.closed_title"}}
- {{else if .Issue.IsPull}} - {{if .IsPullWorkInProgress}} -
{{svg "octicon-git-pull-request-draft"}} {{.locale.Tr "repo.issues.draft_title"}}
- {{else}} -
{{svg "octicon-git-pull-request"}} {{.locale.Tr "repo.issues.open_title"}}
- {{end}} - {{else}} -
{{svg "octicon-issue-opened"}} {{.locale.Tr "repo.issues.open_title"}}
- {{end}} - - {{if .Issue.IsPull}} - {{$headHref := .HeadTarget|Escape}} - {{if .HeadBranchLink}} - {{$headHref = printf "%s" (.HeadBranchLink | Escape) $headHref}} - {{end}} - {{$headHref = printf "%s %s" $headHref (.locale.Tr "copy_branch") (.HeadTarget | Escape) (svg "octicon-copy" 14)}} - {{$baseHref := .BaseTarget|Escape}} - {{if .BaseBranchLink}} - {{$baseHref = printf "%s" (.BaseBranchLink | Escape) $baseHref}} - {{end}} - {{if .Issue.PullRequest.HasMerged}} - {{$mergedStr:= TimeSinceUnix .Issue.PullRequest.MergedUnix $.locale}} - {{if .Issue.OriginalAuthor}} - {{.Issue.OriginalAuthor}} - {{$.locale.Tr "repo.pulls.merged_title_desc" .NumCommits $headHref $baseHref $mergedStr | Safe}} +
+ {{if .HasMerged}} +
{{svg "octicon-git-merge" 16 "gt-mr-2"}} {{if eq .Issue.PullRequest.Status 3}}{{.locale.Tr "repo.pulls.manually_merged"}}{{else}}{{.locale.Tr "repo.pulls.merged"}}{{end}}
+ {{else if .Issue.IsClosed}} +
{{if .Issue.IsPull}}{{svg "octicon-git-pull-request"}}{{else}}{{svg "octicon-issue-closed"}}{{end}} {{.locale.Tr "repo.issues.closed_title"}}
+ {{else if .Issue.IsPull}} + {{if .IsPullWorkInProgress}} +
{{svg "octicon-git-pull-request-draft"}} {{.locale.Tr "repo.issues.draft_title"}}
{{else}} - {{.Issue.PullRequest.Merger.GetDisplayName}} - {{$.locale.Tr "repo.pulls.merged_title_desc" .NumCommits $headHref $baseHref $mergedStr | Safe}} +
{{svg "octicon-git-pull-request"}} {{.locale.Tr "repo.issues.open_title"}}
{{end}} {{else}} - {{if .Issue.OriginalAuthor}} - {{.Issue.OriginalAuthor}} {{$.locale.Tr "repo.pulls.title_desc" .NumCommits $headHref $baseHref | Safe}} +
{{svg "octicon-issue-opened"}} {{.locale.Tr "repo.issues.open_title"}}
+ {{end}} +
+ {{if .Issue.IsPull}} + {{$headHref := .HeadTarget|Escape}} + {{if .HeadBranchLink}} + {{$headHref = printf "%s" (.HeadBranchLink | Escape) $headHref}} + {{end}} + {{$headHref = printf "%s %s" $headHref (.locale.Tr "copy_branch") (.HeadTarget | Escape) (svg "octicon-copy" 14)}} + {{$baseHref := .BaseTarget|Escape}} + {{if .BaseBranchLink}} + {{$baseHref = printf "%s" (.BaseBranchLink | Escape) $baseHref}} + {{end}} + {{if .Issue.PullRequest.HasMerged}} + {{$mergedStr:= TimeSinceUnix .Issue.PullRequest.MergedUnix $.locale}} + {{if .Issue.OriginalAuthor}} + {{.Issue.OriginalAuthor}} + {{$.locale.Tr "repo.pulls.merged_title_desc" .NumCommits $headHref $baseHref $mergedStr | Safe}} + {{else}} + {{.Issue.PullRequest.Merger.GetDisplayName}} + {{$.locale.Tr "repo.pulls.merged_title_desc" .NumCommits $headHref $baseHref $mergedStr | Safe}} + {{end}} + {{else}} + {{if .Issue.OriginalAuthor}} + {{.Issue.OriginalAuthor}} {{$.locale.Tr "repo.pulls.title_desc" .NumCommits $headHref $baseHref | Safe}} + {{else}} + + {{.Issue.Poster.GetDisplayName}} + {{$.locale.Tr "repo.pulls.title_desc" .NumCommits $headHref $baseHref | Safe}} + + {{end}} + +
+
+ {{.locale.Tr "repo.pulls.compare_compare"}}: {{$.HeadTarget}} +
+
+ {{svg "octicon-arrow-right"}} +
+
+ {{.locale.Tr "repo.pulls.compare_base"}}: {{$.BaseName}}:{{$.BaseBranch}} + {{svg "octicon-triangle-down" 14 "dropdown icon"}} +
+
+
+ {{svg "octicon-filter" 16}} + +
+ +
+
+ + {{end}} {{else}} - - {{.Issue.Poster.GetDisplayName}} - {{$.locale.Tr "repo.pulls.title_desc" .NumCommits $headHref $baseHref | Safe}} + {{$createdStr:= TimeSinceUnix .Issue.CreatedUnix $.locale}} + + {{if .Issue.OriginalAuthor}} + {{$.locale.Tr "repo.issues.opened_by_fake" $createdStr (.Issue.OriginalAuthor|Escape) | Safe}} + {{else if gt .Issue.Poster.ID 0}} + {{$.locale.Tr "repo.issues.opened_by" $createdStr (.Issue.Poster.HomeLink|Escape) (.Issue.Poster.GetDisplayName|Escape) | Safe}} + {{else}} + {{$.locale.Tr "repo.issues.opened_by_fake" $createdStr (.Issue.Poster.GetDisplayName|Escape) | Safe}} + {{end}} + · + {{$.locale.Tr "repo.issues.num_comments" .Issue.NumComments}} {{end}} - -
-
- {{.locale.Tr "repo.pulls.compare_compare"}}: {{$.HeadTarget}} -
-
- {{svg "octicon-arrow-right"}} -
-
- {{.locale.Tr "repo.pulls.compare_base"}}: {{$.BaseName}}:{{$.BaseBranch}} - {{svg "octicon-triangle-down" 14 "dropdown icon"}} -
-
-
- {{svg "octicon-filter" 16}} - -
- -
-
- - {{end}} - {{else}} - {{$createdStr:= TimeSinceUnix .Issue.CreatedUnix $.locale}} - - {{if .Issue.OriginalAuthor}} - {{$.locale.Tr "repo.issues.opened_by_fake" $createdStr (.Issue.OriginalAuthor|Escape) | Safe}} - {{else if gt .Issue.Poster.ID 0}} - {{$.locale.Tr "repo.issues.opened_by" $createdStr (.Issue.Poster.HomeLink|Escape) (.Issue.Poster.GetDisplayName|Escape) | Safe}} - {{else}} - {{$.locale.Tr "repo.issues.opened_by_fake" $createdStr (.Issue.Poster.GetDisplayName|Escape) | Safe}} - {{end}} - · - {{$.locale.Tr "repo.issues.num_comments" .Issue.NumComments}} - - {{end}} -
+
+

diff --git a/templates/repo/projects/list.tmpl b/templates/repo/projects/list.tmpl index 5cd94c626d2..a5f99cee66a 100644 --- a/templates/repo/projects/list.tmpl +++ b/templates/repo/projects/list.tmpl @@ -2,41 +2,39 @@
{{template "repo/header" .}}
-
- {{template "repo/issue/navbar" .}} - {{if and .CanWriteProjects (not .Repository.IsArchived)}} -
- {{.locale.Tr "repo.projects.new"}} -
- {{end}} -
-
- {{template "base/alert" .}} -
- - {{svg "octicon-project" 16 "gt-mr-3"}} - {{.locale.PrettyNumber .OpenCount}} {{.locale.Tr "repo.issues.open_title"}} - - - {{svg "octicon-check" 16 "gt-mr-3"}} - {{.locale.PrettyNumber .ClosedCount}} {{.locale.Tr "repo.issues.closed_title"}} - -
- -
- -
- - {{.locale.Tr "repo.issues.filter_sort"}} - {{svg "octicon-triangle-down" 14 "dropdown icon"}} - -
- {{.locale.Tr "repo.issues.filter_sort.oldest"}} - {{.locale.Tr "repo.issues.filter_sort.recentupdate"}} - {{.locale.Tr "repo.issues.filter_sort.leastupdate"}} +
+ +
+ +
+ + {{.locale.Tr "repo.issues.filter_sort"}} + {{svg "octicon-triangle-down" 14 "dropdown icon"}} + +
+ {{.locale.Tr "repo.issues.filter_sort.oldest"}} + {{.locale.Tr "repo.issues.filter_sort.recentupdate"}} + {{.locale.Tr "repo.issues.filter_sort.leastupdate"}} +
+
+ {{if and .CanWriteProjects (not .Repository.IsArchived)}} + {{.locale.Tr "repo.projects.new"}} + {{end}} +
+ {{template "base/alert" .}} +
{{range .Projects}}
  • diff --git a/templates/repo/pulls/commits.tmpl b/templates/repo/pulls/commits.tmpl index bb113da268f..bf6e8128d49 100644 --- a/templates/repo/pulls/commits.tmpl +++ b/templates/repo/pulls/commits.tmpl @@ -2,18 +2,9 @@
    {{template "repo/header" .}}
    -
    - {{template "repo/issue/navbar" .}} -
    - {{.locale.Tr "repo.pulls.new"}} -
    -
    -
    {{template "repo/issue/view_title" .}} {{template "repo/pulls/tab_menu" .}} -
    - {{template "repo/commits_table" .}} -
    + {{template "repo/commits_table" .}}
    {{template "base/footer" .}} diff --git a/templates/repo/pulls/files.tmpl b/templates/repo/pulls/files.tmpl index 1e02dfa3974..feec6eae743 100644 --- a/templates/repo/pulls/files.tmpl +++ b/templates/repo/pulls/files.tmpl @@ -5,20 +5,10 @@
    {{template "repo/header" .}} -
    -
    - {{template "repo/issue/navbar" .}} -
    - {{.locale.Tr "repo.pulls.new"}} -
    -
    -
    +
    {{template "repo/issue/view_title" .}} {{template "repo/pulls/tab_menu" .}} - {{template "base/alert" .}} -
    - {{template "repo/diff/box" .}} -
    + {{template "repo/diff/box" .}}
    {{template "base/footer" .}} diff --git a/templates/repo/release/list.tmpl b/templates/repo/release/list.tmpl index 3d596a49e2b..be0976c1af4 100644 --- a/templates/repo/release/list.tmpl +++ b/templates/repo/release/list.tmpl @@ -14,13 +14,11 @@
    • {{.locale.Tr "packages.container.labels.key"}}
    {{$key}}{{$value}}{{$key}}{{$value}}
    {{$.locale.Tr "repo.settings.mirror_settings.direction.pull"}} {{DateTime "full" .Mirror.UpdatedUnix}} - + {{.CsrfTokenHtml}} @@ -169,13 +169,13 @@ {{$.locale.Tr "repo.settings.mirror_settings.direction.push"}} {{if .LastUpdateUnix}}{{DateTime "full" .LastUpdateUnix}}{{else}}{{$.locale.Tr "never"}}{{end}} {{if .LastError}}
    {{$.locale.Tr "error"}}
    {{end}}    		 - + {{$.CsrfTokenHtml}} -
    + {{$.CsrfTokenHtml}} diff --git a/templates/repo/sub_menu_release_tag.tmpl b/templates/repo/sub_menu_release_tag.tmpl index 27952415567..c700893ee67 100644 --- a/templates/repo/sub_menu_release_tag.tmpl +++ b/templates/repo/sub_menu_release_tag.tmpl @@ -2,7 +2,7 @@ {{$canReadCode := $.Permission.CanRead $.UnitTypeCode}} {{if $canReadReleases}} -

    +

    {{.locale.Tr "repo.release.releases"}} {{if $canReadCode}} {{.locale.Tr "repo.release.tags"}} diff --git a/templates/user/dashboard/issues.tmpl b/templates/user/dashboard/issues.tmpl index da7867a2253..8878fe93ca1 100644 --- a/templates/user/dashboard/issues.tmpl +++ b/templates/user/dashboard/issues.tmpl @@ -61,7 +61,7 @@
    -
    +
    {{svg "octicon-issue-opened" 16 "gt-mr-3"}} {{.locale.PrettyNumber .IssueStats.OpenCount}} {{.locale.Tr "repo.issues.open_title"}} diff --git a/templates/user/dashboard/milestones.tmpl b/templates/user/dashboard/milestones.tmpl index f9d8ae1eb04..207b2d70350 100644 --- a/templates/user/dashboard/milestones.tmpl +++ b/templates/user/dashboard/milestones.tmpl @@ -35,7 +35,7 @@
    -
    +
    {{svg "octicon-milestone" 16 "gt-mr-3"}} {{.locale.PrettyNumber .MilestoneStats.OpenCount}} {{.locale.Tr "repo.issues.open_title"}} diff --git a/templates/user/notification/notification_subscriptions.tmpl b/templates/user/notification/notification_subscriptions.tmpl index 6d3262ad6dd..df69a4dad1a 100644 --- a/templates/user/notification/notification_subscriptions.tmpl +++ b/templates/user/notification/notification_subscriptions.tmpl @@ -13,7 +13,7 @@ {{if eq .Status 1}}
    -
    +
    {{.locale.Tr "all"}} diff --git a/tests/integration/issue_test.go b/tests/integration/issue_test.go index eccf3c3795d..7ea7fefb642 100644 --- a/tests/integration/issue_test.go +++ b/tests/integration/issue_test.go @@ -143,7 +143,7 @@ func testNewIssue(t *testing.T, session *TestSession, user, repo, title, content htmlDoc = NewHTMLParser(t, resp.Body) val := htmlDoc.doc.Find("#issue-title").Text() - assert.Equal(t, title, val) + assert.Contains(t, val, title) val = htmlDoc.doc.Find(".comment .render-content p").First().Text() assert.Equal(t, content, val) diff --git a/web_src/css/base.css b/web_src/css/base.css index d854f9badd7..591c09377cd 100644 --- a/web_src/css/base.css +++ b/web_src/css/base.css @@ -2559,18 +2559,18 @@ a.ui.basic.label:hover { .notification_count { position: absolute; - left: 5px; - top: -8px; + left: 7px; + top: -9px; min-width: 1.5em; text-align: center; background: var(--color-primary); border: 2px solid var(--color-header-bar); color: var(--color-header-bar); - padding: 2px; + padding: 2.75px; border-radius: 1em; - font-size: 10px; + font-size: 11px; font-weight: 700; - line-height: 0.7; + line-height: .67em; } table th[data-sortt-asc]:hover, diff --git a/web_src/css/repository.css b/web_src/css/repository.css index d724dc400a2..6709b127db1 100644 --- a/web_src/css/repository.css +++ b/web_src/css/repository.css @@ -591,87 +591,83 @@ display: inline-block; } -.repository.view.issue .title { - padding-bottom: 0 !important; +.issue-title-header { + width: 100%; + padding-bottom: 4px; + margin-bottom: 1rem; } -.repository.view.issue .title .issue-title { - margin-bottom: 0.5rem; -} - -.repository.view.issue .title .issue-title.edit-active { +.issue-title-meta { display: flex; align-items: center; } -.repository.view.issue .title .issue-title.edit-active h1 { +.repository.view.issue .issue-title-buttons, +.repository.view.issue .edit-buttons { display: flex; - width: 100%; } @media (max-width: 767px) { - .repository.view.issue .title .issue-title.edit-active { + .repository.view.issue .issue-title { flex-direction: column; } - .repository.view.issue .title .issue-title.edit-active h1 { - margin-right: 0; - margin-bottom: 1rem; - padding-right: 0; - } - .repository.view.issue .title .issue-title.edit-active h1 .ui.input input { - width: calc(100% - 2rem); - } - .repository.view.issue .title .issue-title.edit-active .edit-buttons { - padding-bottom: 1rem; - width: 100%; - } - .repository.view.issue .title .issue-title.edit-active .edit-buttons .button { - width: 100%; - margin-right: 0.5rem; - } - .repository.view.issue .title .issue-title.edit-active .edit-buttons .button:last-child { - margin-right: 0; + .repository.view.issue .edit-buttons { + margin-top: .5rem; } } -.repository.view.issue .title .issue-title h1 { - font-weight: 300; - font-size: 2.3rem; - margin: 0; - padding-right: 0.5rem; -} - -.repository.view.issue .title .issue-title h1 .ui.input { - font-size: 0.5em; - width: 100%; -} - -.repository.view.issue .title .issue-title h1 .ui.input input { - font-size: 1.5em; - padding: 6px 1rem; -} - -.repository.view.issue .title .issue-title .edit-button { - float: right; - padding-left: 1rem; -} - -.repository.view.issue .title .issue-title .edit-buttons { +.repository.view.issue .issue-title { display: flex; + align-items: center; + margin-bottom: 8px; } -.repository.view.issue .title .issue-title .index { +.repository.view.issue .issue-title h1 { + display: flex; + align-items: center; + flex: 1; + width: 100%; + font-weight: 300; + font-size: 32px; + line-height: 40px; + margin: 0; + padding-right: 0.25rem; + min-height: 41px; /* avoid layout shift on edit */ +} + +.repository.view.issue .issue-title h1 .ui.input { + font-size: 0.5em; +} + +.repository.view.issue .issue-title h1 .ui.input input { + font-size: 1.5em; + padding: 2px .5rem; +} + +.repository.view.issue .issue-title .index { color: var(--color-text-light-2); } -.repository.view.issue .title .issue-title .label { +.repository.view.issue .issue-title .label { margin-right: 10px; } -.repository.view.issue .title .issue-title .edit-zone { +.repository.view.issue .issue-title .edit-zone { margin-top: 10px; } +.issue-state-label { + display: flex !important; + align-items: center !important; + font-size: 14px !important; + padding: 7px 10px !important; + border-radius: 6px !important; +} + +.issue-state-label .svg { + margin-right: 4px; +} + .repository.view.issue .pull-desc code { color: var(--color-primary); } @@ -1193,13 +1189,15 @@ .repository .milestone.list { list-style: none; - padding-top: 15px; } .repository .milestone.list > .item { padding-top: 10px; padding-bottom: 10px; - border-bottom: 1px dashed var(--color-secondary); +} + +.repository .milestone.list > .item + .item { + border-top: 1px solid var(--color-secondary); } .repository .milestone.list > .item progress { diff --git a/web_src/css/repository/issue-list.css b/web_src/css/repository/issue-list.css index 2c2d3572e02..dde3e7f19f8 100644 --- a/web_src/css/repository/issue-list.css +++ b/web_src/css/repository/issue-list.css @@ -3,6 +3,7 @@ flex-wrap: wrap; align-items: flex-start; gap: 1rem; + margin-top: 1rem; } .issue-list-toolbar-left { diff --git a/web_src/css/repository/list-header.css b/web_src/css/repository/list-header.css index 4130383f89d..24aa36dd89d 100644 --- a/web_src/css/repository/list-header.css +++ b/web_src/css/repository/list-header.css @@ -26,11 +26,11 @@ flex: 1; } -.small-pill-buttons { +.small-menu-items { min-height: 35.4px !important; /* match .small.button in height */ } -.small-pill-buttons .item { +.small-menu-items .item { padding-top: 6px !important; padding-bottom: 6px !important; } diff --git a/web_src/css/repository/release-tag.css b/web_src/css/repository/release-tag.css index 6922ce51796..700ac46c210 100644 --- a/web_src/css/repository/release-tag.css +++ b/web_src/css/repository/release-tag.css @@ -1,7 +1,6 @@ .repository.releases #release-list { - border-top: 1px solid var(--color-secondary); - margin-top: 20px; - padding-top: 15px; + margin-top: 12px; + padding-top: 12px; padding-left: 0; } @@ -23,29 +22,13 @@ } .repository.releases #release-list > li .meta { + margin-top: 4px; text-align: right; position: relative; } -.repository.releases #release-list > li .meta .label { - margin-right: 0; -} - -.repository.releases #release-list > li .meta .commit { - display: block; - margin-top: 10px; -} - -.repository.releases #release-list > li .meta .choose { - margin-top: 15px; -} - -.repository.releases #release-list > li .meta .choose .button { - margin-right: 0; -} - .repository.releases #release-list > li .detail { - border-left: 2px solid var(--color-secondary); + border-left: 1px solid var(--color-secondary); } .repository.releases #release-list > li .detail .author img { @@ -92,7 +75,7 @@ z-index: 9; position: absolute; display: block; - left: -6px; + left: -5.5px; top: 40px; border-radius: 100%; border: 2.5px solid var(--color-body); diff --git a/web_src/css/themes/theme-arc-green.css b/web_src/css/themes/theme-arc-green.css index 5e47f8ee3ee..42cde818029 100644 --- a/web_src/css/themes/theme-arc-green.css +++ b/web_src/css/themes/theme-arc-green.css @@ -29,33 +29,33 @@ --color-primary-alpha-70: #87ab63b3; --color-primary-alpha-80: #87ab63cc; --color-primary-alpha-90: #87ab63e1; - --color-secondary: #454a57; - --color-secondary-dark-1: #505665; - --color-secondary-dark-2: #5b6273; - --color-secondary-dark-3: #71798e; - --color-secondary-dark-4: #7f8699; - --color-secondary-dark-5: #8c93a4; - --color-secondary-dark-6: #9aa0af; - --color-secondary-dark-7: #a8adba; - --color-secondary-dark-8: #b6bac5; - --color-secondary-dark-9: #c4c7d0; - --color-secondary-dark-10: #d2d4db; - --color-secondary-dark-11: #dfe1e6; - --color-secondary-dark-12: #edeef1; + --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: #373b46; - --color-secondary-light-2: #292c34; - --color-secondary-light-3: #1c1e23; - --color-secondary-light-4: #0e0f11; - --color-secondary-alpha-10: #454a5719; - --color-secondary-alpha-20: #454a5733; - --color-secondary-alpha-30: #454a574b; - --color-secondary-alpha-40: #454a5766; - --color-secondary-alpha-50: #454a5780; - --color-secondary-alpha-60: #454a5799; - --color-secondary-alpha-70: #454a57b3; - --color-secondary-alpha-80: #454a57cc; - --color-secondary-alpha-90: #454a57e1; + --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; /* colors */ --color-red: #cc4848; --color-orange: #cc580c; diff --git a/web_src/js/components/RepoBranchTagSelector.vue b/web_src/js/components/RepoBranchTagSelector.vue index d8451e83995..38a375aa85d 100644 --- a/web_src/js/components/RepoBranchTagSelector.vue +++ b/web_src/js/components/RepoBranchTagSelector.vue @@ -1,6 +1,6 @@