@contentrain/astro-kit 0.18.0 → 0.20.0

package/catalog.json

@@ -520,7 +520,15 @@
             "stacked"
           ],
           "default": "split",
-          "description": "split: details beside the form on wide screens. stacked: one centred column."
+          "description": "split: details beside the form on wide screens. stacked: one column (see align)."
+        },
+        "align": {
+          "options": [
+            "center",
+            "start"
+          ],
+          "default": "center",
+          "description": "Stacked only, and the details alone before a Studio form. center: one centred column at a reading width. start: the section's whole column from the start edge, as a page builder's container whose text sets no alignment."
         },
         "tone": {
           "options": [
@@ -653,10 +661,11 @@
             "muted",
             "inverse",
             "accent",
+            "brand",
             "none"
           ],
           "default": "accent",
-          "description": "Background. On accent, primary buttons are drawn in the secondary style so they stay visible. none: no fill of its own; the page background shows through (a source colour the palette does not have)."
+          "description": "Background. On accent, primary buttons are drawn in the secondary style so they stay visible. brand: the site's brand colour role (`--color-brand`, the builder's own colour on a band) with its ink; buttons keep their style. none: no fill of its own; the page background shows through (a source colour the palette does not have)."
         },
         "actionsAlign": {
           "options": [
@@ -1145,6 +1154,22 @@
           ],
           "default": "start",
           "description": "start: brand and links to the sides (left-aligned on phones). center: everything centred in one column, as themes with a centred footer print it."
+        },
+        "pack": {
+          "options": [
+            "spread",
+            "end"
+          ],
+          "default": "spread",
+          "description": "columns layout only. spread: the link columns share the footer's width after the brand column. end: they are packed at the end edge at their own width, as a theme whose footer is the brand left and its menus on the right."
+        },
+        "narrow": {
+          "options": [
+            "stack",
+            "row"
+          ],
+          "default": "stack",
+          "description": "Packed columns only, below the md breakpoint. stack: one column. row: still side by side from the start edge, under the brand."
         }
       },
       "props": {
@@ -1241,6 +1266,18 @@
         "navLabel": {
           "type": "string",
           "description": "Accessible name of the footer navigation (ui-strings nav.footer)."
+        },
+        "packGap": {
+          "type": "string",
+          "description": "Packed columns only: the space between columns, a CSS length such as 98px."
+        },
+        "packGapNarrow": {
+          "type": "string",
+          "description": "Packed columns in a row only: the space between them below the md breakpoint, a CSS length."
+        },
+        "linkSize": {
+          "type": "string",
+          "description": "Font size of the footer's links, a CSS length such as 17.88px; absent, the footer's own."
         }
       },
       "slots": {},

package/components/_shared/Section.astro

@@ -12,6 +12,8 @@ const section = tv({
       muted: 'bg-surface-muted text-ink',
       inverse: 'bg-ink text-surface',
       accent: 'bg-accent text-accent-ink',
+      // The site's brand colour where it is not the accent (a band the source paints in the builder's own colour).
+      brand: 'bg-brand text-brand-ink',
       // No fill of its own: the page's background and text colour show through.
       none: '',
     },
@@ -28,7 +30,7 @@ const section = tv({
 export type Tone = 'default' | 'muted' | 'inverse' | 'accent'
 
 interface Props {
-  tone?: Tone | 'none' | undefined
+  tone?: Tone | 'brand' | 'none' | undefined
   spacing?: 'none' | 'sm' | 'md' | 'lg' | undefined
   /** `page` is the full frame, `prose` the reading column, `none` for full-bleed content. */
   width?: 'page' | 'prose' | 'none' | undefined

package/components/contact-form/ContactForm.astro

@@ -37,12 +37,18 @@ const contact = tv({
   variants: {
     layout: {
       split: { grid: 'md:grid-cols-[2fr_3fr] md:items-start' },
-      stacked: { grid: 'mx-auto max-w-2xl' },
+      stacked: {},
     },
+    // The stacked column: centred in a reading width, or the section's whole column from its start edge (a page
+    // builder's container whose text has no alignment of its own sits left, full width).
+    align: { center: {}, start: {} },
     // accent/accent-ink is only ~5:1 — dimming text on it drops body copy under 4.5:1 (WCAG 1.4.3), so accent keeps it at full strength.
     tone: { default: { form: 'border border-line bg-surface p-6 md:p-8' }, muted: { form: 'bg-surface p-6 text-ink md:p-8' }, inverse: { form: 'bg-surface p-6 text-ink md:p-8' }, accent: { form: 'bg-surface p-6 text-ink md:p-8', intro: 'opacity-100', term: 'opacity-100' } },
   },
-  defaultVariants: { layout: 'split', tone: 'default' },
+  compoundVariants: [
+    { layout: 'stacked', align: 'center', class: { grid: 'mx-auto max-w-2xl' } },
+  ],
+  defaultVariants: { layout: 'split', tone: 'default', align: 'center' },
 })
 
 interface Props {
@@ -54,14 +60,16 @@ interface Props {
   formHeading?: string | undefined
   details?: ContactDetail[] | undefined
   layout?: 'split' | 'stacked' | undefined
+  /** Stacked only (and the details alone, before a Studio form): a centred column, or the whole column from the start edge. */
+  align?: 'center' | 'start' | undefined
   tone?: 'default' | 'muted' | 'inverse' | 'accent' | undefined
   id?: string | undefined
 }
 
-const { model, heading, intro, formHeading, details = [], layout, tone, id = 'contact' } = Astro.props
+const { model, heading, intro, formHeading, details = [], layout, align, tone, id = 'contact' } = Astro.props
 // Nothing to render (Studio not bound yet): a split would leave an empty column — the details stand alone.
 const formShown = formHome(model) !== null
-const s = contact({ layout: formShown ? layout : 'stacked', tone })
+const s = contact({ layout: formShown ? layout : 'stacked', align, tone })
 const headingId = heading ? `${id}-title` : undefined
 // A description list needs a term for every detail; an icon list carried from the source has values only.
 const labelled = details.every(detail => detail.label)

package/components/contact-form/fixtures.json

@@ -13,6 +13,7 @@
     }
   },
   { "name": "stacked-muted", "props": { "model": "contact-submissions", "heading": "Write to us", "layout": "stacked", "tone": "muted", "id": "write" } },
+  { "name": "stacked-start", "props": { "model": "contact-submissions", "intro": "Tell us what you make and when you want to launch.", "details": [{ "value": "Studio 4, Harbour Lane" }], "layout": "stacked", "align": "start", "id": "start" } },
   { "name": "split-inverse", "props": { "model": "contact-submissions", "heading": "Press", "tone": "inverse", "id": "press", "details": [{ "label": "Press office", "value": "press@northwind.example", "href": "mailto:press@northwind.example" }] } },
   { "name": "stacked-accent", "props": { "model": "newsletter-requests", "heading": "Request a print copy", "layout": "stacked", "tone": "accent", "id": "print" } },
   { "name": "form-heading", "props": { "model": "contact-submissions", "heading": "Contact", "intro": "Tell us where you are and what you need.", "formHeading": "Tell us about your project", "details": [{ "label": "Address", "value": "12 Harbour Street, Leith" }] } }

package/components/contact-form/meta.json

@@ -6,7 +6,8 @@
   "uses": [],
   "shared": ["Section.astro"],
   "variants": {
-    "layout": { "options": ["split", "stacked"], "default": "split", "description": "split: details beside the form on wide screens. stacked: one centred column." },
+    "layout": { "options": ["split", "stacked"], "default": "split", "description": "split: details beside the form on wide screens. stacked: one column (see align)." },
+    "align": { "options": ["center", "start"], "default": "center", "description": "Stacked only, and the details alone before a Studio form. center: one centred column at a reading width. start: the section's whole column from the start edge, as a page builder's container whose text sets no alignment." },
     "tone": { "options": ["default", "muted", "inverse", "accent"], "default": "default", "description": "Section background; the form always sits on a surface card." }
   },
   "props": {

package/components/cta/Cta.astro

@@ -27,7 +27,7 @@ const cta = tv({
     },
     // accent/accent-ink is only ~5:1 — dimming text on it drops body copy under 4.5:1 (WCAG 1.4.3), so accent keeps it at full strength.
     // none: no fill of its own — the page background and text colour show through.
-    tone: { default: {}, muted: {}, inverse: {}, accent: { body: 'opacity-100' }, none: {} },
+    tone: { default: {}, muted: {}, inverse: {}, accent: { body: 'opacity-100' }, brand: { body: 'opacity-100' }, none: {} },
     // The buttons' own alignment: `start` keeps them at the start edge under centred text (a WordPress buttons block
     // with no justification sits left in a group whose heading and paragraph are centred). The row is the text's
     // column, as WordPress's content width is, not the whole section. Only centred needs it: inline and stacked
@@ -40,6 +40,7 @@ const cta = tv({
     { frame: 'card', tone: 'muted', class: { box: 'border-transparent bg-surface-muted text-ink' } },
     { frame: 'card', tone: 'inverse', class: { box: 'border-transparent bg-ink text-surface' } },
     { frame: 'card', tone: 'accent', class: { box: 'border-transparent bg-accent text-accent-ink' } },
+    { frame: 'card', tone: 'brand', class: { box: 'border-transparent bg-brand text-brand-ink' } },
     { layout: 'centered', actionsAlign: 'start', class: { actions: 'w-full max-w-2xl justify-start' } },
   ],
   defaultVariants: { layout: 'inline', frame: 'full', tone: 'accent', actionsAlign: 'inherit' },
@@ -51,7 +52,7 @@ interface Props {
   actions: ActionInput[]
   layout?: 'inline' | 'centered' | 'stacked' | undefined
   frame?: 'full' | 'card' | undefined
-  tone?: 'default' | 'muted' | 'inverse' | 'accent' | 'none' | undefined
+  tone?: 'default' | 'muted' | 'inverse' | 'accent' | 'brand' | 'none' | undefined
   /** The buttons' alignment: as the layout sets it, or at the start edge under centred text (layout centered). */
   actionsAlign?: 'inherit' | 'start' | undefined
   id?: string | undefined

package/components/cta/fixtures.json

@@ -4,5 +4,6 @@
   { "name": "card-default", "props": { "heading": "Write for the journal", "body": "We publish reader essays every season.", "frame": "card", "tone": "default", "actions": [{ "label": "Pitch an essay", "href": "/pitch/" }] } },
   { "name": "card-muted", "props": { "heading": "Support independent travel writing", "frame": "card", "tone": "muted", "layout": "centered", "actions": [{ "label": "Become a member", "href": "/members/" }] } },
   { "name": "stacked-none", "props": { "heading": "Ready when you are", "body": "Tell us where you want to go and we will send a first plan within a week.", "layout": "stacked", "tone": "none", "actions": [{ "label": "Start planning", "href": "/contact/" }] } },
-  { "name": "centered-actions-start", "props": { "heading": "See what is on this week", "body": "New films every Thursday, and a late show on Saturdays.", "layout": "centered", "tone": "inverse", "actionsAlign": "start", "actions": [{ "label": "Programme", "href": "/programme/" }] } }
+  { "name": "centered-actions-start", "props": { "heading": "See what is on this week", "body": "New films every Thursday, and a late show on Saturdays.", "layout": "centered", "tone": "inverse", "actionsAlign": "start", "actions": [{ "label": "Programme", "href": "/programme/" }] } },
+  { "name": "centered-brand", "props": { "heading": "Ready when you are", "body": "Two launch slots left this quarter.", "layout": "centered", "tone": "brand", "actions": [{ "label": "Book a launch call", "href": "/contact/" }] } }
 ]

package/components/cta/meta.json

@@ -8,7 +8,7 @@
   "variants": {
     "layout": { "options": ["inline", "centered", "stacked"], "default": "inline", "description": "inline: text left, buttons right on wide screens. centered: everything centred. stacked: heading, text and buttons in one column at the start edge on every width." },
     "frame": { "options": ["full", "card"], "default": "full", "description": "full: the tone fills the section. card: a rounded box in a plain section carries the tone." },
-    "tone": { "options": ["default", "muted", "inverse", "accent", "none"], "default": "accent", "description": "Background. On accent, primary buttons are drawn in the secondary style so they stay visible. none: no fill of its own; the page background shows through (a source colour the palette does not have)." },
+    "tone": { "options": ["default", "muted", "inverse", "accent", "brand", "none"], "default": "accent", "description": "Background. On accent, primary buttons are drawn in the secondary style so they stay visible. brand: the site's brand colour role (`--color-brand`, the builder's own colour on a band) with its ink; buttons keep their style. none: no fill of its own; the page background shows through (a source colour the palette does not have)." },
     "actionsAlign": { "options": ["inherit", "start"], "default": "inherit", "description": "The buttons' alignment. inherit: as the layout sets it. start: at the start edge under centred heading and text (layout centered; a WordPress buttons block with no justification in a centred group). inline and stacked ignore it." }
   },
   "props": {

package/components/footer/Footer.astro

@@ -22,11 +22,18 @@ const footer = tv({
       inverse: { root: 'bg-ink text-surface' },
     },
     align: { start: {}, center: { inner: 'items-center justify-items-center text-center md:items-center [&_ul]:justify-center' } },
+    // The `columns` layout's link columns: spread from the brand column over the footer's width, or packed at the end
+    // edge at their own width (a theme whose footer is the brand left and its menus on the right).
+    pack: { spread: {}, end: {} },
+    // Packed columns below `md`: stacked, or still side by side from the start edge under the brand.
+    narrow: { stack: {}, row: { inner: 'grid-cols-[repeat(var(--footer-columns),auto)] justify-start gap-x-[var(--footer-gap-narrow,1.5rem)]' } },
   },
   compoundVariants: [
     { layout: 'simple', align: 'center', class: { inner: 'md:flex-col md:justify-center' } },
+    { layout: 'columns', pack: 'end', class: { inner: 'md:grid-cols-[1fr_repeat(var(--footer-columns),auto)] md:gap-x-[var(--footer-gap,2.5rem)] md:[&>div:first-child]:col-span-1' } },
+    { layout: 'columns', pack: 'end', narrow: 'row', class: { inner: '[&>div:first-child]:col-span-full' } },
   ],
-  defaultVariants: { layout: 'simple', tone: 'default', align: 'start' },
+  defaultVariants: { layout: 'simple', tone: 'default', align: 'start', pack: 'spread', narrow: 'stack' },
 })
 
 interface Props {
@@ -48,10 +55,22 @@ interface Props {
   layout?: 'simple' | 'columns' | undefined
   tone?: 'default' | 'muted' | 'inverse' | undefined
   align?: 'start' | 'center' | undefined
+  /** `columns` layout only: `end` packs the link columns at the end edge, right-aligned, instead of spreading them. */
+  pack?: 'spread' | 'end' | undefined
+  /** Packed columns only: the space between columns, a CSS length (`98px`). */
+  packGap?: string | undefined
+  /** Packed columns only: below `md`, `stack` (one column) or `row` (still side by side from the start edge, under the brand). */
+  narrow?: 'stack' | 'row' | undefined
+  /** Packed columns in a `row` only: the space between them below `md`, a CSS length. */
+  packGapNarrow?: string | undefined
+  /** The links' font size, a CSS length (`17.88px`); absent, the footer's own. */
+  linkSize?: string | undefined
 }
 
-const { siteName, tagline, columns = [], links = [], social = [], contact, copyright, consentLabel, navLabel = 'Footer', layout = 'simple', tone, align } = Astro.props
-const { root, inner, muted, link } = footer({ layout, tone, align })
+const { siteName, tagline, columns = [], links = [], social = [], contact, copyright, consentLabel, navLabel = 'Footer', layout = 'simple', tone, align, pack, packGap, narrow, packGapNarrow, linkSize } = Astro.props
+const { root, inner, muted, link } = footer({ layout, tone, align, pack: layout === 'columns' ? pack : undefined, narrow: layout === 'columns' && pack === 'end' ? narrow : undefined })
+// Custom properties the packed columns and sized links read; none when none is set.
+const vars = [layout === 'columns' ? `--footer-columns: ${Math.max(columns.length, 1)}` : '', layout === 'columns' && pack === 'end' && packGap ? `--footer-gap: ${packGap}` : '', layout === 'columns' && pack === 'end' && narrow === 'row' && packGapNarrow ? `--footer-gap-narrow: ${packGapNarrow}` : '', linkSize ? `--footer-link-size: ${linkSize}` : ''].filter(Boolean).join('; ')
 const year = String(new Date().getFullYear())
 const phoneHref = contact?.phone?.replace(/[^\d+]/g, '')
 const hasContact = Boolean(contact?.address || contact?.phone || contact?.email)
@@ -59,7 +78,7 @@ const line = copyright?.replaceAll('{year}', year) ?? `© ${year} ${siteName}`
 ---
 <!-- The cookie settings control is a button, not a link: the Consent component's listener reopens its bar on any [data-kit-consent-open]. -->
 <footer class={root()}>
-  <div class={inner()} data-kit-footer style={layout === 'columns' ? `--footer-columns: ${Math.max(columns.length, 1)}` : undefined}>
+  <div class:list={[inner(), linkSize && '[&_nav_a]:text-[length:var(--footer-link-size)]']} data-kit-footer style={vars || undefined}>
     <div class="flex flex-col gap-3">
       <p class="text-base font-semibold" data-kit-brand>{siteName}</p>
       {tagline && <p class={muted()} data-kit-tagline>{tagline}</p>}

package/components/footer/fixtures.json

@@ -3,5 +3,7 @@
   { "name": "columns-inverse", "props": { "siteName": "Northwind Studio", "tagline": "Calm, fast websites for teams who write.", "layout": "columns", "tone": "inverse", "copyright": "© 2026 Northwind Studio", "columns": [{ "title": "Studio", "links": [{ "label": "About", "href": "/about/" }, { "label": "Team", "href": "/about/team/" }] }, { "title": "Journal", "links": [{ "label": "Guides", "href": "/category/guides/" }, { "label": "News", "href": "/category/news/" }] }, { "title": "Contact", "links": [{ "label": "Email", "href": "mailto:hello@example.com" }] }], "social": [{ "label": "GitHub", "href": "https://github.com/contentrain" }, { "label": "Mastodon", "href": "https://mastodon.social/@contentrain" }] } },
   { "name": "muted", "props": { "siteName": "Northwind", "tone": "muted", "copyright": "© 2026 Northwind", "links": [{ "label": "Imprint", "href": "/imprint/" }] } },
   { "name": "centered", "props": { "siteName": "Golden Agency", "tagline": "Websites for makers", "align": "center", "copyright": "© 2026 Golden Agency", "links": [{ "label": "Services", "href": "/services/" }, { "label": "Contact", "href": "/contact/" }], "social": [{ "label": "Instagram", "href": "https://instagram.com/" }] } },
-  { "name": "consent-settings", "props": { "siteName": "Golden Agency", "copyright": "© 2026 Golden Agency", "consentLabel": "Cookie settings", "links": [{ "label": "Privacy", "href": "/privacy/" }] } }
+  { "name": "consent-settings", "props": { "siteName": "Golden Agency", "copyright": "© 2026 Golden Agency", "consentLabel": "Cookie settings", "links": [{ "label": "Privacy", "href": "/privacy/" }] } },
+  { "name": "columns-end", "props": { "siteName": "Golden Works", "tagline": "Websites for makers", "layout": "columns", "pack": "end", "packGap": "128px", "linkSize": "17.88px", "copyright": "© 2026 Golden Works", "columns": [{ "label": "Studio", "links": [{ "label": "About", "href": "/about/" }, { "label": "Work", "href": "/work/" }] }, { "label": "Contact", "links": [{ "label": "Email", "href": "mailto:hello@example.com" }, { "label": "Press", "href": "/press/" }] }] } },
+  { "name": "columns-end-row", "props": { "siteName": "Golden Works", "layout": "columns", "pack": "end", "narrow": "row", "packGap": "128px", "packGapNarrow": "48px", "linkSize": "17.88px", "copyright": "© 2026 Golden Works", "columns": [{ "label": "Studio", "links": [{ "label": "About", "href": "/about/" }, { "label": "Work", "href": "/work/" }] }, { "label": "Contact", "links": [{ "label": "Email", "href": "mailto:hello@example.com" }] }] } }
 ]

package/components/footer/meta.json

@@ -32,6 +32,22 @@
       ],
       "default": "start",
       "description": "start: brand and links to the sides (left-aligned on phones). center: everything centred in one column, as themes with a centred footer print it."
+    },
+    "pack": {
+      "options": [
+        "spread",
+        "end"
+      ],
+      "default": "spread",
+      "description": "columns layout only. spread: the link columns share the footer's width after the brand column. end: they are packed at the end edge at their own width, as a theme whose footer is the brand left and its menus on the right."
+    },
+    "narrow": {
+      "options": [
+        "stack",
+        "row"
+      ],
+      "default": "stack",
+      "description": "Packed columns only, below the md breakpoint. stack: one column. row: still side by side from the start edge, under the brand."
     }
   },
   "props": {
@@ -119,6 +135,18 @@
     "navLabel": {
       "type": "string",
       "description": "Accessible name of the footer navigation (ui-strings nav.footer)."
+    },
+    "packGap": {
+      "type": "string",
+      "description": "Packed columns only: the space between columns, a CSS length such as 98px."
+    },
+    "packGapNarrow": {
+      "type": "string",
+      "description": "Packed columns in a row only: the space between them below the md breakpoint, a CSS length."
+    },
+    "linkSize": {
+      "type": "string",
+      "description": "Font size of the footer's links, a CSS length such as 17.88px; absent, the footer's own."
     }
   },
   "slots": {},

package/mapping/gutenberg.json

@@ -552,7 +552,11 @@
       },
       "when": {
         "position": "first",
-        "columns": 1
+        "columns": 1,
+        "order": [
+          "title",
+          "media"
+        ]
       },
       "slots": {
         "title": {
@@ -567,11 +571,16 @@
         "button": {
           "match": "core/button",
           "max": 2
+        },
+        "media": {
+          "match": "core/image",
+          "max": 1
         }
       },
       "props": {
         "heading": "@title dom:",
-        "lead": "@lead dom:"
+        "lead": "@lead dom:",
+        "image": "@media img:img"
       },
       "into": "actions",
       "each": "@button",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentrain/astro-kit",
-  "version": "0.18.0",
+  "version": "0.20.0",
   "license": "MIT",
   "description": "Copy-in Astro components for Contentrain sites (shadcn model): typed props, tailwind-variants, zero JavaScript by default — with a machine-readable catalog",
   "type": "module",
@@ -42,7 +42,7 @@
     "mapping"
   ],
   "dependencies": {
-    "@contentrain/types": "1.36.0"
+    "@contentrain/types": "1.38.0"
   },
   "devDependencies": {
     "@types/node": "^22.10.0",