From 3e044d2c9fea7c197aa0476e2c9735320c112e03 Mon Sep 17 00:00:00 2001 From: silverwind Date: Wed, 16 Aug 2023 02:08:23 +0200 Subject: [PATCH] Use unique class for breadcrumb divider (#26524) Fix regression from https://github.com/go-gitea/gitea/pull/25539: https://github.com/go-gitea/gitea/pull/26519#issuecomment-1678825200. Before: Screenshot 2023-08-15 at 15 46 12 After: Screenshot 2023-08-15 at 15 46 19 Screenshot 2023-08-15 at 15 56 11 --- templates/repo/editor/cherry_pick.tmpl | 2 +- templates/repo/editor/edit.tmpl | 2 +- templates/repo/editor/patch.tmpl | 2 +- templates/repo/editor/upload.tmpl | 2 +- templates/repo/home.tmpl | 2 +- web_src/css/modules/breadcrumb.css | 11 ++++++++--- web_src/js/features/repo-editor.js | 4 ++-- 7 files changed, 15 insertions(+), 10 deletions(-) diff --git a/templates/repo/editor/cherry_pick.tmpl b/templates/repo/editor/cherry_pick.tmpl index 828addb75..59948f283 100644 --- a/templates/repo/editor/cherry_pick.tmpl +++ b/templates/repo/editor/cherry_pick.tmpl @@ -18,7 +18,7 @@ {{.locale.Tr "repo.editor.cherry_pick" $shalink | Str2html}} {{end}} {{.Repository.FullName}} -
:
+
:
{{.BranchName}} {{.locale.Tr "repo.editor.or"}} {{.locale.Tr "repo.editor.cancel_lower"}} diff --git a/templates/repo/editor/edit.tmpl b/templates/repo/editor/edit.tmpl index 988b11911..3b5a63f3a 100644 --- a/templates/repo/editor/edit.tmpl +++ b/templates/repo/editor/edit.tmpl @@ -13,7 +13,7 @@ {{$n := len .TreeNames}} {{$l := Eval $n "-" 1}} {{range $i, $v := .TreeNames}} -
/
+
/
{{if eq $i $l}} {{svg "octicon-info"}} diff --git a/templates/repo/editor/patch.tmpl b/templates/repo/editor/patch.tmpl index 581a80e82..1f948fbb1 100644 --- a/templates/repo/editor/patch.tmpl +++ b/templates/repo/editor/patch.tmpl @@ -11,7 +11,7 @@
{{.locale.Tr "repo.editor.patching"}} {{.Repository.FullName}} -
:
+
:
{{.BranchName}} {{.locale.Tr "repo.editor.or"}} {{.locale.Tr "repo.editor.cancel_lower"}} diff --git a/templates/repo/editor/upload.tmpl b/templates/repo/editor/upload.tmpl index d9408c9ee..bfb6f150c 100644 --- a/templates/repo/editor/upload.tmpl +++ b/templates/repo/editor/upload.tmpl @@ -11,7 +11,7 @@ {{$n := len .TreeNames}} {{$l := Eval $n "-" 1}} {{range $i, $v := .TreeNames}} -
/
+
/
{{if eq $i $l}} {{svg "octicon-info"}} diff --git a/templates/repo/home.tmpl b/templates/repo/home.tmpl index aaa1a1b97..7eb4ba463 100644 --- a/templates/repo/home.tmpl +++ b/templates/repo/home.tmpl @@ -113,7 +113,7 @@ {{StringUtils.EllipsisString .Repository.Name 30}} {{- range $i, $v := .TreeNames -}} - / + / {{- if eq $i $l -}} {{StringUtils.EllipsisString $v 30}} {{- else -}} diff --git a/web_src/css/modules/breadcrumb.css b/web_src/css/modules/breadcrumb.css index 67830e562..ca488c215 100644 --- a/web_src/css/modules/breadcrumb.css +++ b/web_src/css/modules/breadcrumb.css @@ -1,7 +1,12 @@ -.breadcrumb .divider { +.breadcrumb { + display: flex; + flex-wrap: wrap; + align-items: center; + gap: 3px; +} + +.breadcrumb .breadcrumb-divider { color: var(--color-text-light-2); - margin-left: 3px; - margin-right: 3px; } .breadcrumb > * { diff --git a/web_src/js/features/repo-editor.js b/web_src/js/features/repo-editor.js index b7937cf00..c48c3fdfd 100644 --- a/web_src/js/features/repo-editor.js +++ b/web_src/js/features/repo-editor.js @@ -114,7 +114,7 @@ export function initRepoEditor() { if (i < parts.length - 1) { if (value.length) { $(`${htmlEscape(value)}`).insertBefore($(this)); - $('
/
').insertBefore($(this)); + $('
/
').insertBefore($(this)); } } else { $(this).val(value); @@ -132,7 +132,7 @@ export function initRepoEditor() { // Jump back to last directory once the filename is empty if (e.code === 'Backspace' && getCursorPosition($(this)) === 0 && $section.length > 0) { e.preventDefault(); - const $divider = $('.breadcrumb div.divider'); + const $divider = $('.breadcrumb .breadcrumb-divider'); const value = $section.last().find('a').text(); $(this).val(value + $(this).val()); this.setSelectionRange(value.length, value.length);