bible270 1.9.1 → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e8a5fd512d3d6da6e59a4ecbbb112717b13eeb00b4b6fa0c4033c7c61ace730
-  data.tar.gz: 190694fc67180501f5e991aaf7640c7577b90f636fdea9dfca742941f9577841
+  metadata.gz: 43fc7b160b27ec7e20797964b1e7a61244f85b2475ba61e5b8b16e0bfb48c491
+  data.tar.gz: df5de443f785eed07c04db5efdbee1184a0dc39cbf2862a6feec79c3bb83fb3d
 SHA512:
-  metadata.gz: 78a6b2c66b69dc0f6fb268ff1669b968567a4fdedbcf749ba34d31daec6853119a30da545c129c0f77d0571ef488a43a24b0c6f10dc7b5b7738e2c6d2e60e366
-  data.tar.gz: a132a769bef838b993cac33603fd2d5ef6b66796a3f9d86f40d257436040732d73ebe154d92054ca5d724b88899abf6970d41a122438286afe60dedf52a128b4
+  metadata.gz: 047001d13b3e85efb775b5abcb63431ce22bf02e0a6e853b4cf63bcf472e5ea5d2e6d95f2af56d8a0004275d343aeaea4c13df1d54d1ae49d7145f79e16d55b8
+  data.tar.gz: 06aa22e9592f1603f1136babc07b29657c3190f874d645f4e89deb66b0895e200fb155560f0cb628caa79e3c3fac1c8d2d40997e3a5ed6f18998b519fe13e3d0

data/README.md

@@ -284,7 +284,8 @@ From a reader's page you can:
 The Reflections page lists conversations by their latest approved reply, supports day and author
 filters, and paginates older threads. Signed-in readers see which conversations became active since
 their previous visit. Reflection and reply drafts are retained for up to 30 days in that browser and
-cleared after a successful post. On a shared device, clearing browser storage also removes saved drafts.
+cleared after a successful post. If browser storage is blocked or full, the composer warns that the draft
+could not be saved; posting still works. On a shared device, clearing browser storage also removes saved drafts.
 Typing `@` in the composer offers up to five unambiguous reader handles; manual mentions continue to
 work without JavaScript. A quiet **Formatting** disclosure opens a toolbar for bold, italic,
 quotations, bulleted and numbered lists, links, and YouTube videos without requiring readers to know Markdown syntax.
@@ -368,13 +369,17 @@ Psalm 35: []
 Psalm 78: [20, 39, 55]
 ```
 
-## Display preference
+## Theme
 
-Readers can choose **Light**, **Dark**, or **System** under **Profile → Display**, then save.
-The preference is stored with their account and applies throughout Bible270 on every device.
-System is the default for existing and new readers, follows the device's current appearance,
+Readers can choose **Parchment** (light), **Earth** (dark brown), **Forest** (dark green),
+**Midnight** (dark blue), or **System** under **Profile → Theme**, then save. The preference is stored
+with their account and applies throughout Bible270 on every device. System is the default for existing
+and new readers, follows the device's current appearance using Parchment for light or Earth for dark,
 and responds to changes without reloading. Signed-out visitors also use System.
-The completion dove retains its bright colors in either theme.
+The completion dove retains its bright colors in every theme.
+
+Existing preferences are preserved under the new names. Forest and Midnight require no additional
+migration once display preferences are installed.
 
 Upgrading hosts must install and run migration `20260101000023`:
 
@@ -420,7 +425,8 @@ Daily reminders are optional at both levels: the host enables the feature, then
 whether to receive it and at what local time from their profile. The feature and reader opt-in both
 default to off; each reader's time defaults to `08:00`. Profile times use quarter-hour choices so they
 match the recommended 15-minute scheduler interval. An existing off-quarter preference remains
-available until that reader chooses a new time.
+available until that reader chooses a new time. The profile shows the plan's effective time zone beside
+the reminder settings; this is not automatically the reader's device time zone.
 
 ```ruby
 # config/initializers/bible270.rb

data/app/controllers/bible270/admin_controller.rb

@@ -67,7 +67,7 @@ module Bible270
       @days_completed = Reader.completed_days_by_id
       @reader_sort_options = READER_SORT_OPTIONS
       @reader_sort = READER_SORT_OPTIONS.key?(params[:sort]) ? params[:sort] : 'first_name'
-      readers = Reader.all.load
+      readers = Reader.with_avatar.load
       @recent_reader_activities = Checkoff.recent_activity_by_reader(readers.map(&:id))
       @reader_report = ReaderProgressReport.new(
         readers: readers,
@@ -105,7 +105,7 @@ module Bible270
     # Everything is visible by default; this lists it all so anything unsuitable
     # can be taken down.
     def comments
-      scope = Comment.includes(:reader, parent: :reader).order(created_at: :desc)
+      scope = Comment.with_reader_avatars.includes(parent: :reader).order(created_at: :desc)
       @filter = params[:filter].to_s
       scope = scope.hidden if @filter == 'hidden'
       scope = scope.approved if @filter == 'visible'

data/app/controllers/bible270/profiles_controller.rb

@@ -17,39 +17,30 @@ module Bible270
       @comment_notification_level = requested_comment_notification_level
       @daily_reminders_available = daily_reminders_available?
       @display_mode = params.fetch(:display_mode, current_reader.effective_display_mode).to_s
-      problems = [comment_notification_problem, display_mode_problem].compact
-      problems << 'both a first and last name' unless current_reader.update_names(params[:first_name],
-                                                                                  params[:last_name])
-      if params[:bible_version].present? && !current_reader.update_bible_version(params[:bible_version])
+      @names = { first_name: params[:first_name], last_name: params[:last_name] }
+      @daily_reminders = params[:daily_reminders] == '1'
+      @daily_reminder_time = daily_reminder_time_param
+      names = Names.normalize(params[:first_name], params[:last_name])
+      source = (params[:passage_source].presence || Reader::DEFAULT_PASSAGE_SOURCE).to_s
+      problems = [comment_notification_problem, display_mode_problem, avatar_problem].compact
+      problems << 'both a first and last name' unless names
+      if params[:bible_version].present? && !Translations.valid?(params[:bible_version])
         problems << 'a translation from the list'
       end
-      source = params[:passage_source].presence || Reader::DEFAULT_PASSAGE_SOURCE
-      problems << 'a reading-link source from the list' unless current_reader.update_passage_source(source)
-      if params[:avatar].present? && !current_reader.attach_avatar(params[:avatar])
-        problems << (current_reader.errors[:avatar].first || 'a valid image')
-      end
-
-      requested_daily_reminders = params[:daily_reminders] == '1'
-      requested_daily_reminder_time = daily_reminder_time_param
-      if @daily_reminders_available && !Reader.valid_daily_reminder_time?(requested_daily_reminder_time)
+      problems << 'a reading-link source from the list' unless Reader::PASSAGE_SOURCES.include?(source)
+      if @daily_reminders_available && !Reader.valid_daily_reminder_time?(@daily_reminder_time)
         problems << 'a reminder time in 24-hour HH:MM format'
       end
-
-      if problems.empty?
-        save_display_mode
-        current_reader.update_comment_notification_level!(@comment_notification_level) if @comment_notifications_available
-        if @daily_reminders_available
-          current_reader.update!(daily_reminders: requested_daily_reminders,
-                                 daily_reminder_time: requested_daily_reminder_time)
-        end
-        redirect_to profile_path, notice: 'Your profile has been updated.'
-      else
-        @names = { first_name: params[:first_name], last_name: params[:last_name] }
-        @daily_reminders = requested_daily_reminders
-        @daily_reminder_time = requested_daily_reminder_time
-        flash.now[:alert] = "Please give #{problems.to_sentence}."
-        render :edit, status: :unprocessable_entity
-      end
+      return render_profile_error("Please give #{problems.to_sentence}.") if problems.any?
+
+      save_profile(names.merge(passage_source: source))
+      redirect_to profile_path, notice: 'Your profile has been updated.'
+    rescue ActiveRecord::RecordInvalid, ActiveRecord::RecordNotSaved => e
+      message = e.record ? e.record.errors.full_messages.to_sentence : nil
+      # Reload does not discard Active Storage's deferred attachment changes.
+      current_reader.attachment_changes.clear if Reader.avatar_uploads?
+      current_reader.reload
+      render_profile_error("Your profile could not be saved. #{message.presence || 'Please try again.'}")
     end
 
     def remove_avatar
@@ -63,11 +54,41 @@ module Bible270
       return unless Reader.display_mode_column?
       return if Reader::DISPLAY_MODES.include?(@display_mode)
 
-      'a display preference from the list'
+      'a theme from the list'
+    end
+
+    def avatar_problem
+      upload = params[:avatar]
+      return if upload.blank?
+      return 'a valid image' unless Reader.avatar_uploads?
+
+      Avatars.problem_with(content_type: upload.content_type, byte_size: upload.size)
+    end
+
+    def save_profile(attributes)
+      attributes[:bible_version] = Translations.normalize(params[:bible_version]) if params[:bible_version].present?
+      attributes[:display_mode] = @display_mode if Reader.display_mode_column?
+      if @comment_notifications_available
+        attributes[:notify_on_mention] = @comment_notification_level != 'none'
+        attributes[:notify_on_all_comments] = @comment_notification_level == 'all'
+      end
+      if @daily_reminders_available
+        attributes[:daily_reminders] = @daily_reminders
+        attributes[:daily_reminder_time] = @daily_reminder_time
+      end
+
+      Reader.transaction do
+        current_reader.assign_attributes(attributes)
+        # Unlike attach, assignment never saves early. Active Storage persists the
+        # attachment with the reader and uploads only after a successful commit.
+        current_reader.avatar = params[:avatar] if params[:avatar].present?
+        current_reader.save!
+      end
     end
 
-    def save_display_mode
-      current_reader.update!(display_mode: @display_mode) if Reader.display_mode_column?
+    def render_profile_error(message)
+      flash.now[:alert] = message
+      render :edit, status: :unprocessable_entity
     end
 
     def load_comment_notification_state

data/app/controllers/bible270/readers_controller.rb

@@ -5,7 +5,7 @@ module Bible270
     def index
       # Community is a directory of fellow readers, not a leaderboard. Keep the
       # order predictable without implying that progress determines standing.
-      @readers = Reader.all.to_a.sort_by(&:sort_name)
+      @readers = Reader.with_avatar.to_a.sort_by(&:sort_name)
       @today_day = current_reader&.today_day
       @show_admin_progress = Bible270.config.admin?(current_reader)
       @days_completed = Reader.completed_days_by_id if @show_admin_progress
@@ -47,9 +47,7 @@ module Bible270
   private
 
     def recent_reflections(reader, limit:)
-      comments = reader.comments.recent
-        .includes(:reader, { likes: :reader }, { replies: [:reader, { likes: :reader }] })
-        .limit(limit).to_a
+      comments = reader.comments.recent.with_thread_details.limit(limit).to_a
       ids = comments.map(&:id)
       # A reader's own replies already appear beneath any listed parent reflection.
       comments.reject { |comment| ids.include?(comment.parent_id) }

data/app/helpers/bible270/plan_helper.rb

@@ -159,10 +159,11 @@ module Bible270
       reader.avatar_url.presence
     end
 
-    def b270_avatar(reader, size: 72)
+    def b270_avatar(reader, size: 72, loading: 'lazy')
       src = b270_avatar_src(reader)
       if src
-        image_tag src, class: 'b270-avatar', width: size, height: size, alt: reader.display_name
+        image_tag src, class: 'b270-avatar', width: size, height: size, alt: reader.display_name,
+                       loading: loading, decoding: 'async'
       else
         content_tag :span, reader.initials, class: 'b270-avatar b270-avatar-fallback',
                                             style: "width:#{size}px;height:#{size}px;line-height:#{size}px"

data/app/models/bible270/comment.rb

@@ -52,9 +52,14 @@ module Bible270
     # Only the reflections themselves: replies are rendered under their parent, so
     # listing them again at the top level would show each twice.
     scope :for_day,  ->(d) { approved.where(day: d, parent_id: nil).order(created_at: :asc) }
-    scope :threads_for_day, ->(d) {
-      for_day(d).includes(:reader, { likes: :reader }, { replies: [:reader, { likes: :reader }] })
+    scope :with_reader_avatars, -> {
+      Reader.avatar_uploads? ? includes(reader: { avatar_attachment: :blob }) : includes(:reader)
     }
+    scope :with_thread_details, -> {
+      reply_reader = Reader.avatar_uploads? ? { reader: { avatar_attachment: :blob } } : :reader
+      with_reader_avatars.includes({ likes: :reader }, { replies: [reply_reader, { likes: :reader }] })
+    }
+    scope :threads_for_day, ->(d) { for_day(d).with_thread_details }
     scope :recent, -> { approved.order(created_at: :desc) }
 
     def self.body_format_column?
@@ -95,9 +100,7 @@ module Bible270
       page = page.to_i.clamp(1, pages)
       page_rows = ordered.slice((page - 1) * per_page, per_page) || []
       ids = page_rows.map(&:first)
-      loaded = approved.where(id: ids)
-        .includes(:reader, { likes: :reader }, { replies: [:reader, { likes: :reader }] })
-        .index_by(&:id)
+      loaded = approved.where(id: ids).with_thread_details.index_by(&:id)
 
       ThreadPage.new(
         threads: ids.filter_map { |id| loaded[id] },

data/app/models/bible270/reader.rb

@@ -19,6 +19,8 @@ module Bible270
 
     def self.avatar_uploads? = AVATAR_UPLOADS
 
+    scope :with_avatar, -> { avatar_uploads? ? includes(avatar_attachment: :blob) : all }
+
     # Fires for every way a reader comes into existence — email sign-in, OmniAuth,
     # or a bridged host user — rather than in each controller, so no path can
     # quietly skip it. after_create_commit, so nothing is sent for a reader whose
@@ -27,7 +29,7 @@ module Bible270
 
     PASSAGE_SOURCES = %w[bible_com bible_gateway blue_letter_bible].freeze
     DEFAULT_PASSAGE_SOURCE = 'bible_com'
-    DISPLAY_MODES = %w[light dark system].freeze
+    DISPLAY_MODES = %w[light dark dark_green dark_blue system].freeze
     DEFAULT_DISPLAY_MODE = 'system'
     DAILY_REMINDER_TIME_FORMAT = %r{\A(?:[01]\d|2[0-3]):[0-5]\d\z}
     DAILY_REMINDER_MINUTES = %w[00 15 30 45].freeze
@@ -87,7 +89,7 @@ module Bible270
         .having('COUNT(*) >= ?', Plan.total_parts(day))
         .order(Checkoff.arel_table[:created_at].maximum.asc, :reader_id)
         .pluck(:reader_id)
-      readers_by_id = where(id: reader_ids).index_by(&:id)
+      readers_by_id = with_avatar.where(id: reader_ids).index_by(&:id)
       reader_ids.filter_map { |reader_id| readers_by_id[reader_id] }
     end
 

data/app/views/bible270/admin/show.html.erb

@@ -16,7 +16,7 @@
   <%= form_with url: admin_reader_profile_path(@reader), method: :patch, class: "b270-emailform",
                 html: { multipart: true } do %>
     <div class="b270-avatarrow">
-      <%= b270_avatar(@reader, size: 72) %>
+      <%= b270_avatar(@reader, size: 72, loading: 'eager') %>
       <% if Bible270::Reader.avatar_uploads? %>
         <label class="b270-field" style="flex:1">
           <span>Picture</span>

data/app/views/bible270/comments/_edit_fields.html.erb

@@ -20,7 +20,7 @@
       <%= f.select :track,
             options_for_select([["The whole day", ""]] + Bible270::Plan::TRACKS.map { |k, v| [v[:label], k] },
                                comment.track.to_s),
-            {}, class: "b270-select", style: "width:auto" %>
+            {}, class: "b270-select", style: "width:auto", aria: { label: "Reading this reflection relates to" } %>
     <% end %>
     <%= f.submit "Save", class: "b270-btn" %>
     <%= link_to "Cancel", day_path(comment.day, anchor: "comment-#{comment.id}"), class: "b270-linkbtn" %>

data/app/views/bible270/comments/_edit_form.html.erb

@@ -1,6 +1,6 @@
 <%# locals: (comment:) %>
 <div class="b270-comment b270-editing" id="comment-<%= comment.id %>">
-  <%= b270_avatar(comment.reader) %>
+  <%= b270_avatar(comment.reader, loading: 'eager') %>
   <div style="flex:1">
     <%= render partial: "bible270/comments/edit_fields", locals: { comment: comment } %>
   </div>

data/app/views/bible270/comments/_form.html.erb

@@ -25,7 +25,8 @@
   <div class="row">
     <%= f.select :track,
           options_for_select([["The whole day", ""]] + Bible270::Plan::TRACKS.map { |k, v| [v[:label], k] }),
-          {}, style: "font:inherit;padding:8px;border:1px solid var(--line);border-radius:8px;background:#fff" %>
+          {}, aria: { label: "Reading this reflection relates to" },
+          style: "font:inherit;padding:8px;border:1px solid var(--line);border-radius:8px;background:#fff" %>
     <%= f.submit "Post reflection", class: "b270-btn" %>
   </div>
 <% end %>

data/app/views/bible270/profiles/edit.html.erb

@@ -8,15 +8,21 @@
   <%= form_with url: profile_path, method: :patch, class: "b270-emailform",
                 html: { multipart: true } do %>
     <div class="b270-avatarrow">
-      <%= b270_avatar(current_reader, size: 72) %>
+      <%= b270_avatar(current_reader, size: 72, loading: 'eager') %>
       <% if Bible270::Reader.avatar_uploads? %>
-        <label class="b270-field" style="flex:1">
-          <span>Picture</span>
-          <%= file_field_tag :avatar, accept: Bible270::Avatars.content_types.join(',') %>
-          <span class="b270-hint" style="margin:0">
-            PNG, JPEG, GIF or WebP, up to <%= Bible270::Avatars.human_size(Bible270::Avatars.max_bytes) %>.
-          </span>
-        </label>
+        <div class="b270-avatarcontrols" style="flex:1;min-width:0">
+          <label class="b270-field">
+            <span>Picture</span>
+            <%= file_field_tag :avatar, accept: Bible270::Avatars.content_types.join(',') %>
+            <span class="b270-hint" style="margin:0">
+              PNG, JPEG, GIF or WebP, up to <%= Bible270::Avatars.human_size(Bible270::Avatars.max_bytes) %>.
+            </span>
+          </label>
+          <% if current_reader.avatar_uploaded? %>
+            <%= button_tag "Remove picture", type: "submit", class: "b270-linkbtn",
+                  form: "b270-remove-picture" %>
+          <% end %>
+        </div>
       <% end %>
     </div>
 
@@ -40,15 +46,16 @@
 
     <% if Bible270::Reader.display_mode_column? %>
       <label class="b270-field">
-        <span>Display</span>
+        <span>Theme</span>
         <%= select_tag :display_mode,
-              options_for_select([["Light", "light"], ["Dark", "dark"], ["System", "system"]], @display_mode),
+              options_for_select([["Parchment", "light"], ["Earth", "dark"], ["Forest", "dark_green"],
+                                  ["Midnight", "dark_blue"], ["System", "system"]], @display_mode),
               class: "b270-select", aria: { describedby: "b270-display-hint" } %>
-        <span id="b270-display-hint" class="b270-hint" style="margin:0">System follows your device's light or dark setting.</span>
+        <span id="b270-display-hint" class="b270-hint" style="margin:0">System follows your device's setting: Parchment for light, Earth for dark.</span>
       </label>
     <% else %>
       <p class="b270-flash alert" style="margin:0">
-        Display settings are temporarily unavailable while this installation finishes a database update.
+        Theme settings are temporarily unavailable while this installation finishes a database update.
       </p>
     <% end %>
 
@@ -63,6 +70,13 @@
     <% end %>
 
     <% if @daily_reminders_available %>
+      <% reminder_local_time = Bible270.local_time(Time.now) %>
+      <% reminder_zone = if reminder_local_time.respond_to?(:time_zone)
+                           reminder_local_time.time_zone.tzinfo.name
+                         else
+                           ["Server time zone", reminder_local_time.zone.presence].compact.join(" — ")
+                         end %>
+      <% reminder_tooltip = "Uses the plan's time zone: #{reminder_zone}, not your device's time zone. You can turn reminders off here at any time." %>
       <% reminder_hour, reminder_minute = @daily_reminder_time.to_s.split(":", 2) %>
       <% reminder_minutes = (Bible270::Reader::DAILY_REMINDER_MINUTES + [reminder_minute]).compact.uniq.sort %>
       <div class="b270-field">
@@ -73,7 +87,7 @@
                   aria: { describedby: "daily-reminder-optin-hint" } %>
             <span>Email me each day's readings</span>
             <span class="b270-reminder-tooltip" id="daily-reminder-optin-hint" role="tooltip">
-              Uses the plan's configured time zone. You can turn reminders off here at any time.
+              <%= reminder_tooltip %>
             </span>
           </label>
           <div class="b270-reminder-time">
@@ -88,11 +102,14 @@
                     options_for_select(reminder_minutes, reminder_minute),
                     class: "b270-time-select", required: true, aria: { label: "Minute" } %>
               <span class="b270-reminder-tooltip" id="daily-reminder-time-hint" role="tooltip">
-                Uses the plan's configured time zone. You can turn reminders off here at any time.
+                <%= reminder_tooltip %>
               </span>
             </span>
           </div>
         </div>
+        <span id="daily-reminder-zone" class="b270-hint" style="margin:0;overflow-wrap:anywhere">
+          Plan time zone: <%= reminder_zone %>
+        </span>
       </div>
     <% elsif Bible270.config.daily_reminders? %>
       <p class="b270-flash alert" style="margin:0">
@@ -104,8 +121,11 @@
   <% end %>
 
   <% if current_reader.avatar_uploaded? %>
-    <%= button_to "Remove picture", profile_avatar_path, method: :delete, class: "b270-linkbtn",
-          form: { data: { turbo_confirm: "Remove your picture?" } } %>
+    <%# The picture button targets this separate form so it never submits profile edits. %>
+    <%= form_with url: profile_avatar_path, method: :delete,
+          html: { id: "b270-remove-picture", hidden: true },
+          data: { turbo_confirm: "Remove your picture?" } do %>
+    <% end %>
   <% end %>
 
   <% unless Bible270::Reader.avatar_uploads? %>

data/app/views/bible270/readers/show.html.erb

@@ -1,7 +1,7 @@
 <% content_for :title, "#{@reader.display_name} — #{Bible270.config.app_name}" %>
 <% content_for :hide_day_index, true %><%# this page has its own grid %>
 <div style="display:flex;align-items:center;gap:16px;margin-bottom:8px">
-  <%= b270_avatar(@reader, size: 72) %>
+  <%= b270_avatar(@reader, size: 72, loading: 'eager') %>
   <div>
     <h1 style="margin:0"><%= @reader.display_name %></h1>
     <% if signed_in? && current_reader.id == @reader.id %>

data/app/views/bible270/shared/_comment_drafts.html.erb

@@ -20,8 +20,13 @@
         try { return area.getItem(key); } catch (_error) { return null; }
       },
       set(area, key, value) {
-        if (!area) return;
-        try { area.setItem(key, value); } catch (_error) { /* Drafts degrade safely. */ }
+        if (!area) return false;
+        try {
+          area.setItem(key, value);
+          return true;
+        } catch (_error) {
+          return false;
+        }
       },
       remove(area, key) {
         if (!area) return;
@@ -49,7 +54,7 @@
 
     function setStatus(form, message) {
       const status = form.querySelector("[data-b270-draft-status]");
-      if (status) status.textContent = message;
+      if (status && status.textContent !== message) status.textContent = message;
     }
 
     function save(form) {
@@ -81,8 +86,9 @@
         savedAt: Date.now(),
         revision: `${Date.now().toString(36)}:${Math.random().toString(36).slice(2)}`
       };
-      storage.set(local, key, JSON.stringify(draft));
-      setStatus(form, "Draft saved in this browser.");
+      const saved = storage.set(local, key, JSON.stringify(draft));
+      setStatus(form, saved ? "Draft saved in this browser." :
+        "Draft couldn’t be saved. Keep this page open until posting.");
     }
 
     function settlePending(key = null) {

data/app/views/bible270/shared/_header.html.erb

@@ -29,18 +29,38 @@
   (() => {
     if (window.Bible270NavigationMenu) return;
 
+    function setExpanded(menu, expanded) {
+      const toggle = menu && menu.querySelector("button.b270-navtoggle");
+      const links = menu && menu.querySelector(".b270-navlinks");
+      if (!toggle || !links) return;
+
+      toggle.setAttribute("aria-expanded", String(expanded));
+      links.hidden = !expanded;
+    }
+
     document.addEventListener("click", (event) => {
       const target = event.target;
+      document.querySelectorAll(".b270-navmenu").forEach((menu) => {
+        if (!menu.contains(target)) setExpanded(menu, false);
+      });
+
       const toggle = target.closest && target.closest("button.b270-navtoggle");
       if (!toggle) return;
 
-      const menu = toggle.closest(".b270-navmenu");
-      const links = menu && menu.querySelector(".b270-navlinks");
-      if (!links) return;
+      setExpanded(toggle.closest(".b270-navmenu"), toggle.getAttribute("aria-expanded") !== "true");
+    });
+
+    document.addEventListener("keydown", (event) => {
+      if (event.key !== "Escape" || event.defaultPrevented) return;
+
+      const menu = event.target.closest && event.target.closest(".b270-navmenu");
+      const toggle = menu && menu.querySelector("button.b270-navtoggle");
+      if (!toggle || toggle.getAttribute("aria-expanded") !== "true") return;
 
-      const opening = toggle.getAttribute("aria-expanded") !== "true";
-      toggle.setAttribute("aria-expanded", String(opening));
-      links.hidden = !opening;
+      const restoreFocus = menu.contains(document.activeElement);
+      setExpanded(menu, false);
+      event.preventDefault();
+      if (restoreFocus) toggle.focus();
     });
 
     window.Bible270NavigationMenu = true;

data/app/views/bible270/shared/_styles.html.erb

@@ -32,6 +32,36 @@
     --alert-surface:#42282a; --alert-ink:#ffc0b8; --alert-line:#a66d68;
     --notice-surface:#25382a; --notice-ink:#b6dfb6; --notice-line:#6d956e;
   }
+  .b270[data-display-mode="dark_green"]{
+    color-scheme:dark;
+    background-image:none;
+    --control-line:#7c9280;
+    --paper:#1c3027; --card:#17291f; --ink:#d9decb; --muted:#bdc9b5; --faint:#a6b69e;
+    --line:#3c5045; --line-soft:#304638; --teal:#83c4b3; --oxblood:#df9aa6; --gold:#d8c184;
+    --gold-lite:#62501e; --shadow:0 1px 0 rgba(0,0,0,.1);
+    --control:#101c17; --task-surface:rgba(255,255,255,.025); --button-hover:#1e3829;
+    --on-accent:#e3e7d5; --complete-ink:#e3e7d5; --complete-dot:#e3e7d5;
+    --button-surface:#102219; --button-ink:#e3e7d5;
+    --teal-fill:#28554b; --oxblood-fill:#6a2c3c; --gold-fill:#62501e;
+    --teal-mark:#4d9d89; --oxblood-mark:#c46c7f; --gold-mark:#b79b45;
+    --alert-surface:#3e282c; --alert-ink:#ffc1c2; --alert-line:#a87479;
+    --notice-surface:#243b2b; --notice-ink:#c1e2b9; --notice-line:#779c70;
+  }
+  .b270[data-display-mode="dark_blue"]{
+    color-scheme:dark;
+    background-image:none;
+    --control-line:#7c8da7;
+    --paper:#182537; --card:#121d2e; --ink:#d1dbe8; --muted:#b6c3d5; --faint:#9dadc3;
+    --line:#36465d; --line-soft:#29394e; --teal:#81bfca; --oxblood:#df9caf; --gold:#d5bd82;
+    --gold-lite:#5d4c25; --shadow:0 1px 0 rgba(0,0,0,.1);
+    --control:#0b1422; --task-surface:rgba(255,255,255,.025); --button-hover:#20334d;
+    --on-accent:#e0e7ef; --complete-ink:#e0e7ef; --complete-dot:#e0e7ef;
+    --button-surface:#0c1829; --button-ink:#e0e7ef;
+    --teal-fill:#245363; --oxblood-fill:#622d49; --gold-fill:#5d4c25;
+    --teal-mark:#4c9eae; --oxblood-mark:#b86382; --gold-mark:#b59a54;
+    --alert-surface:#3b2432; --alert-ink:#ffc0cd; --alert-line:#a66c80;
+    --notice-surface:#1e3430; --notice-ink:#b7decc; --notice-line:#6b9787;
+  }
   @media (prefers-color-scheme:dark){
     .b270[data-display-mode="system"]{
       color-scheme:dark;

data/lib/bible270/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Bible270
-  VERSION = '1.9.1'
+  VERSION = '1.10.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bible270
 version: !ruby/object:Gem::Version
-  version: 1.9.1
+  version: 1.10.0
 platform: ruby
 authors:
 - Andrew vonderLuft