Release 0.3.30

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01Y42TyF8Zu7NGRR2893vNcZ
Single alt-image shows natural height
2026-09-01 21:42:20 +02:00 · 2026-09-01 21:42:20 +02:00 · 2026-09-01 21:36:57 +02:00 · 2026-09-01 21:36:57 +02:00 · 2026-09-01 20:31:02 +02:00 · 2026-09-01 20:31:02 +02:00
6 changed files with 172 additions and 17 deletions
@@ -2948,7 +2948,7 @@ dependencies = [

 [[package]]
 name = "portal"
-version = "0.3.23"
+version = "0.3.28"
 dependencies = [
 "anyhow",
 "arc-swap",
@@ -1,6 +1,6 @@
 [package]
 name = "portal"
-version = "0.3.24"
+version = "0.3.30"
 edition = "2021"

 [lib]
@@ -1,5 +1,5 @@
 use leptos::prelude::*;
-use leptos_meta::{provide_meta_context, HashedStylesheet, Html, MetaTags, Title};
+use leptos_meta::{provide_meta_context, HashedStylesheet, Html, MetaTags, Stylesheet, Title};
 use leptos_router::{
    components::{Route, Router, Routes},
    hooks::{use_location, use_navigate, use_query_map},
@@ -79,8 +79,20 @@ pub fn App() -> impl IntoView {
    });
    provide_context(Lang(lang));

+    // A content-shipped stylesheet (site.yaml `stylesheet:`) layered
+    // after the default one - leptos_meta appends it at the MetaTags
+    // slot, which the shell places after HashedStylesheet, so content
+    // rules win at equal specificity.
+    let custom_css = Memo::new(move |_| {
+        site.get()
+            .and_then(|r| r.ok())
+            .and_then(|s| s.stylesheet)
+            .map(|p| format!("/site/{p}"))
+    });
+
    view! {
        <Html attr:lang=move || lang.get()/>
+        {move || custom_css.get().map(|href| view! { <Stylesheet id="site-custom" href=href/> })}
        <Suspense fallback=|| ()>
            {move || {
                site.get()
@@ -575,14 +587,10 @@ fn Hero(title: String, description: String, landing: bool, site: SiteConfig, cur
        None
    };
    let has_module = module.is_some();
-    // Light theme inverts white-stroke wordmarks to ink. The house
-    // mark and the sibling-site marks are all white-stroke SVGs; a
-    // raster logo is a client brand and keeps its colors.
-    let house_wordmark = site
-        .wordmark
-        .as_deref()
-        .map(|w| w.ends_with(".svg"))
-        .unwrap_or(true);
+    // Light theme can invert a white-stroke wordmark to ink. Default:
+    // only the built-in house mark inverts; a content-shipped logo
+    // keeps its colours unless site.yaml opts in with wordmark_invert.
+    let house_wordmark = site.wordmark_invert.unwrap_or(site.wordmark.is_none());
    let wordmark = site.wordmark.clone().unwrap_or_else(|| "/wordmark.svg".to_string());
    // Clamped server-side too, but belt and braces for the inline style.
    let wordmark_style = site
@@ -679,7 +687,7 @@ fn Hero(title: String, description: String, landing: bool, site: SiteConfig, cur
                    <img src=wordmark alt=site_title style=wordmark_style/>
                </a>
                <h1>{title}</h1>
-                <p>{description}</p>
+                <p inner_html=render_inline_markdown(&description)></p>
            </div>
        </header>
    }
@@ -219,7 +219,73 @@ pub fn render_inline_markdown(text: &str) -> String {
    });
    let mut out = String::new();
    html::push_html(&mut out, filtered);
-    out.trim().to_string()
+    apply_image_hints(out.trim())
+}
+
+/// Translate a markdown image's title (`![alt](url "right 9rem")`)
+/// into layout: `left`/`right` float via a class, a bare number
+/// (optionally with `rem`) into a validated `max-width`. Unknown
+/// tokens are ignored; the title attribute is dropped either way.
+/// Only touches `<img>` tags in our own render output, and only ever
+/// emits a numeric max-width - no arbitrary CSS reaches the page.
+fn apply_image_hints(html: &str) -> String {
+    let mut out = String::new();
+    let mut rest = html;
+    while let Some(pos) = rest.find("<img ") {
+        out.push_str(&rest[..pos]);
+        let after = &rest[pos..];
+        let end = after.find('>').map(|e| e + 1).unwrap_or(after.len());
+        out.push_str(&rewrite_img_tag(&after[..end]));
+        rest = &after[end..];
+    }
+    out.push_str(rest);
+    out
+}
+
+fn rewrite_img_tag(tag: &str) -> String {
+    // Pull the title value, if any.
+    let title = tag
+        .find("title=\"")
+        .map(|i| &tag[i + 7..])
+        .and_then(|r| r.find('"').map(|e| &r[..e]))
+        .unwrap_or("");
+
+    let mut class = String::new();
+    let mut max_rem: Option<f32> = None;
+    for tok in title.split_whitespace() {
+        match tok {
+            "left" => class = "md-float-left".into(),
+            "right" => class = "md-float-right".into(),
+            other => {
+                if let Ok(n) = other.trim_end_matches("rem").parse::<f32>() {
+                    if n > 0.0 && n <= 60.0 {
+                        max_rem = Some(n);
+                    }
+                }
+            }
+        }
+    }
+
+    // Strip the title attribute from the tag.
+    let mut cleaned = tag.to_string();
+    if let Some(i) = cleaned.find(" title=\"") {
+        if let Some(e) = cleaned[i + 8..].find('"') {
+            cleaned.replace_range(i..i + 8 + e + 1, "");
+        }
+    }
+
+    // Inject class/style right after `<img`.
+    let mut attrs = String::new();
+    if !class.is_empty() {
+        attrs.push_str(&format!(" class=\"{class}\""));
+    }
+    if let Some(n) = max_rem {
+        attrs.push_str(&format!(" style=\"max-width:{n}rem\""));
+    }
+    if attrs.is_empty() {
+        return cleaned;
+    }
+    cleaned.replacen("<img", &format!("<img{attrs}"), 1)
 }

 /// Directory-scoped defaults: a `_section.yaml` file applies to every
@@ -446,6 +512,12 @@ pub struct Requirement {
    /// `ResourceSpec` mechanism a `Feature.resource` uses.
    #[serde(default)]
    pub resource: Option<ResourceSpec>,
+    /// `type: select` only - a static list of options, as an
+    /// alternative to a `resource`. Each string is both the option's
+    /// stored value and its label. Faithful to the ancestor format's
+    /// inline enums.
+    #[serde(default)]
+    pub options: Vec<String>,
    /// `type: select` only - which field in each item is the option's
    /// stable id. Defaults to trying `_id` then `id`.
    #[serde(default)]
@@ -517,6 +589,12 @@ pub struct SiteConfig {
    /// `None` falls back to `/wordmark.svg`.
    #[serde(default)]
    pub wordmark: Option<String>,
+    /// Whether to invert the wordmark in light theme. `None` inverts
+    /// only the built-in house wordmark (a white-stroke SVG); a
+    /// content-shipped logo keeps its own colours unless it sets this
+    /// true (e.g. a sibling site's white-stroke mark).
+    #[serde(default)]
+    pub wordmark_invert: Option<bool>,
    /// Wordmark display height in rem (0.5–6.0). `None` keeps the
    /// stylesheet's default. Raster logos look best at or below their
    /// intrinsic pixel height.
@@ -527,6 +605,11 @@ pub struct SiteConfig {
    /// `None` means "en"; unknown codes fall back to English per key.
    #[serde(default)]
    pub lang: Option<String>,
+    /// A content-repo-relative CSS file (e.g. "custom.css") layered
+    /// *after* the default stylesheet, so it overrides. Served
+    /// same-origin at `/site/<path>`; plain path only.
+    #[serde(default)]
+    pub stylesheet: Option<String>,
    #[serde(default)]
    pub hero: HeroConfig,
 }
@@ -582,6 +665,13 @@ impl SiteConfig {
            }
            other => anyhow::bail!("site.yaml: hero.kind {other:?} is not one of plain | module"),
        }
+        if let Some(sheet) = &self.stylesheet {
+            if !is_safe_site_path(sheet) || !sheet.ends_with(".css") {
+                anyhow::bail!(
+                    "site.yaml: stylesheet {sheet:?} must be a plain repo-relative .css path"
+                );
+            }
+        }
        Ok(())
    }
 }
@@ -1192,9 +1282,12 @@ pub fn validate_questions(
                .collect();
            for feature in &alternative.features {
                for requirement in &feature.requirements {
-                    if requirement.kind == "select" && requirement.resource.is_none() {
+                    if requirement.kind == "select"
+                        && requirement.resource.is_none()
+                        && requirement.options.is_empty()
+                    {
                        anyhow::bail!(
-                            "question {:?} alternative {:?} feature {:?}: requirement {:?} is type: select but declares no resource to select from",
+                            "question {:?} alternative {:?} feature {:?}: requirement {:?} is type: select but declares neither a resource nor inline options",
                            question.id, alternative.name, feature.name, requirement.name
                        );
                    }
@@ -1442,6 +1535,7 @@ pub async fn site_asset_handler(
        Some("json") => "application/json",
        Some("png") => "image/png",
        Some("webp") => "image/webp",
+        Some("avif") => "image/avif",
        Some("woff2") => "font/woff2",
        _ => "application/octet-stream",
    };
@@ -2061,6 +2155,21 @@ alternatives:
            render_inline_markdown("![local](/images/a.jpg)"),
            "<img src=\"/images/a.jpg\" alt=\"local\" />"
        );
+        // Image title hints: float + max-width, title dropped.
+        assert_eq!(
+            render_inline_markdown("![J](https://x.no/j.jpg \"right 9rem\")"),
+            "<img class=\"md-float-right\" style=\"max-width:9rem\" src=\"https://x.no/j.jpg\" alt=\"J\" />"
+        );
+        assert_eq!(
+            render_inline_markdown("![J](https://x.no/j.jpg \"12\")"),
+            "<img style=\"max-width:12rem\" src=\"https://x.no/j.jpg\" alt=\"J\" />"
+        );
+        // Unknown hint tokens are ignored; a safe image with no title
+        // is untouched.
+        assert_eq!(
+            render_inline_markdown("![J](https://x.no/j.jpg \"wat\")"),
+            "<img src=\"https://x.no/j.jpg\" alt=\"J\" />"
+        );
        assert_eq!(render_inline_markdown("[ok](/shape)"), "<a href=\"/shape\">ok</a>");
        assert_eq!(render_inline_markdown("[mail](mailto:bl@uhhm.no)"), "<a href=\"mailto:bl@uhhm.no\">mail</a>");
    }
@@ -68,6 +68,16 @@ pub async fn get_requirement_options(
        .iter()
        .find(|r| r.name == requirement_name)
        .ok_or_else(|| ServerFnError::new("unknown requirement"))?;
+    // Inline options: return them as {id,label} objects, the shape the
+    // SelectField renders, without touching a resource.
+    if !requirement.options.is_empty() {
+        let items: Vec<serde_json::Value> = requirement
+            .options
+            .iter()
+            .map(|o| serde_json::json!({ "id": o, "label": o }))
+            .collect();
+        return Ok(serde_json::Value::Array(items));
+    }
    let resource = requirement
        .resource
        .as_ref()
@@ -368,8 +368,12 @@ main.not-found {
 .alt-image {
  display: block;
  width: 100%;
-  max-height: 14rem;
-  object-fit: cover;
+  height: auto;
+  /* Natural aspect, not a cropped band; a very tall image is still
+     bounded so it can't tower. The deck below overrides for its
+     fixed-height cards. */
+  max-height: 32rem;
+  object-fit: contain;
  border-radius: calc(var(--radius) - 0.3rem);
  margin-bottom: 1.1rem;
 }
@@ -552,6 +556,30 @@ main.not-found {
  border: 0.06rem solid var(--line);
 }

+/* Content hint via a markdown image title (`![alt](url "right 9rem")`):
+   float and shrink so text wraps around a portrait. */
+.alt-description img.md-float-left,
+.item-card-description img.md-float-left,
+.feature p img.md-float-left,
+.alt-description img.md-float-right,
+.item-card-description img.md-float-right,
+.feature p img.md-float-right {
+  width: auto;
+  max-width: 45%;
+}
+.alt-description img.md-float-left,
+.item-card-description img.md-float-left,
+.feature p img.md-float-left {
+  float: left;
+  margin: 0.2rem 1.1rem 0.5rem 0;
+}
+.alt-description img.md-float-right,
+.item-card-description img.md-float-right,
+.feature p img.md-float-right {
+  float: right;
+  margin: 0.2rem 0 0.5rem 1.1rem;
+}
+
 .alt-description code,
 .feature p code {
  font-size: 0.9em;
Author	SHA1	Message	Date
Bendik Aagaard LynghaugandClaude Fable 5	2c94ba4379	Release 0.3.30 Test / test (push) Successful in 28s Details Publish release / publish (push) Successful in 1m50s Details Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01Y42TyF8Zu7NGRR2893vNcZ	2026-09-01 21:42:20 +02:00
Bendik Aagaard LynghaugandClaude Fable 5	065bd0a86a	Single alt-image shows natural height Was cropped to a 14rem band via object-fit: cover; now shows the whole image at natural aspect, bounded at 32rem so a tall one can't tower. The image deck keeps its fixed-height cards. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01Y42TyF8Zu7NGRR2893vNcZ	2026-09-01 21:42:20 +02:00
Bendik Aagaard LynghaugandClaude Fable 5	035ad7830b	Release 0.3.29 Test / test (push) Successful in 27s Details Publish release / publish (push) Successful in 1m45s Details Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01Y42TyF8Zu7NGRR2893vNcZ	2026-09-01 21:36:57 +02:00
Bendik Aagaard LynghaugandClaude Fable 5	bf7f2e11e7	Markdown image layout hints + AVIF assets Content-only image control: a markdown image title carries layout — left/right to float text around it, a number for max-width in rem (validated, capped) — translated to md-float-* classes and a numeric inline max-width. No arbitrary CSS reaches the page. Portal also now serves .avif site assets. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01Y42TyF8Zu7NGRR2893vNcZ	2026-09-01 21:36:57 +02:00
Bendik Aagaard LynghaugandClaude Fable 5	57b70c8445	Release 0.3.28 Test / test (push) Successful in 27s Details Publish release / publish (push) Successful in 1m41s Details Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01Y42TyF8Zu7NGRR2893vNcZ	2026-09-01 20:31:02 +02:00
Bendik Aagaard LynghaugandClaude Fable 5	0d3221c22f	Hero description renders inline markdown The question-level description (hero subtitle) was plain text, so bold showed literal asterisks. Now it runs through render_inline_markdown like every other description. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01Y42TyF8Zu7NGRR2893vNcZ	2026-09-01 20:31:02 +02:00
Bendik Aagaard LynghaugandClaude Fable 5	013fd7151e	Release 0.3.27 Test / test (push) Successful in 26s Details Publish release / publish (push) Successful in 1m40s Details Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01Y42TyF8Zu7NGRR2893vNcZ	2026-09-01 20:26:34 +02:00
Bendik Aagaard LynghaugandClaude Fable 5	99b29bb09f	wordmark_invert: explicit, not inferred from .svg A content-shipped colour logo (Klingenberg's red tile) was being inverted to teal in light theme by the .svg heuristic. Invert is now an explicit site.yaml flag defaulting to house-mark-only; content logos keep their colours unless they opt in. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01Y42TyF8Zu7NGRR2893vNcZ	2026-09-01 20:26:34 +02:00
Bendik Aagaard LynghaugandClaude Fable 5	b08e1af139	Release 0.3.26 Test / test (push) Successful in 26s Details Publish release / publish (push) Successful in 1m42s Details Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01Y42TyF8Zu7NGRR2893vNcZ	2026-09-01 20:20:50 +02:00
Bendik Aagaard LynghaugandClaude Fable 5	c1cdc53187	Select fields: inline static options A select requirement can now declare a plain options: [A, B, C] list instead of a resource - each string is both value and label. Restores the ancestor question format's inline enums (used by the klingenberg port) without needing a resource endpoint for a fixed list. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01Y42TyF8Zu7NGRR2893vNcZ	2026-09-01 20:20:50 +02:00
Bendik Aagaard LynghaugandClaude Fable 5	4fee02ab82	Release 0.3.25 Test / test (push) Successful in 28s Details Publish release / publish (push) Successful in 1m41s Details Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01Y42TyF8Zu7NGRR2893vNcZ	2026-09-01 20:12:06 +02:00
Bendik Aagaard LynghaugandClaude Fable 5	405bb98185	Content-shipped stylesheet override (site.yaml stylesheet) A content repo can now ship a CSS file named in site.yaml's stylesheet field; portal serves it same-origin at /site/<path> and leptos_meta appends it after the default stylesheet so content rules win. Plain repo-relative .css path only, validated on load. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01Y42TyF8Zu7NGRR2893vNcZ	2026-09-01 20:12:06 +02:00