Skip to content

Commit 6f8e62f

Browse files
authored
Fix some UI problems for 1.23 (#33856)
Partially backport #32927 #33851
1 parent a2c6ecc commit 6f8e62f

File tree

3 files changed

+9
-1
lines changed

3 files changed

+9
-1
lines changed

Diff for: web_src/css/modules/navbar.css

+4
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,10 @@
5757
margin-right: 0;
5858
}
5959

60+
#navbar .item.active {
61+
background: var(--color-active);
62+
}
63+
6064
@media (max-width: 767.98px) {
6165
#navbar {
6266
align-items: stretch;

Diff for: web_src/js/features/repo-diff.ts

+4-1
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,10 @@ function initRepoDiffShowMore() {
221221
if (!resp) {
222222
return;
223223
}
224-
$target.parent().replaceWith($(resp).find('#diff-file-boxes .diff-file-body .file-body').children());
224+
const $respFileBody = $(resp).find('#diff-file-boxes .diff-file-body .file-body');
225+
const respFileBodyChildren = Array.from($respFileBody.children());
226+
$target.parent().replaceWith($respFileBody.children());
227+
for (const el of respFileBodyChildren) window.htmx.process(el);
225228
onShowMoreFiles();
226229
} catch (error) {
227230
console.error('Error:', error);

Diff for: web_src/js/globals.d.ts

+1
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ interface Window {
6363
jQuery: typeof import('@types/jquery'),
6464
htmx: Omit<typeof import('htmx.org/dist/htmx.esm.js').default, 'config'> & {
6565
config?: Writable<typeof import('htmx.org').default.config>,
66+
process?: (elt: Element | string) => void,
6667
},
6768
ui?: any,
6869
_globalHandlerErrors: Array<ErrorEvent & PromiseRejectionEvent> & {

0 commit comments

Comments
 (0)