BlueGit

timfa bluegit

Merge branch 'cursor/bestandsweergave-674d' into 'stage'

timfa

Authored 2026-10-23 · 3 weeks ago

Hash
18f2a62e6b781ed031cd60ebe31aca61b9508461
Pipeline
Passed
3 files changed +42 −9
internal/server/server_test.go +2 −0
@@ -542,6 +542,7 @@ func TestProjectOverviewAndFiles(t *testing.T) {
542 542 `data-path="src/main.go"`,
543 543 `data-path="crates/sim"`,
544 544 `data-repo="tim/legacy-cycles"`,
545 `class="fill"`,
545 546 `class="filepane"`,
546 547 `class="twist"`,
547 548 `aria-expanded="false"`,
@@ -574,6 +575,7 @@ func TestProjectOverviewAndFiles(t *testing.T) {
574 575 `aria-expanded="true"`,
575 576 `data-path="src"`,
576 577 `data-repo="tim/legacy-cycles"`,
578 `class="fill"`,
577 579 `class="filepane"`,
578 580 `class="chevron"`,
579 581 `<span class="hl-k">func</span>`,
@@ -542,6 +542,7 @@ func TestProjectOverviewAndFiles(t *testing.T) {
542 `data-path="src/main.go"`,
542 `data-path="src/main.go"`,
543 `data-path="crates/sim"`,
543 `data-path="crates/sim"`,
544 `data-repo="tim/legacy-cycles"`,
544 `data-repo="tim/legacy-cycles"`,
545 `class="fill"`,
545 `class="filepane"`,
546 `class="filepane"`,
546 `class="twist"`,
547 `class="twist"`,
547 `aria-expanded="false"`,
548 `aria-expanded="false"`,
@@ -574,6 +575,7 @@ func TestProjectOverviewAndFiles(t *testing.T) {
574 `aria-expanded="true"`,
575 `aria-expanded="true"`,
575 `data-path="src"`,
576 `data-path="src"`,
576 `data-repo="tim/legacy-cycles"`,
577 `data-repo="tim/legacy-cycles"`,
578 `class="fill"`,
577 `class="filepane"`,
579 `class="filepane"`,
578 `class="chevron"`,
580 `class="chevron"`,
579 `<span class="hl-k">func</span>`,
581 `<span class="hl-k">func</span>`,
internal/server/static/style.css +39 −8
@@ -279,9 +279,28 @@ table.md th, table.md td { border: 1px solid var(--line); padding: 0.4rem 0.6rem
279 279 .counts a { text-decoration: none; }
280 280 .fileview {
281 281 display: grid; grid-template-columns: 240px minmax(0, 1fr); gap: 1rem; align-items: stretch;
282 /* topbalk, padding van main, kruimels en paginatitel */
283 height: calc(100vh - var(--top-h) - 8.25rem); min-height: 18rem;
284 }
282 min-width: 0; min-height: 0;
283 }
284 body:has(main.fill) { height: 100vh; overflow: hidden; }
285 .frame.with-side:has(main.fill) {
286 height: calc(100vh - var(--top-h));
287 overflow: hidden;
288 align-items: stretch;
289 }
290 .content:has(main.fill) {
291 flex: 1 1 auto; align-self: stretch; min-width: 0; min-height: 0;
292 overflow: hidden; align-items: stretch; justify-content: stretch;
293 }
294 main.fill {
295 flex: 1 1 auto; width: 100%; max-width: none; height: 100%;
296 min-width: 0; min-height: 0; box-sizing: border-box;
297 display: flex; flex-direction: column; overflow: hidden;
298 padding-bottom: var(--sp-3);
299 }
300 main.fill > .crumbs,
301 main.fill > .pagehead,
302 main.fill > .flash { flex: none; }
303 main.fill > .fileview { flex: 1 1 auto; min-height: 0; }
285 304 .treebox { display: flex; flex-direction: column; min-width: 0; min-height: 0; }
286 305 .treebox h2 { margin: 0 0 0.5rem; font-size: 1.15rem; flex: none; }
287 306 .treebox > input { flex: none; }
@@ -313,13 +332,20 @@ table.md th, table.md td { border: 1px solid var(--line); padding: 0.4rem 0.6rem
313 332 .treelist li.depth-6, .treelist li.depth-7, .treelist li.depth-8 { padding-left: 4.4rem; }
314 333 .filecol { display: flex; flex-direction: column; min-width: 0; min-height: 0; }
315 334 .filecol > .toolbar { flex: none; margin-top: 0; }
316 .filepane { flex: 1 1 auto; min-height: 0; overflow: auto; }
335 .filepane { flex: 1 1 auto; min-height: 0; min-width: 0; overflow: auto; }
336 .filepane:has(.codebox) { display: flex; flex-direction: column; overflow: hidden; }
337 .filepane:has(.codebox) > .filename,
338 .filepane:has(.codebox) > .commitbar { flex: none; }
317 339 .filename { display: flex; align-items: center; gap: 0.35rem; margin: 0.2rem 0 0.6rem; }
318 340 .codebox { margin-top: 0.8rem; overflow: auto; }
319 .fileview .codebox { overflow: visible; }
341 .fileview .codebox {
342 overflow: auto; flex: 1 1 auto; min-height: 0; min-width: 0; margin-top: 0;
343 }
320 344 table.code { border-collapse: collapse; width: 100%; }
345 .fileview table.code { width: max-content; min-width: 100%; }
321 346 table.code td { border: 0; padding: 0 0.7rem; vertical-align: top; font-family: ui-monospace, monospace; font-size: 0.86rem; line-height: 1.45; }
322 347 table.code td.ln { color: #8c959f; text-align: right; width: 1%; user-select: none; background: #f6f8fa; }
348 .fileview table.code td.ln { position: sticky; left: 0; z-index: 1; }
323 349 table.code td.src { white-space: pre; }
324 350 .hl-k { color: #8250df; }
325 351 .hl-s { color: #cf222e; }
@@ -945,10 +971,15 @@ form.wh .grid-2 label { margin-top: 0; }
945 971 @media (max-width: 800px) {
946 972 .proj, .fileview, .joblayout { grid-template-columns: minmax(0, 1fr); }
947 973 .proj > *, .fileview > *, .toolbar, .commitbar, .hscroll { min-width: 0; max-width: 100%; }
974 body:has(main.fill) { height: auto; overflow: auto; }
975 .frame.with-side:has(main.fill),
976 .content:has(main.fill) { height: auto; overflow: visible; }
977 main.fill { display: block; height: auto; overflow: visible; }
948 978 .fileview { height: auto; min-height: 0; }
949 .fileview .treelist { max-height: 40vh; flex: none; }
950 .fileview .filepane { overflow: visible; }
951 .fileview .codebox { overflow: auto; }
979 .fileview .treelist { max-height: none; overflow: visible; flex: none; }
980 .fileview .filepane,
981 .filepane:has(.codebox) { overflow: visible; display: block; }
982 .fileview .codebox { overflow: auto; flex: none; max-height: none; }
952 983 .heat-foot { flex-direction: column; align-items: flex-start; }
953 984 .heat-legend, .heat-foot .muted { justify-content: flex-start; text-align: left; }
954 985 .repolist > li { flex-wrap: wrap; }
@@ -279,9 +279,28 @@ table.md th, table.md td { border: 1px solid var(--line); padding: 0.4rem 0.6rem
279.counts a { text-decoration: none; }
279.counts a { text-decoration: none; }
280.fileview {
280.fileview {
281 display: grid; grid-template-columns: 240px minmax(0, 1fr); gap: 1rem; align-items: stretch;
281 display: grid; grid-template-columns: 240px minmax(0, 1fr); gap: 1rem; align-items: stretch;
282 /* topbalk, padding van main, kruimels en paginatitel */
282 min-width: 0; min-height: 0;
283 height: calc(100vh - var(--top-h) - 8.25rem); min-height: 18rem;
283}
284}
284body:has(main.fill) { height: 100vh; overflow: hidden; }
285.frame.with-side:has(main.fill) {
286 height: calc(100vh - var(--top-h));
287 overflow: hidden;
288 align-items: stretch;
289}
290.content:has(main.fill) {
291 flex: 1 1 auto; align-self: stretch; min-width: 0; min-height: 0;
292 overflow: hidden; align-items: stretch; justify-content: stretch;
293}
294main.fill {
295 flex: 1 1 auto; width: 100%; max-width: none; height: 100%;
296 min-width: 0; min-height: 0; box-sizing: border-box;
297 display: flex; flex-direction: column; overflow: hidden;
298 padding-bottom: var(--sp-3);
299}
300main.fill > .crumbs,
301main.fill > .pagehead,
302main.fill > .flash { flex: none; }
303main.fill > .fileview { flex: 1 1 auto; min-height: 0; }
285.treebox { display: flex; flex-direction: column; min-width: 0; min-height: 0; }
304.treebox { display: flex; flex-direction: column; min-width: 0; min-height: 0; }
286.treebox h2 { margin: 0 0 0.5rem; font-size: 1.15rem; flex: none; }
305.treebox h2 { margin: 0 0 0.5rem; font-size: 1.15rem; flex: none; }
287.treebox > input { flex: none; }
306.treebox > input { flex: none; }
@@ -313,13 +332,20 @@ table.md th, table.md td { border: 1px solid var(--line); padding: 0.4rem 0.6rem
313.treelist li.depth-6, .treelist li.depth-7, .treelist li.depth-8 { padding-left: 4.4rem; }
332.treelist li.depth-6, .treelist li.depth-7, .treelist li.depth-8 { padding-left: 4.4rem; }
314.filecol { display: flex; flex-direction: column; min-width: 0; min-height: 0; }
333.filecol { display: flex; flex-direction: column; min-width: 0; min-height: 0; }
315.filecol > .toolbar { flex: none; margin-top: 0; }
334.filecol > .toolbar { flex: none; margin-top: 0; }
316.filepane { flex: 1 1 auto; min-height: 0; overflow: auto; }
335.filepane { flex: 1 1 auto; min-height: 0; min-width: 0; overflow: auto; }
336.filepane:has(.codebox) { display: flex; flex-direction: column; overflow: hidden; }
337.filepane:has(.codebox) > .filename,
338.filepane:has(.codebox) > .commitbar { flex: none; }
317.filename { display: flex; align-items: center; gap: 0.35rem; margin: 0.2rem 0 0.6rem; }
339.filename { display: flex; align-items: center; gap: 0.35rem; margin: 0.2rem 0 0.6rem; }
318.codebox { margin-top: 0.8rem; overflow: auto; }
340.codebox { margin-top: 0.8rem; overflow: auto; }
319.fileview .codebox { overflow: visible; }
341.fileview .codebox {
342 overflow: auto; flex: 1 1 auto; min-height: 0; min-width: 0; margin-top: 0;
343}
320table.code { border-collapse: collapse; width: 100%; }
344table.code { border-collapse: collapse; width: 100%; }
345.fileview table.code { width: max-content; min-width: 100%; }
321table.code td { border: 0; padding: 0 0.7rem; vertical-align: top; font-family: ui-monospace, monospace; font-size: 0.86rem; line-height: 1.45; }
346table.code td { border: 0; padding: 0 0.7rem; vertical-align: top; font-family: ui-monospace, monospace; font-size: 0.86rem; line-height: 1.45; }
322table.code td.ln { color: #8c959f; text-align: right; width: 1%; user-select: none; background: #f6f8fa; }
347table.code td.ln { color: #8c959f; text-align: right; width: 1%; user-select: none; background: #f6f8fa; }
348.fileview table.code td.ln { position: sticky; left: 0; z-index: 1; }
323table.code td.src { white-space: pre; }
349table.code td.src { white-space: pre; }
324.hl-k { color: #8250df; }
350.hl-k { color: #8250df; }
325.hl-s { color: #cf222e; }
351.hl-s { color: #cf222e; }
@@ -945,10 +971,15 @@ form.wh .grid-2 label { margin-top: 0; }
945@media (max-width: 800px) {
971@media (max-width: 800px) {
946 .proj, .fileview, .joblayout { grid-template-columns: minmax(0, 1fr); }
972 .proj, .fileview, .joblayout { grid-template-columns: minmax(0, 1fr); }
947 .proj > *, .fileview > *, .toolbar, .commitbar, .hscroll { min-width: 0; max-width: 100%; }
973 .proj > *, .fileview > *, .toolbar, .commitbar, .hscroll { min-width: 0; max-width: 100%; }
974 body:has(main.fill) { height: auto; overflow: auto; }
975 .frame.with-side:has(main.fill),
976 .content:has(main.fill) { height: auto; overflow: visible; }
977 main.fill { display: block; height: auto; overflow: visible; }
948 .fileview { height: auto; min-height: 0; }
978 .fileview { height: auto; min-height: 0; }
949 .fileview .treelist { max-height: 40vh; flex: none; }
979 .fileview .treelist { max-height: none; overflow: visible; flex: none; }
950 .fileview .filepane { overflow: visible; }
980 .fileview .filepane,
951 .fileview .codebox { overflow: auto; }
981 .filepane:has(.codebox) { overflow: visible; display: block; }
982 .fileview .codebox { overflow: auto; flex: none; max-height: none; }
952 .heat-foot { flex-direction: column; align-items: flex-start; }
983 .heat-foot { flex-direction: column; align-items: flex-start; }
953 .heat-legend, .heat-foot .muted { justify-content: flex-start; text-align: left; }
984 .heat-legend, .heat-foot .muted { justify-content: flex-start; text-align: left; }
954 .repolist > li { flex-wrap: wrap; }
985 .repolist > li { flex-wrap: wrap; }
internal/server/templates/layout.html +1 −1
@@ -46,7 +46,7 @@
46 46 <div class="frame{{if or .Repo .Group .Info .User}} with-side{{end}}">
47 47 {{if .Repo}}{{template "reposide" .}}{{else if .Group}}{{template "groupside" .}}{{else if .Info}}{{template "infoside" .}}{{else if .User}}{{template "dashside" .}}{{end}}
48 48 <div class="content">
49 <main{{if .Wide}} class="wide"{{end}}>
49 <main{{if eq .Page "files"}} class="fill"{{else if .Wide}} class="wide"{{end}}>
50 50 {{if .Notice}}<p class="flash">{{.Notice}}</p>{{end}}
51 51 {{if .Err}}<p class="flash bad">{{.Err}}</p>{{end}}
52 52 {{if .Repo}}
@@ -46,7 +46,7 @@
46<div class="frame{{if or .Repo .Group .Info .User}} with-side{{end}}">
46<div class="frame{{if or .Repo .Group .Info .User}} with-side{{end}}">
47{{if .Repo}}{{template "reposide" .}}{{else if .Group}}{{template "groupside" .}}{{else if .Info}}{{template "infoside" .}}{{else if .User}}{{template "dashside" .}}{{end}}
47{{if .Repo}}{{template "reposide" .}}{{else if .Group}}{{template "groupside" .}}{{else if .Info}}{{template "infoside" .}}{{else if .User}}{{template "dashside" .}}{{end}}
48<div class="content">
48<div class="content">
49<main{{if .Wide}} class="wide"{{end}}>
49<main{{if eq .Page "files"}} class="fill"{{else if .Wide}} class="wide"{{end}}>
50{{if .Notice}}<p class="flash">{{.Notice}}</p>{{end}}
50{{if .Notice}}<p class="flash">{{.Notice}}</p>{{end}}
51{{if .Err}}<p class="flash bad">{{.Err}}</p>{{end}}
51{{if .Err}}<p class="flash bad">{{.Err}}</p>{{end}}
52{{if .Repo}}
52{{if .Repo}}