diff options
| author | silverwind <me@silverwind.io> | 2024-04-16 10:52:45 +0200 |
|---|---|---|
| committer | 0ko <0ko@noreply.codeberg.org> | 2024-05-24 19:11:37 +0200 |
| commit | f6c1fd76f2aee79d3e1923970e16fbb44ea2bf70 (patch) | |
| tree | 3f314a24fe5a2a36ce8189f5f4c673c337459fbc /templates/repo/branch_dropdown.tmpl | |
| parent | Merge pull request 'Update module github.com/jhillyerd/enmime to v1.2.0' (#37... (diff) | |
| download | forgejo-f6c1fd76f2aee79d3e1923970e16fbb44ea2bf70.tar.xz forgejo-f6c1fd76f2aee79d3e1923970e16fbb44ea2bf70.zip | |
Fix long branch name overflows (https://github.com/go-gitea/gitea/pull/30345)
Fixes: https://github.com/go-gitea/gitea/issues/27971
Fixes: https://github.com/go-gitea/gitea/pull/28010
<img width="689" alt="Screenshot 2024-04-09 at 00 19 57"
src="https://github.com/go-gitea/gitea/assets/115237/7c895a47-274f-40a6-a126-290658f1982d">
Also fixes a similar issue in issue list where CSS was there but not
active because of missing `display: block`.
<img width="372" alt="Screenshot 2024-04-09 at 00 18 25"
src="https://github.com/go-gitea/gitea/assets/115237/cfbee7cd-2e15-4ac7-96ce-020816f48798">
---
Little conflict in branch_selector_field (repo.pulls.no_results is renamed in Gitea)
And some weird conflict on new CSS rules added.
Diffstat (limited to 'templates/repo/branch_dropdown.tmpl')
| -rw-r--r-- | templates/repo/branch_dropdown.tmpl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/templates/repo/branch_dropdown.tmpl b/templates/repo/branch_dropdown.tmpl index 707f670e97..dcb1792485 100644 --- a/templates/repo/branch_dropdown.tmpl +++ b/templates/repo/branch_dropdown.tmpl @@ -71,7 +71,7 @@ {{/* show dummy elements before Vue componment is mounted, this code must match the code in BranchTagSelector.vue */}} <div class="ui dropdown custom"> <button class="branch-dropdown-button gt-ellipsis ui basic small compact button tw-flex tw-m-0"> - <span class="text tw-flex tw-items-center tw-mr-1"> + <span class="text tw-flex tw-items-center tw-mr-1 gt-ellipsis"> {{if .release}} {{ctx.Locale.Tr "repo.release.compare"}} {{else}} @@ -80,7 +80,7 @@ {{else}} {{svg "octicon-git-branch"}} {{end}} - <strong ref="dropdownRefName" class="tw-ml-2">{{if and .root.IsViewTag (not .noTag)}}{{.root.TagName}}{{else if .root.IsViewBranch}}{{.root.BranchName}}{{else}}{{ShortSha .root.CommitID}}{{end}}</strong> + <strong ref="dropdownRefName" class="tw-ml-2 tw-inline-block gt-ellipsis">{{if and .root.IsViewTag (not .noTag)}}{{.root.TagName}}{{else if .root.IsViewBranch}}{{.root.BranchName}}{{else}}{{ShortSha .root.CommitID}}{{end}}</strong> {{end}} </span> {{svg "octicon-triangle-down" 14 "dropdown icon"}} |