willamette 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b14600bc1b9466fbdeaae3e1add8e22c329a429809c59a352078980a79f12632
-  data.tar.gz: f5df323495a95da1c249714d97872e0e0502ca7804927988f8e6396a46d5d4b9
+  metadata.gz: 4795cff6bbb0562c32afcb5fa0cd355351560959cebb845fca9bfe7bf0b3fcb0
+  data.tar.gz: 9a5af9580fcaf93ca1acaba95a2348ac4cd551ac116ac2821c28a1e820ebfcac
 SHA512:
-  metadata.gz: 5fd4dff6fc3f50dab2807d5a55b03219a9e7c84fcf40f9a8782f7826162676dc4157447bf7b14cfc87a5a10803f3cd663f4aabbfbac0edcccc1a462720405953
-  data.tar.gz: b7d4a23d04a9490b52d2eb139bbc0127b81a3f9b3a9725ca830c66c590e1b9d0e4bed76a96b1a11741390db5cda0d63a566a4b0760726c7d09a264ac8700788e
+  metadata.gz: dfcbbf0e4b813c12452225e58f293506edd0ece6541d42cea9dc706ef4fcf2c00360fba3211856090a258153afdab177c24794fed26ef5cf067985e9773611fe
+  data.tar.gz: 393297f4b4ce50b6de84ce04a9bd92367b99e8bb0d28d3c5d5f94620a9dfdd3efa9d84f8502a6dabe5cf2d3364d44838e726e2d0485ae141a5a33ba61b4c038f

data/CHANGELOG.md

@@ -9,6 +9,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - ...
 
+## [0.7.0] - 2026-04-29
+
+- Exclude pagination links and previous/next links from Pagefind indexing
+- Improve default presentation of logo / site name, especially on mobile
+
+## [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

data/Gemfile.lock

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

data/automations/components.automation.rb

@@ -1,3 +1,6 @@
+detect_serbea = File.exist?(File.join(destination_root, "src", "_partials", "_footer.serb"))
+detected_ext = detect_serbea ? "serb" : "erb"
+
 remove_file "src/_components/shared/navbar.rb"
 create_file "src/_components/shared.rb" do <<~RUBY
 module Shared
@@ -39,7 +42,7 @@ end
 RUBY
 end
 
-remove_file "src/_components/shared/navbar.erb"
+remove_file "src/_components/shared/navbar.#{detected_ext}"
 create_file "src/_components/shared/navbar.erb" do <<~HTML
   <header slot="header">
     <%= dsd do %>
@@ -47,7 +50,7 @@ create_file "src/_components/shared/navbar.erb" do <<~HTML
     <% end %>
 
     <a slot="logo" href="/">
-      <img src="<%= relative_url '/images/logo.svg' %>" alt="Website Logo" />
+      <img src="<%= '/willamette/bridgetown-avatar.svg' %>" alt="Website Logo" />
       <span><%= metadata.title %></span>
     </a>
 
@@ -120,4 +123,4 @@ create_file "src/_components/shared/sidebar.erb" do <<~HTML
 HTML
 end
 
-gsub_file "src/_partials/_footer.erb", %(<footer>), %(<footer slot="footer">)
+gsub_file "src/_partials/_footer.#{detected_ext}", %(<footer>), %(<footer slot="footer">)

data/automations/layouts.automation.rb

@@ -1,4 +1,7 @@
-remove_file "src/_layouts/default.erb"
+detect_serbea = File.exist?(File.join(destination_root, "src", "_layouts", "default.serb"))
+detected_ext = detect_serbea ? "serb" : "erb"
+
+remove_file "src/_layouts/default.#{detected_ext}"
 create_file "src/_layouts/default.erb" do <<~ERB
   ---
   layout: willamette/default
@@ -8,7 +11,7 @@ create_file "src/_layouts/default.erb" do <<~ERB
 ERB
 end
 
-remove_file "src/_layouts/page.erb"
+remove_file "src/_layouts/page.#{detected_ext}"
 create_file "src/_layouts/page.erb" do <<~ERB
   ---
   layout: default
@@ -24,7 +27,7 @@ create_file "src/_layouts/page.erb" do <<~ERB
 ERB
 end
 
-remove_file "src/_layouts/post.erb"
+remove_file "src/_layouts/post.#{detected_ext}"
 create_file "src/_layouts/post.erb" do <<~ERB
   ---
   layout: default

data/components/willamette/header_navbar.dsd.css

@@ -1,7 +1,3 @@
-:host {
-  --navbar-gap: var(--wa-space-m);
-}
-
 #bar {
   display: flex;
   justify-content: space-between;

data/components/willamette/holy_grail_layout.dsd.css

@@ -1,6 +1,6 @@
 :host {
   --layout-padding: var(--wll-layout-padding);
-  --header-block-padding: var(--layout-padding) calc(var(--layout-padding) / 3);
+  --header-block-padding: calc(var(--layout-padding) / 1.5) calc(var(--layout-padding) / 3);
   --sidebar-start-min-inline-size: calc(var(--wa-space-scale) * 15rem);
   --sidebar-start-max-inline-size: calc(var(--wa-space-scale) * 28rem);
   --sidebar-end-min-inline-size: calc(var(--wa-space-scale) * 15rem);

data/components/willamette/pagination.erb

@@ -1,4 +1,4 @@
-<ul class="pagination">
+<ul class="pagination" data-pagefind-ignore>
   <li>
     <% if paginator.previous_page %>
       <a href="<%= paginator.previous_page_path %>"><wa-icon label="<%= t "labels.previous" %>" name="circle-chevron-left"></wa-icon> <%= t "content.posts.newer_posts" %></a>

data/components/willamette/previous_next.erb

@@ -1,4 +1,4 @@
-<ul class="pagination">
+<ul class="pagination" data-pagefind-ignore>
   <li>
     <% if resource.previous_resource %>
       <a href="<%= resource.previous_resource.relative_url %>"><wa-icon label="<%= t "labels.previous" %>" name="circle-chevron-left"></wa-icon> <%= resource.previous_resource.data.title %></a>

data/content/willamette/bridgetown-avatar.svg

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="100%" height="100%" viewBox="0 0 426 396" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
+    <g transform="matrix(1,0,0,1,-551.659,-816.215)">
+        <g transform="matrix(4.16667,0,0,4.16667,0,0)">
+            <g transform="matrix(0,-1,-1,0,184.377,195.892)">
+                <path d="M-47.414,-47.413C-73.6,-47.413 -94.827,-26.184 -94.827,0.001C-94.827,26.187 -73.6,47.414 -47.414,47.414C-21.228,47.414 -0,26.187 -0,0.001C-0,-26.184 -21.228,-47.413 -47.414,-47.413" style="fill:rgb(58,109,98);fill-rule:nonzero;"/>
+            </g>
+        </g>
+        <g transform="matrix(4.16667,0,0,4.16667,0,0)">
+            <clipPath id="_clip1">
+                <path d="M136.963,243.306C136.963,269.491 158.19,290.719 184.376,290.719C210.561,290.719 231.79,269.491 231.79,243.306C231.79,217.12 210.561,195.892 184.376,195.892C158.19,195.892 136.963,217.12 136.963,243.306Z" clip-rule="nonzero"/>
+            </clipPath>
+            <g clip-path="url(#_clip1)">
+                <g transform="matrix(1,0,0,1,208.938,234.995)">
+                    <path d="M0,8.565C-21.064,-19.268 -52.165,-16.176 -64.819,7.508C-66.214,10.116 -64.596,11.833 -63.807,11.645C-62.405,11.31 -57.638,9.411 -56.193,8.829C-55.59,8.586 -55.099,7.427 -54.565,6.371C-43.702,-15.13 -29.235,-17.508 -8.492,27.833C-9.496,22.667 -7.413,16.858 -0.662,10.844C0.114,10.152 0.754,9.561 0,8.565" style="fill:rgb(248,248,249);fill-rule:nonzero;"/>
+                </g>
+                <g transform="matrix(0.249692,-0.968325,-0.968325,-0.249692,139.587,231.48)">
+                    <path d="M-3.556,-8.815C-8.26,-6.649 -12.911,-5.427 -13.634,-8.471C-14.043,-5.524 -2.818,-0.098 -3.556,6.295C-3.591,6.597 -3.119,6.672 -2.992,6.397C-0.433,0.888 -2.024,-6.711 -3.556,-8.815" style="fill:rgb(248,248,249);fill-rule:nonzero;"/>
+                </g>
+                <g transform="matrix(1,0,0,1,234.005,264.207)">
+                    <path d="M0,-25.684C0.449,-25.684 0.612,-25.015 0.176,-24.913C-8.81,-22.823 -12.759,-14.068 -12.976,-9.191C-13.048,-7.574 -14.436,-7.288 -16.041,-6.545C-17.831,-5.715 -26.216,-2.13 -29.396,-0.992C-30.953,-0.434 -33.258,0.001 -33.365,-2.403C-33.795,-11.98 -23.739,-25.685 0,-25.684" style="fill:rgb(248,248,249);fill-rule:nonzero;"/>
+                </g>
+                <g transform="matrix(1,0,0,1,202.938,221.387)">
+                    <path d="M0,29.048C-17.807,-5.298 -45.005,-2.556 -58.551,21.114C-59.777,23.257 -58.706,25.286 -57.499,24.954C-56.72,24.74 -56.061,24.333 -54.724,21.712C-43.819,0.337 -25.429,-9.286 -3.282,38.334C-3.302,35.514 -2.221,32.223 0,29.048" style="fill:rgb(233,233,232);fill-rule:nonzero;"/>
+                </g>
+                <g transform="matrix(1,0,0,1,229.828,253.97)">
+                    <path d="M0,-14.459C-6.677,-14.306 -18.664,-11.274 -23.314,-0.812C-23.493,-0.41 -22.992,0.006 -22.663,-0.287C-18.435,-4.054 -11.988,-6.561 -7.751,-6.313C-7.615,-6.305 -7.494,-6.288 -7.437,-6.411C-6.284,-8.89 -3.697,-12.005 0.113,-14.011C0.334,-14.127 0.25,-14.465 0,-14.459" style="fill:rgb(233,233,232);fill-rule:nonzero;"/>
+                </g>
+                <g transform="matrix(-0.238075,0.971247,0.971247,0.238075,147.243,236.88)">
+                    <path d="M1.232,-10.193C2.071,-8.08 3.512,-5.506 4.011,-5.072C2.646,-4.29 1.65,-2.215 1.232,-0.692C3.686,-1.804 7.284,-2.895 8.815,-2.373C8.302,-3.196 2.985,-7.471 1.232,-10.193" style="fill:rgb(233,233,232);fill-rule:nonzero;"/>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>

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/lib/willamette/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Willamette
-  VERSION = "0.6.0"
+  VERSION = "0.7.0"
 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", layout: {}|
-  # 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.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.6.0",
+  "version": "0.7.0",
   "main": "frontend/javascript/index.js",
   "repository": {
     "type": "git",

data/setup.automation.rb

@@ -1,3 +1,10 @@
+detect_liquid = File.exist?(File.join(destination_root, "src", "_layouts", "default.liquid"))
+if detect_liquid
+  say "😬 Oops, the Willamette automated installer won't work with Liquid-based sites."
+  say "➡️ You'll need to create a new site using either ERB or Serbea templates."
+  exit(1)
+end
+
 ruby_configure :nokolexbor, %(\nhtml_inspector_parser "nokolexbor")
 ruby_configure :pagination, %(\npagination do\n  enabled true\nend\n\n)
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: willamette
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Bridgetown Team
 bindir: bin
 cert_chain: []
-date: 2026-04-24 00:00:00.000000000 Z
+date: 2026-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bridgetown
@@ -108,6 +108,7 @@ files:
 - components/willamette/search_dialog.rb
 - components/willamette/search_dialog_element.js
 - content/search.erb
+- content/willamette/bridgetown-avatar.svg
 - content/willamette/style-guide.md
 - layouts/willamette/default.erb
 - lib/willamette.rb