diff --git a/templates/repo/home_sidebar_bottom.tmpl b/templates/repo/home_sidebar_bottom.tmpl index 01e630ccbfb2a..4ba6aa05bf67f 100644 --- a/templates/repo/home_sidebar_bottom.tmpl +++ b/templates/repo/home_sidebar_bottom.tmpl @@ -6,8 +6,8 @@
{{ctx.Locale.Tr "repo.releases"}} - {{.NumReleases}} + {{.NumReleases}}
diff --git a/templates/repo/home_sidebar_top.tmpl b/templates/repo/home_sidebar_top.tmpl index 8c2089c839a52..edbf01db09636 100644 --- a/templates/repo/home_sidebar_top.tmpl +++ b/templates/repo/home_sidebar_top.tmpl @@ -9,7 +9,7 @@
{{ctx.Locale.Tr "repo.repo_desc"}}
-
+
{{- $description := .Repository.DescriptionHTML ctx -}} diff --git a/templates/shared/search/code/results.tmpl b/templates/shared/search/code/results.tmpl index 8a08f5c25cb0d..42f7a181a385a 100644 --- a/templates/shared/search/code/results.tmpl +++ b/templates/shared/search/code/results.tmpl @@ -12,7 +12,7 @@ {{range $result := .SearchResults}} {{$repo := or $.Repo (index $.RepoMaps .RepoID)}}
-

+

{{if not $.Repo}} {{$repo.FullName}} diff --git a/web_src/css/repo.css b/web_src/css/repo.css index 206a591fbdaf1..9b70e0e6dbaa1 100644 --- a/web_src/css/repo.css +++ b/web_src/css/repo.css @@ -528,9 +528,12 @@ td .commit-summary { } .repository.view.issue .comment-list .timeline-item .comment-text-line { + /* TODO: this "line-height" is not ideal (actually it is abused), many layouts depend on this magic value, + for example: alignment of the header arrow and the avatar, view PR commit list left icon layout, dismiss review with reason, etc */ line-height: 32px; vertical-align: middle; color: var(--color-text-light); + min-width: 0; } .repository.view.issue .comment-list .timeline-item .comment-text-line .ui.label { @@ -601,9 +604,6 @@ td .commit-summary { width: 100%; margin: 0; } - .repository.view.issue .comment-list .comment .content .form .button:not(:last-child) { - margin-bottom: 1rem; - } } .repository.view.issue .comment-list .comment .merge-section { @@ -654,7 +654,7 @@ td .commit-summary { .repository.view.issue .comment-list .code-comment { border: 1px solid transparent; - margin: 0; + padding: 8px; } .repository.view.issue .comment-list .code-comment .comment-header { @@ -664,6 +664,7 @@ td .commit-summary { } .repository.view.issue .comment-list .code-comment .comment-content { + margin-top: 6px; margin-left: 24px; } @@ -1286,9 +1287,9 @@ td .commit-summary { box-shadow: 0 0 0 3px var(--color-primary-alpha-30) !important; } -.comment:target .header::before { +.comment:target .comment-header::before { border-right-color: var(--color-primary) !important; - filter: drop-shadow(-3px 0 0 var(--color-primary-alpha-30)) !important; + filter: drop-shadow(-4px 0 0 var(--color-primary-alpha-30)) !important; } .code-comment:target, @@ -1308,7 +1309,6 @@ td .commit-summary { padding: 0.5em 1rem; position: relative; color: var(--color-text); - min-height: 41px; display: flex; justify-content: space-between; align-items: center; @@ -1316,6 +1316,10 @@ td .commit-summary { gap: 0.25em; } +.comment-header.avatar-content-left-arrow { + min-height: 41px; /* for a comment header with left arrow, the arrow is absolutely positioned, but the header content varies (for example: no "roles", etc), so it needs a min-height */ +} + .comment-header.avatar-content-left-arrow::after { border-right-color: var(--color-box-header); } @@ -1339,7 +1343,7 @@ td .commit-summary { .comment-header-right { display: flex; align-items: center; - gap: 0.5em; + gap: 6px; } .comment-header-right { @@ -1347,6 +1351,10 @@ td .commit-summary { justify-content: end; } +.comment-header-right > .item.action { + padding: 4px; /* add some padding to make click area larger for the "item action ... ui dropdown" items */ +} + .comment-body { background: var(--color-box-body); border: none !important; diff --git a/web_src/css/repo/reactions.css b/web_src/css/repo/reactions.css index 8fe01af4f0676..f7db80fbbcc65 100644 --- a/web_src/css/repo/reactions.css +++ b/web_src/css/repo/reactions.css @@ -41,16 +41,16 @@ margin-left: 4px; } -.ui.dropdown.select-reaction .menu { - min-width: 170px; /* item-outer-width * 4 */ +.ui.dropdown.select-reaction .menu.visible { + display: grid !important; + grid-template-columns: repeat(4, 1fr); + padding: 4px; } .ui.dropdown.select-reaction .menu > .item { - float: left; - margin: 4px; - font-size: 20px; width: 34px; height: 34px; + font-size: 16px; border-radius: var(--border-radius); display: flex; align-items: center; diff --git a/web_src/css/review.css b/web_src/css/review.css index 39916d1bd857c..9e320346d86a0 100644 --- a/web_src/css/review.css +++ b/web_src/css/review.css @@ -52,7 +52,7 @@ } .comment-code-cloud { - padding: 0.5rem 1rem !important; + padding: 0.5rem !important; position: relative; } diff --git a/web_src/js/components/RepoActionView.vue b/web_src/js/components/RepoActionView.vue index 300f635793456..00748ee9bb260 100644 --- a/web_src/js/components/RepoActionView.vue +++ b/web_src/js/components/RepoActionView.vue @@ -489,7 +489,7 @@ export default defineComponent({ -

@@ -520,7 +520,7 @@ export default defineComponent({ {{ job.name }}
- + {{ job.duration }}