keystone_ui-preferences 0.10.0 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f764e1eedad8a815d7d8a0a92ff8f889d202a851f2c4bc063d7e1389867fb0f1
-  data.tar.gz: 4fd53a54a9c8b1e5609314e7bedfd3d6b6ed9ef0cc9a723e34a3bc6dbe72c0f4
+  metadata.gz: 0fefa886f2e66f62352fdefc4e35ccdb094f75bc6239bd400cb49af3dec31c30
+  data.tar.gz: '09dbb68d7489c63390028910cde735fc98156cc78ce1358425b72009fd9797ec'
 SHA512:
-  metadata.gz: 9370930c96ddf66319f31e53f9ea08697367c72e6bce7782e216f83b7c3622857dad697d8241c76ca95e924069898300eb41f9d69dce1d507c818f690e59d8a5
-  data.tar.gz: aa97e42143a98e7d5f14858c0acd93eef460036dde1585092fca0b7da982a7957b69969fd33fc6638ee93d61ffa4dc8c4aa77b4601fda29865201bb19d922f04
+  metadata.gz: 2da20eb0e968d2a270025971fea98ed3fe80e0474fcedb36142ea212e16075b002bed32a57aaa1a1fdcdc137c7bddb2bd774aa74dbf2a7c4e0c9344d7713b37a
+  data.tar.gz: 96337f947750d95d8d40a06a5657f5fcc56217e972feca3c5246c16994d6a9e77e61c54c02f6f70c97f81c9b1edb125ae5ea029111c720198c61562dd37eafec

data/app/views/keystone_ui/preferences/settings/_theme_settings.html.erb

@@ -16,31 +16,38 @@
           <div style="display: flex; flex-wrap: wrap; gap: 1rem;">
             <% names.each do |name| %>
               <% role = KeystoneUi::Preferences::ThemeRoles::ROLES.fetch(name) %>
-              <% if role[:kind] == :colour %>
-                <% name_id = "#{id_prefix}-theme-#{name}-name" %>
-                <div role="group" aria-labelledby="<%= name_id %>" style="display: flex; flex-direction: column; gap: 0.5rem;">
-                <span id="<%= name_id %>" class="<%= Keystone::Ui::FormFieldComponent::LABEL_CLASSES %>">--<%= name %></span>
-                <div style="display: flex; flex-wrap: wrap; gap: 1rem;">
+              <% fields = capture do %>
+                <% (role[:kind] == :colour ? %w[light dark] : %w[light]).each do |side| %>
+                  <% field_name = "theme[#{name}][#{side}]" %>
+                  <% value = shown.dig(name, side).to_s %>
+                  <% label = role[:kind] == :colour ? side.capitalize : "--#{name}" %>
+                  <% if %i[colour shadow_colour].include?(role[:kind]) && (value.empty? || value.match?(KeystoneUi::Preferences::CheckedTheme::COLOUR)) %>
+                    <%= ui_color_picker(name: field_name, value: value, label: label) %>
+                  <% else %>
+                    <% field_id = "#{id_prefix}-#{field_name.parameterize}" %>
+                    <div class="<%= Keystone::Ui::FormFieldComponent::WRAPPER_CLASSES %>">
+                      <%= label_tag field_id, label, class: Keystone::Ui::FormFieldComponent::LABEL_CLASSES %>
+                      <%= text_field_tag field_name, value, id: field_id, class: Keystone::Ui::InputComponent::BASE_CLASSES, list: (fonts_id if role[:kind] == :font_list) %>
+                    </div>
+                  <% end %>
+                <% end %>
               <% end %>
-              <% (role[:kind] == :colour ? %w[light dark] : %w[light]).each do |side| %>
-                <% field_name = "theme[#{name}][#{side}]" %>
-                <% value = shown.dig(name, side).to_s %>
-                <% label = role[:kind] == :colour ? side.capitalize : "--#{name}" %>
-                <% if %i[colour shadow_colour].include?(role[:kind]) && (value.empty? || value.match?(KeystoneUi::Preferences::CheckedTheme::COLOUR)) %>
-                  <%= ui_color_picker(name: field_name, value: value, label: label) %>
-                <% else %>
-                  <% field_id = "#{id_prefix}-#{field_name.parameterize}" %>
-                  <div class="<%= Keystone::Ui::FormFieldComponent::WRAPPER_CLASSES %>">
-                    <%= label_tag field_id, label, class: Keystone::Ui::FormFieldComponent::LABEL_CLASSES %>
-                    <%= text_field_tag field_name, value, id: field_id, class: Keystone::Ui::InputComponent::BASE_CLASSES, list: (fonts_id if role[:kind] == :font_list) %>
-                  </div>
+              <% refusal = capture do %>
+                <% if name == check.failing_setting %>
+                  <p class="<%= Keystone::Ui::FormFieldComponent::ERROR_CLASSES %>"><%= check.refusal.message %></p>
                 <% end %>
               <% end %>
-              <% if role[:kind] == :colour %></div><% end %>
-              <% if name == check.failing_setting %>
-                <p class="<%= Keystone::Ui::FormFieldComponent::ERROR_CLASSES %>"><%= check.refusal.message %></p>
+              <% if role[:kind] == :colour %>
+                <% name_id = "#{id_prefix}-theme-#{name}-name" %>
+                <div role="group" aria-labelledby="<%= name_id %>" style="display: flex; flex-direction: column; gap: 0.5rem;">
+                  <span id="<%= name_id %>" class="<%= Keystone::Ui::FormFieldComponent::LABEL_CLASSES %>">--<%= name %></span>
+                  <div style="display: flex; flex-wrap: wrap; gap: 1rem;"><%= fields %></div>
+                  <%= refusal %>
+                </div>
+              <% else %>
+                <%= fields %>
+                <%= refusal %>
               <% end %>
-              <% if role[:kind] == :colour %></div><% end %>
             <% end %>
           </div>
         </fieldset>

data/lib/keystone_ui/preferences/version.rb

@@ -2,6 +2,6 @@
 
 module KeystoneUi
   module Preferences
-    VERSION = "0.10.0"
+    VERSION = "0.10.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: keystone_ui-preferences
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.1
 platform: ruby
 authors:
 - Tyler Schneider