From 5fd03b700079fc5fc2db54721ed54ddc38b5c314 Mon Sep 17 00:00:00 2001 From: HesterG <hestergong@gmail.com> Date: Fri, 17 Mar 2023 17:23:06 +0800 Subject: [PATCH 1/5] fix long name path and label --- templates/explore/repo_list.tmpl | 2 +- templates/repo/pulls/fork.tmpl | 4 ++-- web_src/css/form.css | 6 ++++-- web_src/css/user.css | 4 ++++ 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/templates/explore/repo_list.tmpl b/templates/explore/repo_list.tmpl index 6650e6073fcf2..288313c7d4521 100644 --- a/templates/explore/repo_list.tmpl +++ b/templates/explore/repo_list.tmpl @@ -10,7 +10,7 @@ <a class="name" href="{{.Link}}"> {{if or $.PageIsExplore $.PageIsProfileStarList}}{{if .Owner}}{{.Owner.Name}} / {{end}}{{end}}{{.Name}} </a> - <div class="labels gt-df gt-ac gt-fw"> + <div class="labels gt-df gt-ac gt-fw gt-mr-3"> {{if .IsArchived}} <span class="ui basic label">{{$.locale.Tr "repo.desc.archived"}}</span> {{end}} diff --git a/templates/repo/pulls/fork.tmpl b/templates/repo/pulls/fork.tmpl index 930d5afa69b2c..4c6519858c71b 100644 --- a/templates/repo/pulls/fork.tmpl +++ b/templates/repo/pulls/fork.tmpl @@ -35,9 +35,9 @@ </div> </div> - <div class="inline field"> + <div class="inline field fork-repo-fullname"> <label>{{.locale.Tr "repo.fork_from"}}</label> - <a href="{{.ForkRepo.Link}}">{{.ForkRepo.FullName}}</a> + <a href="{{.ForkRepo.Link}}" class="gt-dib">{{.ForkRepo.FullName}}</a> </div> <div class="inline required field {{if .Err_RepoName}}error{{end}}"> <label for="repo_name">{{.locale.Tr "repo.repo_name"}}</label> diff --git a/web_src/css/form.css b/web_src/css/form.css index e325a377f8d8b..6192ec16bf5ca 100644 --- a/web_src/css/form.css +++ b/web_src/css/form.css @@ -479,7 +479,8 @@ textarea:focus, .repository.new.repo form .selection.dropdown, .repository.new.migrate form .selection.dropdown, -.repository.new.fork form .selection.dropdown { +.repository.new.fork form .selection.dropdown, +.fork-repo-fullname a { vertical-align: middle; width: 50% !important; } @@ -493,7 +494,8 @@ textarea:focus, .repository.new.fork form input, .repository.new.repo form .selection.dropdown, .repository.new.migrate form .selection.dropdown, - .repository.new.fork form .selection.dropdown { + .repository.new.fork form .selection.dropdown, + .fork-repo-fullname a { width: 100% !important; } .repository.new.repo form .field button, diff --git a/web_src/css/user.css b/web_src/css/user.css index adf865496be36..64abcee22a9f8 100644 --- a/web_src/css/user.css +++ b/web_src/css/user.css @@ -67,6 +67,10 @@ margin-top: 25px; } +.user.profile .ui.repository.list .repo-title .labels { + flex-shrink: 0; +} + .user.profile #loading-heatmap { margin-bottom: 1em; } From 69cc5e7dcc448bd85b86851cfcf928cf9691cfb3 Mon Sep 17 00:00:00 2001 From: HesterG <hestergong@gmail.com> Date: Fri, 17 Mar 2023 17:40:27 +0800 Subject: [PATCH 2/5] update selectors --- templates/repo/pulls/fork.tmpl | 2 +- web_src/css/form.css | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/templates/repo/pulls/fork.tmpl b/templates/repo/pulls/fork.tmpl index 4c6519858c71b..34adc7b2f1d57 100644 --- a/templates/repo/pulls/fork.tmpl +++ b/templates/repo/pulls/fork.tmpl @@ -35,7 +35,7 @@ </div> </div> - <div class="inline field fork-repo-fullname"> + <div class="inline field"> <label>{{.locale.Tr "repo.fork_from"}}</label> <a href="{{.ForkRepo.Link}}" class="gt-dib">{{.ForkRepo.FullName}}</a> </div> diff --git a/web_src/css/form.css b/web_src/css/form.css index 6192ec16bf5ca..324a210f4f972 100644 --- a/web_src/css/form.css +++ b/web_src/css/form.css @@ -480,7 +480,7 @@ textarea:focus, .repository.new.repo form .selection.dropdown, .repository.new.migrate form .selection.dropdown, .repository.new.fork form .selection.dropdown, -.fork-repo-fullname a { +.repository.new.fork form .field a { vertical-align: middle; width: 50% !important; } @@ -492,18 +492,17 @@ textarea:focus, .repository.new.repo form input, .repository.new.migrate form input, .repository.new.fork form input, + .repository.new.fork form .field a, .repository.new.repo form .selection.dropdown, .repository.new.migrate form .selection.dropdown, - .repository.new.fork form .selection.dropdown, - .fork-repo-fullname a { + .repository.new.fork form .selection.dropdown { width: 100% !important; } .repository.new.repo form .field button, .repository.new.migrate form .field button, .repository.new.fork form .field button, .repository.new.repo form .field a, - .repository.new.migrate form .field a, - .repository.new.fork form .field a { + .repository.new.migrate form .field a { margin-bottom: 1em; width: 100%; } From d706cb1b7e207af3ebffcd6c4661fec5e9817995 Mon Sep 17 00:00:00 2001 From: HesterG <hestergong@gmail.com> Date: Fri, 17 Mar 2023 17:46:41 +0800 Subject: [PATCH 3/5] longname file word break --- web_src/css/repository.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/web_src/css/repository.css b/web_src/css/repository.css index d2040ec0ac56e..2708cf4d4793d 100644 --- a/web_src/css/repository.css +++ b/web_src/css/repository.css @@ -214,6 +214,10 @@ font-size: 1.2em; } +.repository.file.list .repo-path { + word-break: break-word; +} + .repository.file.list .repo-path .section, .repository.file.list .repo-path .divider { display: inline; From 4c401498de21cbe3ab9c878a9c157a58aa848591 Mon Sep 17 00:00:00 2001 From: HesterG <hestergong@gmail.com> Date: Fri, 17 Mar 2023 17:58:25 +0800 Subject: [PATCH 4/5] fix labels on explore list --- web_src/css/explore.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/web_src/css/explore.css b/web_src/css/explore.css index 8543702252470..ddb40aac9da35 100644 --- a/web_src/css/explore.css +++ b/web_src/css/explore.css @@ -41,6 +41,10 @@ margin-bottom: 0.5rem; } +.ui.repository.list .repo-title .labels { + flex-shrink: 0; +} + .ui.repository.branches .info { font-size: 12px; color: var(--color-text-light); From fefb7e8ad9b8087a3d0f990cae5afab749eb3099 Mon Sep 17 00:00:00 2001 From: HesterG <hestergong@gmail.com> Date: Fri, 17 Mar 2023 18:19:03 +0800 Subject: [PATCH 5/5] change word break --- web_src/css/explore.css | 1 + web_src/css/user.css | 1 + 2 files changed, 2 insertions(+) diff --git a/web_src/css/explore.css b/web_src/css/explore.css index ddb40aac9da35..e3f9dddc58688 100644 --- a/web_src/css/explore.css +++ b/web_src/css/explore.css @@ -42,6 +42,7 @@ } .ui.repository.list .repo-title .labels { + word-break: normal; flex-shrink: 0; } diff --git a/web_src/css/user.css b/web_src/css/user.css index 64abcee22a9f8..a3379440dfe66 100644 --- a/web_src/css/user.css +++ b/web_src/css/user.css @@ -68,6 +68,7 @@ } .user.profile .ui.repository.list .repo-title .labels { + word-break: normal; flex-shrink: 0; }