ferst-core 0.2.6 → 0.2.7

package/components/CalendarEmbed.astro

@@ -9,7 +9,7 @@
  * The embed URL is required to be https (isSafeEmbedUrl) before it can reach the
  * iframe; an unset or unsafe URL degrades to a friendly note + optional link.
  */
-import { isSafeEmbedUrl } from '../content/calendar';
+import { isSafeEmbedUrl, withWeekStart } from '../content/calendar';
 
 interface Props {
   title?: string;
@@ -18,6 +18,8 @@ interface Props {
   publicUrl?: string;
   height?: number;
   provider?: string;
+  /** First day of the weekly view (Google Calendar embeds only). Default Monday. */
+  weekStart?: 'monday' | 'sunday';
 }
 const {
   title = 'Calendar',
@@ -26,16 +28,19 @@ const {
   publicUrl = '',
   height = 600,
   provider = 'Google Calendar',
+  weekStart = 'monday',
 } = Astro.props;
 
-const safe = isSafeEmbedUrl(embedUrl);
+// Apply the week-start preference to the embed (no-op for non-Google URLs).
+const finalEmbedUrl = withWeekStart(embedUrl, weekStart);
+const safe = isSafeEmbedUrl(finalEmbedUrl);
 ---
 
 <section class="b-calendar">
   {title && <h2 class="b-calendar__title">{title}</h2>}
   {intro && <p class="b-calendar__intro">{intro}</p>}
 
-  {!embedUrl ? (
+  {!finalEmbedUrl ? (
     <p class="b-calendar__note">The calendar isn't set up yet.</p>
   ) : !safe ? (
     <p class="b-calendar__note">
@@ -47,7 +52,7 @@ const safe = isSafeEmbedUrl(embedUrl);
   ) : (
     <div
       class="b-calendar__embed"
-      data-embed-url={embedUrl}
+      data-embed-url={finalEmbedUrl}
       data-height={String(height)}
       data-title={title}
     >

package/components/recipes/Table.astro

@@ -75,7 +75,7 @@ const { title, intro, columns = [], rows = [] } = Astro.props;
     padding: 0.7rem 0.9rem;
     text-align: start;
     vertical-align: top;
-    border-bottom: 1px solid var(--line, var(--card-border-color, rgba(0,0,0,0.08)));
+    border-bottom: 1px solid var(--border);
   }
   .b-table__table thead th {
     font-family: var(--font-heading);

package/content/calendar.ts

@@ -21,10 +21,37 @@ export const calendarSettingsSchema = z.object({
   height: z.number().int().min(200).max(2000).default(600),
   /** Provider name, shown in the consent notice ("shared with …"). */
   provider: z.string().default('Google Calendar'),
+  /** First day of the week in the weekly view. UK convention is Monday, so that is
+   *  the default; sites with a US/Sunday-first audience can switch it. Applied to
+   *  Google Calendar embeds via `wkst` (other providers ignore it). */
+  weekStart: z.enum(['monday', 'sunday']).default('monday'),
 });
 
 export type CalendarSettings = z.infer<typeof calendarSettingsSchema>;
 
+/** Google Calendar's `wkst` numbering: 1 = Sunday, 2 = Monday, … 7 = Saturday. */
+const WKST: Record<'monday' | 'sunday', string> = { monday: '2', sunday: '1' };
+
+/**
+ * Return `embedUrl` with the week-start applied. Only Google Calendar embed URLs
+ * carry a `wkst` param, so we touch nothing else — a non-Google URL (or an
+ * unparseable one) is returned unchanged. Any existing `wkst` is overridden so the
+ * CMS setting always wins. Pure + testable.
+ */
+export function withWeekStart(embedUrl: string, weekStart: 'monday' | 'sunday' = 'monday'): string {
+  if (!embedUrl) return embedUrl;
+  try {
+    const u = new URL(embedUrl);
+    const isGoogleCalendar =
+      u.hostname.endsWith('google.com') && u.pathname.includes('/calendar/embed');
+    if (!isGoogleCalendar) return embedUrl;
+    u.searchParams.set('wkst', WKST[weekStart]);
+    return u.toString();
+  } catch {
+    return embedUrl;
+  }
+}
+
 /**
  * Whether an embed URL is safe to load into an iframe. The value is trusted repo /
  * CMS data, but we still require `https:` so a stray `javascript:` / `http:` value

package/layouts/Base.astro

@@ -313,14 +313,23 @@ const metaDescription = description ?? identity.description;
       article :where(img, picture, video, table, figure, iframe) {
         max-width: 100%;
       }
-      article img:not(.group-card__img) {
+      /* Prose images — editor/markdown images dropped into long-form body content
+         get a centred block treatment (rounded, soft shadow). Scoped to the real
+         prose containers (post body, Prose block) so it never leaks onto STRUCTURAL
+         component images — cards, banners, media headers — which own their own
+         framing and crop absolutely. (A leaked `margin` pushes an inset image down
+         inside its overflow-hidden box, exposing a strip above it — the "empty
+         space above the image" a bare `article img` rule caused.) */
+      .b-post__body img,
+      .b-prose img {
         display: block;
         margin: 1.5rem auto;
         border-radius: 8px;
         box-shadow: 0 4px 12px rgba(0, 0, 0, 0.08);
       }
       @media (min-width: 44em) {
-        article img:not(.group-card__img) {
+        .b-post__body img,
+        .b-prose img {
           border-radius: 12px;
         }
       }
@@ -340,11 +349,10 @@ const metaDescription = description ?? identity.description;
       }
 
       /* ── Fluid media: never overflow container ── */
-      img:not(.group-card__img):not(.primary-logo), picture, video {
-        max-width: 100%;
-        height: auto;
-      }
-      .group-card__img {
+      /* The logo is exempt: it carries a fixed height in SiteHeader that `height:
+         auto` would collapse. Card/media images set their own size at higher
+         specificity, so this only ever backstops loose images. */
+      img:not(.primary-logo), picture, video {
         max-width: 100%;
         height: auto;
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ferst-core",
-  "version": "0.2.6",
+  "version": "0.2.7",
   "type": "module",
   "description": "Ferst Core — the shared, brand-agnostic client-site system: Astro components, layouts, content schemas, the layered config resolver, and a neutral styling architecture that every client overrides.",
   "license": "BUSL-1.1",