From f1253dc6f28513463d90a4cc51a1042ded3281b1 Mon Sep 17 00:00:00 2001 From: HesterG Date: Thu, 23 Mar 2023 12:04:59 +0800 Subject: [PATCH 1/8] fix long project name --- templates/repo/issue/list.tmpl | 6 +++--- templates/shared/issuelist.tmpl | 18 +++++++++++------- web_src/css/repository.css | 5 +++++ web_src/css/shared/issuelist.css | 4 ++++ 4 files changed, 23 insertions(+), 10 deletions(-) diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl index 726ef25cfe8ad..aaa6d91afddf3 100644 --- a/templates/repo/issue/list.tmpl +++ b/templates/repo/issue/list.tmpl @@ -99,8 +99,8 @@ {{.locale.Tr "repo.issues.new.open_projects"}} {{range .OpenProjects}} - - {{svg .IconName 18 "gt-mr-3"}}{{.Title}} + + {{svg .IconName 18 "gt-mr-3"}}{{.Title}} {{end}} {{end}} @@ -267,7 +267,7 @@ {{if .OpenProjects}}
- {{.locale.Tr "repo.issues.new.open_projects"}} + bbb{{.locale.Tr "repo.issues.new.open_projects"}}
{{range .OpenProjects}}
diff --git a/templates/shared/issuelist.tmpl b/templates/shared/issuelist.tmpl index 40ddb4dab03a5..2720f7e26b2a6 100644 --- a/templates/shared/issuelist.tmpl +++ b/templates/shared/issuelist.tmpl @@ -143,13 +143,15 @@ {{end}}
+ {{if or .TotalTrackedTime .Assignees .NumComments}}
+ {{if .TotalTrackedTime}}
- {{if .TotalTrackedTime}} {{svg "octicon-clock" 16 "gt-mr-2"}} {{.TotalTrackedTime | Sec2Time}} - {{end}}
+ {{end}} + {{if .Assignees}}
{{range .Assignees}} @@ -157,14 +159,16 @@ {{end}}
+ {{end}} + {{if .NumComments}}
- {{if .NumComments}} - - {{svg "octicon-comment" 16 "gt-mr-2"}}{{.NumComments}} - - {{end}} + + {{svg "octicon-comment" 16 "gt-mr-2"}}{{.NumComments}} +
+ {{end}}
+ {{end}} {{end}} {{if .IssueIndexerUnavailable}} diff --git a/web_src/css/repository.css b/web_src/css/repository.css index eb555abec8443..390aedb706b2b 100644 --- a/web_src/css/repository.css +++ b/web_src/css/repository.css @@ -2469,6 +2469,11 @@ padding-bottom: 9px !important; } +.repository .project-name { + max-width: 200px; + display: inline-block; +} + #cite-repo-modal #citation-panel { width: 500px; } diff --git a/web_src/css/shared/issuelist.css b/web_src/css/shared/issuelist.css index 6e2cc737e7d90..ffa26a52a696c 100644 --- a/web_src/css/shared/issuelist.css +++ b/web_src/css/shared/issuelist.css @@ -132,6 +132,10 @@ margin-left: 5px; } +.issue.list > .item .desc a.project { + word-break: break-all; +} + .issue.list > .item .desc a.ref { margin-left: 8px; } From c30d5d628d9bbe86788e9c2491f8b1dbe615f033 Mon Sep 17 00:00:00 2001 From: HesterG Date: Thu, 23 Mar 2023 14:55:26 +0800 Subject: [PATCH 2/8] fix long names --- templates/repo/issue/list.tmpl | 6 +++--- templates/repo/search_name.tmpl | 2 +- web_src/css/repository.css | 8 ++------ 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl index aaa6d91afddf3..2216f544dbaa1 100644 --- a/templates/repo/issue/list.tmpl +++ b/templates/repo/issue/list.tmpl @@ -100,7 +100,7 @@ {{range .OpenProjects}} - {{svg .IconName 18 "gt-mr-3"}}{{.Title}} + {{svg .IconName 18 "gt-mr-3"}}{{.Title}} {{end}} {{end}} @@ -131,7 +131,7 @@ {{.locale.Tr "repo.issues.filter_poster_no_select"}} {{range .Posters}} - + {{avatar $.Context .}}{{template "repo/search_name" .}} {{end}} @@ -151,7 +151,7 @@ {{.locale.Tr "repo.issues.filter_assginee_no_select"}} {{range .Assignees}} - + {{avatar $.Context .}}{{template "repo/search_name" .}} {{end}} diff --git a/templates/repo/search_name.tmpl b/templates/repo/search_name.tmpl index 468f6c394cd83..ed299bf081664 100644 --- a/templates/repo/search_name.tmpl +++ b/templates/repo/search_name.tmpl @@ -1 +1 @@ -{{.Name}}{{if IsShowFullName}} {{.FullName}}{{end}} +{{.Name}}{{if IsShowFullName}} {{.FullName}}{{end}} \ No newline at end of file diff --git a/web_src/css/repository.css b/web_src/css/repository.css index 390aedb706b2b..34c76b15c9b2d 100644 --- a/web_src/css/repository.css +++ b/web_src/css/repository.css @@ -143,7 +143,8 @@ .repository .filter.menu .menu { max-height: 500px; - overflow-x: auto; + max-width: 300px; + overflow-x: hidden; right: 0 !important; left: auto !important; } @@ -2469,11 +2470,6 @@ padding-bottom: 9px !important; } -.repository .project-name { - max-width: 200px; - display: inline-block; -} - #cite-repo-modal #citation-panel { width: 500px; } From 970dd3129daa0c70fff32da942d4c9ead51a0214 Mon Sep 17 00:00:00 2001 From: HesterG Date: Thu, 23 Mar 2023 15:29:17 +0800 Subject: [PATCH 3/8] fix menu long name --- templates/repo/issue/list.tmpl | 8 ++++---- templates/repo/search_name.tmpl | 2 +- web_src/css/helpers.css | 2 ++ 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl index 2216f544dbaa1..422ac8b5d709d 100644 --- a/templates/repo/issue/list.tmpl +++ b/templates/repo/issue/list.tmpl @@ -99,8 +99,8 @@ {{.locale.Tr "repo.issues.new.open_projects"}} {{range .OpenProjects}} - - {{svg .IconName 18 "gt-mr-3"}}{{.Title}} + + {{svg .IconName 18 "gt-mr-3 gt-shrink-0"}}{{.Title}} {{end}} {{end}} @@ -131,7 +131,7 @@ {{.locale.Tr "repo.issues.filter_poster_no_select"}} {{range .Posters}} - + {{avatar $.Context .}}{{template "repo/search_name" .}} {{end}} @@ -151,7 +151,7 @@ {{.locale.Tr "repo.issues.filter_assginee_no_select"}} {{range .Assignees}} - + {{avatar $.Context .}}{{template "repo/search_name" .}} {{end}} diff --git a/templates/repo/search_name.tmpl b/templates/repo/search_name.tmpl index ed299bf081664..5a481761cc8f4 100644 --- a/templates/repo/search_name.tmpl +++ b/templates/repo/search_name.tmpl @@ -1 +1 @@ -{{.Name}}{{if IsShowFullName}} {{.FullName}}{{end}} \ No newline at end of file +{{.Name}}{{if IsShowFullName}} {{.FullName}}{{end}} diff --git a/web_src/css/helpers.css b/web_src/css/helpers.css index 1c02de2d7a0b8..abaa0762071fb 100644 --- a/web_src/css/helpers.css +++ b/web_src/css/helpers.css @@ -197,6 +197,8 @@ .gt-content-center { align-content: center !important; } +.gt-shrink-0 { flex-shrink: 0 !important; } + @media (max-width: 767px) { .gt-db-small { display: block !important; } .gt-w-100-small { width: 100% !important; } From ce84db58913b7538c213bbcb6ae077cbf0ff501f Mon Sep 17 00:00:00 2001 From: HesterG Date: Thu, 23 Mar 2023 16:09:26 +0800 Subject: [PATCH 4/8] fix wra[ --- web_src/css/shared/issuelist.css | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/web_src/css/shared/issuelist.css b/web_src/css/shared/issuelist.css index ffa26a52a696c..a1e62bf8a443f 100644 --- a/web_src/css/shared/issuelist.css +++ b/web_src/css/shared/issuelist.css @@ -92,6 +92,10 @@ margin-right: 0.25rem; } +.issue.list > .item .desc a:not(.index) { + word-break: break-all; +} + .issue.list > .item .desc .waiting, .issue.list > .item .desc .approvals, .issue.list > .item .desc .rejects { @@ -132,10 +136,6 @@ margin-left: 5px; } -.issue.list > .item .desc a.project { - word-break: break-all; -} - .issue.list > .item .desc a.ref { margin-left: 8px; } From 604bab72b8fbd1dcb931921761bb5b81c31df2e6 Mon Sep 17 00:00:00 2001 From: HesterG Date: Thu, 23 Mar 2023 16:11:02 +0800 Subject: [PATCH 5/8] clean up --- templates/repo/issue/list.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl index 422ac8b5d709d..38ed3873ba4c8 100644 --- a/templates/repo/issue/list.tmpl +++ b/templates/repo/issue/list.tmpl @@ -267,7 +267,7 @@ {{if .OpenProjects}}
- bbb{{.locale.Tr "repo.issues.new.open_projects"}} + {{.locale.Tr "repo.issues.new.open_projects"}}
{{range .OpenProjects}}
From 3d822104d816c7151447ab96740adbae3e501077 Mon Sep 17 00:00:00 2001 From: HesterG Date: Thu, 23 Mar 2023 16:21:26 +0800 Subject: [PATCH 6/8] break --- web_src/css/shared/issuelist.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web_src/css/shared/issuelist.css b/web_src/css/shared/issuelist.css index a1e62bf8a443f..a0808d90e0ae2 100644 --- a/web_src/css/shared/issuelist.css +++ b/web_src/css/shared/issuelist.css @@ -92,7 +92,7 @@ margin-right: 0.25rem; } -.issue.list > .item .desc a:not(.index) { +.issue.list > .item .desc a { word-break: break-all; } From 8cb6b7763a1d5c2db7af55541e794fb2897d0321 Mon Sep 17 00:00:00 2001 From: HesterG Date: Thu, 23 Mar 2023 16:57:14 +0800 Subject: [PATCH 7/8] use break word --- web_src/css/shared/issuelist.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web_src/css/shared/issuelist.css b/web_src/css/shared/issuelist.css index a0808d90e0ae2..404ad2084092b 100644 --- a/web_src/css/shared/issuelist.css +++ b/web_src/css/shared/issuelist.css @@ -93,7 +93,7 @@ } .issue.list > .item .desc a { - word-break: break-all; + word-break: break-word; } .issue.list > .item .desc .waiting, From 7e3670b027765c961462f88d7f1bacf691e662ec Mon Sep 17 00:00:00 2001 From: HesterG Date: Thu, 23 Mar 2023 18:05:19 +0800 Subject: [PATCH 8/8] fix lint --- web_src/css/shared/issuelist.css | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/web_src/css/shared/issuelist.css b/web_src/css/shared/issuelist.css index 404ad2084092b..ebb1ca989b87f 100644 --- a/web_src/css/shared/issuelist.css +++ b/web_src/css/shared/issuelist.css @@ -84,6 +84,7 @@ .issue.list > .item .desc a { color: inherit; + word-break: break-word; } .issue.list > .item .desc .time-since, @@ -92,10 +93,6 @@ margin-right: 0.25rem; } -.issue.list > .item .desc a { - word-break: break-word; -} - .issue.list > .item .desc .waiting, .issue.list > .item .desc .approvals, .issue.list > .item .desc .rejects {