willamette 0.5.2 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70dabc6d637c2925f92800243df7ddf61659a2dcd76a56abc350a564705c6ba9
-  data.tar.gz: 68724ee1e54f1a5b7a55b157d3ddcacadc77dba0db023dcf51a978f9e26225c5
+  metadata.gz: 0a347cd4bb2385bc2c70bfdbb8dc4270b378d164851437f5d008b4123d8b9a07
+  data.tar.gz: d592ffaa65fe70480784d891d62ad0e29944793bd0c49d21a7219ade4c28e982
 SHA512:
-  metadata.gz: 74f80b3ea5b37176bc237019a6bed6f3b17b0f7eb85f9fd0d9125c57527c60fb9d1caed86a711dd7f40173aa4db450ad10f5ec811be148d6f044175df9dfd093
-  data.tar.gz: 5881dfeb6397329e0434a61a56333a4fd4ad48e8c28c1fdc9d4f5629e6333fec88b42bb028b794da8835ae7dccd7b48d2efd990ac9a16b4afd16b7016365c63a
+  metadata.gz: 56504a7d4ca1f088234086a96f71d6058927f10a14c297dd8f6d4000cda3b24440583c0b3c7613c775761a1757feffa8d970c6d1682a023171660c56dfc9c8d7
+  data.tar.gz: 157a632cff03b3c824f99442d2eff259aa8bf42ba89a35e3403623033ec2ca0f34e4d808093b2d65e7232821b2cc6abafcfa46093b4db3d573b6ad642e190ff6

data/CHANGELOG.md

@@ -9,7 +9,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - ...
 
-## [0.5.1] - 2026-04-03
+## [0.6.1] - 2026-04-27
+
+- Fill out content in the Style Guide, provide a bypass config option
+
+## [0.6.0] - 2026-04-23
+
+- Clean up layout settings, improve blockquotes and image bleeds
+- Add post metadata component, icons, improved styles
+
+## [0.5.2] - 2026-04-03
 
 - Add `author_name` resource extension method
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    willamette (0.5.2)
+    willamette (0.6.1)
       bridgetown (>= 2.1, < 3.0)
       nokolexbor (>= 0.6)
 

data/automations/components.automation.rb

@@ -70,7 +70,7 @@ create_file "src/_components/shared/sidebar.erb" do <<~HTML
 
   <% if strategy.explore? %>
     <details open>
-      <summary><h2><wa-icon class="show-for-mobile" name="bars"></wa-icon>
+      <summary><h2><wa-icon class="show-small-screen" name="bars"></wa-icon>
         <%= t "documentation.explore" %>
       </h2></summary>
 
@@ -82,7 +82,7 @@ create_file "src/_components/shared/sidebar.erb" do <<~HTML
 
   <% if strategy.follow? %>
     <details open>
-      <summary><h2><wa-icon class="show-for-mobile" name="bars"></wa-icon> <%= t "marketing.follow" %></h2></summary>
+      <summary><h2><wa-icon class="show-small-screen" name="bars"></wa-icon> <%= t "marketing.follow" %></h2></summary>
 
       <nav>
         <%= strategy.follow_links %>

data/automations/layouts.automation.rb

@@ -40,22 +40,17 @@ create_file "src/_layouts/post.erb" do <<~ERB
       image_alt = data.image.is_a?(String) ? t("content.featured_post_image") : data.image.alt
       image_caption = data.image.is_a?(String) ? nil : data.image.caption
   %>
-    <figure class="full-main-<%= data.image_bleed ? "bleed" : "size" %>">
+    <figure class="<%= data.image_bleed ? "inline-bleed" : "" %>">
       <img src="<%= image_path %>" alt="" />
       <% if image_caption %>
         <figcaption><%= markdownify image_caption %></figcaption>
       <% end %>
     </figure>
   <% end %>
- 
+
   <%= yield %>
- 
-  <hr />
- 
-  <wa-icon class="article-metadata" name="newspaper"></wa-icon>
-  <p class="article-metadata"><article-author>by So and So</article-author></p>
-  <p class="article-metadata"><time><%= pipe(resource.date) { to_date | l(format: :long) } %></time></p>
-  <p class="article-metadata"><article-tags>#foo #BarBaz</article-tags></p>
+
+  <%= render Willamette::PostMetadata.new(post: resource) %>
 
   </article>
 ERB

data/components/willamette/post_metadata.erb

@@ -0,0 +1,15 @@
+<wll-post-metadata>
+  <wa-icon class="wll-decoration" name="newspaper"></wa-icon>
+  <p><wa-icon name="calendar"></wa-icon> <time><%= pipe(@post.date) { to_date | l(format: :long) } %></time></p>
+  <p><wa-icon name="user-pen"></wa-icon> <wll-post-author>by <%= @post.author_name %></wll-post-author></p>
+  <% if @post.data.categories.length.positive? %>
+    <p><wa-icon name="paperclip"></wa-icon> <% @post.data.categories.each do |category| %>
+      <wll-post-category><%= t("categories.#{category}", default: category) %></wll-post-category>
+    <% end %></p>
+  <% end %>
+  <% if @post.data.tags.length.positive? %>
+    <p><wa-icon name="tags"></wa-icon> <% @post.data.tags.each do |tag| %>
+      <wll-post-tag>#<%= tag %></wll-post-tag>
+    <% end %></p>
+  <% end %>
+</wll-post-metadata>

data/components/willamette/post_metadata.rb

@@ -0,0 +1,5 @@
+class Willamette::PostMetadata < Bridgetown::Component
+  def initialize(post:)
+    @post = post
+  end
+end

data/content/willamette/style-guide.md

@@ -1,7 +1,10 @@
----
-layout: page
-title: This is the Willamette Theme
----
+```ruby
+front_matter do
+  layout :page
+  title "Willamette Theme Style Guide"
+  published -> { !site.config.willamette.bypass_style_guide }
+end
+```
 
 <style>
 .swatch {
@@ -20,7 +23,7 @@ title: This is the Willamette Theme
 
 <hr />
 
-<wa-color-picker label="Chose your brand color:" size="large" oninput='
+<wa-color-picker label="Choose a new brand color:" size="large" oninput='
   document.documentElement.style.setProperty("--wll-color-brand", event.target.value)
   this.querySelector("output").textContent = `--wll-color-brand: ${event.target.value};`
   this.querySelector("wa-copy-button").slot = "hint"
@@ -29,6 +32,15 @@ title: This is the Willamette Theme
   <wa-copy-button from="color-hint"></wa-copy-button>
 </wa-color-picker>
 
+<script type="module">
+  import { colordx } from "https://esm.sh/@colordx/core"
+  let defaultColor = window.getComputedStyle(document.documentElement).getPropertyValue("--wll-color-brand")
+  if (defaultColor.includes("oklch")) {
+    defaultColor = colordx(defaultColor).toHex()
+  }
+  document.querySelector("wa-color-picker").value = defaultColor
+</script>
+
 <hr />
 
 ## Brand Color Scale
@@ -90,4 +102,54 @@ title: This is the Willamette Theme
       </div>
       <small>05</small>
     </li>
-</ul>
+</ul>
+
+----
+
+## Basic Typography
+
+Lorem ipsum dolor sit amet, cillum lorem culpa adipiscing nulla. Nisi sint aliquip aute anim laborum incididunt. Duis duis aliqua consectetur est ex laboris, in consequat enim fugiat aliqua sint est incididunt, dolor esse voluptate aliqua sit ut reprehenderit. **Sit lorem irure aute aliquip veniam pariatur**, anim dolore commodo ea culpa esse quis laborum. _Duis mollit exercitation pariatur._
+
+Here are what [links look like](#) as well as `monospaced text`. You can also ==highlight text==.
+
+### Heading Level 3
+
+Paragraph text.
+
+#### Heading Level 4
+
+* Here is a bulleted list.
+* Item 2
+* Item 3
+
+And…
+
+1. Here is a numbered list.
+2. Item 2
+3. Item 3
+
+You can also display blockquotes.
+
+> Est est incididunt pariatur, aute laborum non mollit cillum excepteur est incididunt, tempor enim nisi ipsum cillum veniam. Labore lorem nulla occaecat ipsum sed nulla. Non sunt enim exercitation nostrud occaecat deserunt, anim sed esse velit elit eiusmod cupidatat. Laborum nisi aliquip ad.
+
+And of course, code snippets.
+
+```ruby
+  if ENV["BRIDGETOWN_ENV"] == "production"
+    workers ENV.fetch("BRIDGETOWN_CONCURRENCY") { 4 }
+  end
+  
+  max_threads_count = ENV.fetch("BRIDGETOWN_MAX_THREADS") { 5 }
+  min_threads_count = ENV.fetch("BRIDGETOWN_MIN_THREADS") { max_threads_count }
+  threads min_threads_count, max_threads_count
+  
+  pidfile ENV["PIDFILE"] || "tmp/pids/server.pid"
+```
+
+## Images & Figures
+
+==WIP==
+
+## Tables
+
+==WIP==

data/layouts/willamette/default.erb

@@ -3,14 +3,18 @@
   <head>
     <%= render "head", metadata: site.metadata, title: data.title %>
   </head>
-  <body class="OFF:wll-grid-lines OFF:wll-code-dark <%= data.layout %> <%= data.page_class %>">
+  <body class="<%=
+    class_map("wll-grid-lines": site.config.willamette.layout.grid_lines, "wll-code-dark": site.config.willamette.layout.code_dark)
+  %> <%= data.layout %> <%= data.page_class %>">
     <%= dsd do %>
       <%= render Willamette::HolyGrailLayout.new %>
     <% end %>
     <%= render Shared::Navbar.new(metadata: site.metadata, resource:) %>
 
     <main slot="content" id="content">
-      <div hidden class="show-for-tablet" style="position: absolute; right: var(--wa-space-m)"><button type="button" class="wa-outlined" onclick="document.body.classList.toggle('sidebar-end-open')"><wa-icon name="list"></wa-icon></button></div>
+      <div hidden class="show-mid-screen">
+        <button type="button" class="wa-outlined" onclick="document.body.classList.toggle('sidebar-end-open')"><wa-icon name="list"></wa-icon></button>
+      </div>
 
       <main-contents <%= "data-pagefind-body" unless data.exclude_from_pagefind %>>
         <%= yield %>
@@ -26,15 +30,16 @@
     </aside>
 
     <aside slot="sidebar-end" hidden>
-      <!-- TODO: this should be in a shared component -->
-      <div class="show-for-tablet" style="position: absolute; right: var(--wa-space-m)"><button type="button" class="wa-outlined" onclick="document.body.classList.toggle('sidebar-end-open')"><wa-icon name="close"></wa-icon></button></div>
+      <div class="show-mid-screen">
+        <button type="button" class="wa-outlined" onclick="document.body.classList.toggle('sidebar-end-open')"><wa-icon name="close"></wa-icon></button>
+      </div>
       <h2><%= t "documentation.contents" %></h2>
 
       <%= slotted :toc %>
 
       <hr />
 
-      <!-- TOC will be relocated here -->
+      <!-- TOC insertion -->
     </aside>
 
     <%= render "footer", metadata: site.metadata %>

data/lib/willamette/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Willamette
-  VERSION = "0.5.2"
+  VERSION = "0.6.1"
 end

data/lib/willamette.rb

@@ -29,14 +29,16 @@ Kramdown::Converter::Html.class_eval do
 end
 
 # @param config [Bridgetown::Configuration::ConfigurationDSL]
-Bridgetown.initializer :willamette do |config, docs_url_segment: "docs"|
-  # Add code here which will run when a site includes
-  # `init :willamette`
-  # in its configuration
-
+Bridgetown.initializer :willamette do |
+  config,
+  docs_url_segment: "docs",
+  layout: {},
+  bypass_style_guide: false
+|
   # Add default configuration data:
   config.willamette ||= {}
-  config.willamette.my_setting ||= 123
+  config.willamette.layout ||= layout
+  config.willamette.bypass_style_guide ||= bypass_style_guide
 
   # Register your builders:
   config.builder Willamette::Builders::AuthorExtension

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "willamette",
-  "version": "0.5.2",
+  "version": "0.6.1",
   "main": "frontend/javascript/index.js",
   "repository": {
     "type": "git",

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: willamette
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.6.1
 platform: ruby
 authors:
 - Bridgetown Team
 bindir: bin
 cert_chain: []
-date: 2026-04-03 00:00:00.000000000 Z
+date: 2026-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bridgetown
@@ -101,6 +101,8 @@ files:
 - components/willamette/pagination.rb
 - components/willamette/post_item.css
 - components/willamette/post_item.rb
+- components/willamette/post_metadata.erb
+- components/willamette/post_metadata.rb
 - components/willamette/previous_next.erb
 - components/willamette/previous_next.rb
 - components/willamette/search_dialog.rb