fix restore page header with logo and title on root page

The navbar refactor removed the h1 and logo from page_header, leaving the root page (no repo context) without any heading. Restore the logo and h1 for the root page while keeping the minimal subtitle-only header for repo pages where the navbar provides navigation.

Commit
56bccfc5049cbf2ccae032631e3906e82168b00a
Author
Marius Peter <dev@marius-peter.com>
Author date
Committer
Marius Peter <dev@marius-peter.com>
Committer date
Changed files
lib/static/styles.css
index 2634215c..fa6b8947 100644..100644
@@ -10,10 +10,28 @@
10 10 }
11 11
12 12 #page-header {
13 Added: display: flex;
14 Added: align-items: center;
15 Added: gap: 1em;
13 16 padding: 0.5em 1em;
14 17 }
15 18
19 Added: #page-header .site-logo {
20 Added: width: 2.5em;
21 Added: height: 2.5em;
22 Added: }
23 Added:
24 Added: #page-header h1 {
25 Added: margin: 0;
26 Added: padding: 0;
27 Added: }
28 Added:
16 29 #page-header p {
30 Added: margin: 0;
31 Added: color: #b0b0b0;
32 Added: }
33 Added:
34 Added: #page-header .subtitle {
17 35 margin: 0;
18 36 color: #b0b0b0;
19 37 }
lib/views/layout.ml
index 76ef08b1..b53e2a78 100644..100644
@@ -48,13 +48,31 @@
48 48 ul [] (List.map li_of_item nav_items);
49 49 ])
50 50
51 Removed: let page_header _header1 header2 =
52 Removed: let header2 =
53 Removed: if String.starts_with ~prefix:"Unnamed repository" header2 then ""
54 Removed: else header2
51 Added: let page_header ~has_repo title subtitle =
52 Added: let subtitle =
53 Added: if String.starts_with ~prefix:"Unnamed repository" subtitle then ""
54 Added: else subtitle
55 55 in
56 Removed: if header2 = "" then HTML.null []
57 Removed: else HTML.(header [ id "page-header" ] [ p [] [ txt "%s" header2 ] ])
56 Added: if has_repo then
57 Added: if subtitle = "" then HTML.null []
58 Added: else HTML.(header [ id "page-header" ] [ p [] [ txt "%s" subtitle ] ])
59 Added: else
60 Added: HTML.(
61 Added: header
62 Added: [ id "page-header" ]
63 Added: ([
64 Added: img
65 Added: [
66 Added: src "/static/git_icon.svg";
67 Added: alt "";
68 Added: role `presentation;
69 Added: class_ "site-logo";
70 Added: ];
71 Added: h1 [] [ txt "%s" title ];
72 Added: ]
73 Added: @
74 Added: if subtitle = "" then []
75 Added: else [ p [ class_ "subtitle" ] [ txt "%s" subtitle ] ]))
58 76
59 77 let page_footer () =
60 78 let now = Unix.(time () |> localtime) in
@@ -77,7 +95,7 @@
77 95 body []
78 96 [
79 97 a [ href "#main"; class_ "skip-link" ] [ txt "Skip to content" ];
80 Removed: page_header bd.title bd.subtitle;
98 Added: page_header ~has_repo:(Option.is_some bd.repo) bd.title bd.subtitle;
81 99 (match bd.repo with
82 100 | None -> HTML.null []
83 101 | Some repo -> topnav ~active:bd.active repo);