content_block_tools 1.6.2 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e56c70a49537656eb82058f2e701e8b6b80adfce2f1bacaaab776ad8bc5050f5
-  data.tar.gz: 12a8b050898d3111a33c40df40666891563bd258e827075d423f2ec13c057cc4
+  metadata.gz: 8bf99fd8affbea779c0cdf676527123d493ef6e52736b2ef53e037751edda3db
+  data.tar.gz: 00c4d22fd4f3c02a2d287cb9897ded18cdcb45d8e65c9788c11b0a1e9f783cc1
 SHA512:
-  metadata.gz: 33d2dc4fff3d9357fcbd0d66d34e1577adfc884241e038731a248cd68866e7818da3020ae246cd3bffb71437ffaf56385cda1cff9da7f44b89dff3cd5ce4af10
-  data.tar.gz: 565e564662e0fad52667b6e18068b049f81fa2f2d841793ca9a4f630b6f6440bf5720eeb92ede7c07417113b269f15417e00c47403d682fe1daf30fdda925304
+  metadata.gz: 4e69ba2bb65f19db0f5f8d5f74d958cf5e4a999c40498579d1caec2425b43dfee14e2d42597682f9f7956ecc4e25c95245ccf4e63ab96a8eb9960bbd8f8f9f0b
+  data.tar.gz: 40e4924121bfe450ca64b92bf8f6b4e89da077c189cb236fd09b61853e5e2a4fac63135de438413cbb791e72e84dd7ee692ba28bba1fc3dd4d19538eb5792cce

data/app/components/content_block_tools/base_component.rb

@@ -1,6 +1,8 @@
 module ContentBlockTools
   class BaseComponent < ViewComponent::Base
     include ContentBlockTools::Govspeak
+    include ContentBlockTools::OverrideClasses
+
     def render
       render_in(view_context)
     end

data/app/components/content_block_tools/contact_component.html.erb

@@ -1,21 +1,17 @@
-<dl class="vcard content-block__contact-list">
-  <dt class="content-block__contact-key fn org"><%= content_block.title %></dt>
-
+<div class="vcard">
   <% if block_type.nil? %>
-    <dd class="content-block__contact-value">
-      <%= render_govspeak(content_block.details[:description]) if content_block.details[:description] %>
-      <dl class="content-block__contact-list--nested">
-        <% items.each do |block_type, _, item| %>
-          <dt class="content-block__contact-key"><%= item[:title] %></dt>
-          <dd class="content-block__contact-value">
-            <%= component_for_block_type(block_type).new(item:).render.html_safe %>
-          </dd>
-        <% end %>
-      </dl>
-    </dd>
+    <%= render_govspeak(content_block.details[:description]) if content_block.details[:description] %>
+    <dl class="<%= margin_classes(0) %> <%= padding_classes(0) %>">
+      <% items.each do |block_type, _, item| %>
+        <dt class="<%= margin_classes(0, 0, 4, 0) %> <%= padding_classes(0) %> <%= font_classes(19, "bold") %>">
+          <%= item[:title] %>
+        </dt>
+        <dd class="<%= margin_classes(0) %>">
+          <%= component_for_block_type(block_type).new(item:).render.html_safe %>
+        </dd>
+      <% end %>
+    </dl>
   <% else %>
-    <dd class="content-block__contact-value">
-      <%= component_for_block_type(block_type).new(item: item_to_render).render.html_safe %>
-    </dd>
+    <%= component_for_block_type(block_type).new(item: item_to_render).render.html_safe %>
   <% end %>
-</dl>
+</div>

data/app/components/content_block_tools/contacts/contact_link_component.html.erb

@@ -1,4 +1,4 @@
-<ul class="content-block__list">
+<ul class="govuk-list list-no-bullets <%= margin_classes(0, 0, 6, 0) %>">
   <li>
     <a href="<%= item[:url] %>" class="url">
       <%= link_text %>

data/app/components/content_block_tools/contacts/email_address_component.html.erb

@@ -1,4 +1,4 @@
-<ul class="content-block__list">
+<ul class="govuk-list list-no-bullets <%= margin_classes(0, 0, 6, 0) %>">
   <li>
     <a href="<%= "mailto:#{item[:email_address]}#{query_params}" %>" class="email">
       <%= link_text %>

data/app/components/content_block_tools/contacts/telephone_component.html.erb

@@ -2,7 +2,7 @@
   <%= render_govspeak(item[:description]) %>
 <% end %>
 
-<ul class="content-block__list govuk-!-margin-bottom-0">
+<ul class="govuk-list list-no-bullets <%= margin_classes(0) %>">
   <% item[:telephone_numbers].each do |number| %>
     <li class="govuk-!-margin-bottom-1">
       <span><%= number[:label] %>: </span>

data/lib/content_block_tools/helpers/override_classes.rb

@@ -0,0 +1,99 @@
+# Module for generating GOV.UK Design System CSS utility classes
+module ContentBlockTools
+  # Helper methods for generating override CSS classes
+  # These methods generate CSS class names for spacing and typography utilities
+  # from the GOV.UK Design System.
+  module OverrideClasses
+    # Generates margin CSS classes
+    #
+    # @param top [Integer, String] the margin value for all sides (if used alone) or top margin
+    # @param right [Integer, String, nil] the right margin value (optional)
+    # @param bottom [Integer, String, nil] the bottom margin value (optional)
+    # @param left [Integer, String, nil] the left margin value (optional)
+    # @return [String] the generated margin class(es)
+    #
+    # @example Generate uniform margin
+    #   margin_classes(4)
+    #   # => "govuk-!-margin-4"
+    #
+    # @example Generate individual side margins
+    #   margin_classes(4, 3, 2, 1)
+    #   # => "govuk-!-margin-top-4 govuk-!-margin-right-3 govuk-!-margin-bottom-2 govuk-!-margin-left-1"
+    def margin_classes(top, right = nil, bottom = nil, left = nil)
+      spacing_classes("margin", top, right, bottom, left)
+    end
+
+    # Generates padding CSS classes
+    #
+    # @param top [Integer, String] the padding value for all sides (if used alone) or top padding
+    # @param right [Integer, String, nil] the right padding value (optional)
+    # @param bottom [Integer, String, nil] the bottom padding value (optional)
+    # @param left [Integer, String, nil] the left padding value (optional)
+    # @return [String] the generated padding class(es)
+    #
+    # @example Generate uniform padding
+    #   padding_classes(4)
+    #   # => "govuk-!-padding-4"
+    #
+    # @example Generate individual side paddings
+    #   padding_classes(4, 3, 2, 1)
+    #   # => "govuk-!-padding-top-4 govuk-!-padding-right-3 govuk-!-padding-bottom-2 govuk-!-padding-left-1"
+    def padding_classes(top, right = nil, bottom = nil, left = nil)
+      spacing_classes("padding", top, right, bottom, left)
+    end
+
+    # Generates combined font size and weight CSS classes
+    #
+    # @param size [Integer, String] the font size value (e.g., 16, 19, 24)
+    # @param weight [String, Symbol] the font weight value (e.g., "bold", "regular")
+    # @return [String] the generated font size and weight classes separated by a space
+    #
+    # @example Generate font classes with size and weight
+    #   font_classes(19, "bold")
+    #   # => "govuk-!-font-size-19 govuk-!-font-weight-bold"
+    #
+    # @example Generate font classes with different values
+    #   font_classes(24, "regular")
+    #   # => "govuk-!-font-size-24 govuk-!-font-weight-regular"
+    def font_classes(size, weight)
+      [
+        font_size_class(size),
+        font_weight_class(weight),
+      ].join(" ")
+    end
+
+    # Generates a font size CSS class
+    #
+    # @param size [Integer, String] the font size value (e.g., 16, 19, 24)
+    # @return [String] the generated font size class
+    #
+    # @example
+    #   font_size_class(19)
+    #   # => "govuk-!-font-size-19"
+    def font_size_class(size)
+      "govuk-!-font-size-#{size}"
+    end
+
+    # Generates a font weight CSS class
+    #
+    # @param weight [String, Symbol] the font weight value (e.g., "bold", "regular")
+    # @return [String] the generated font weight class
+    #
+    # @example
+    #   font_weight_class("bold")
+    #   # => "govuk-!-font-weight-bold"
+    def font_weight_class(weight)
+      "govuk-!-font-weight-#{weight}"
+    end
+
+  private
+
+    def spacing_classes(type, top, right = nil, bottom = nil, left = nil)
+      if right.nil? && bottom.nil? && left.nil?
+        "govuk-!-#{type}-#{top}"
+      else
+        %W[govuk-!-#{type}-top-#{top} govuk-!-#{type}-right-#{right} govuk-!-#{type}-bottom-#{bottom} govuk-!-#{type}-left-#{left}].join(" ")
+      end
+    end
+  end
+end

data/lib/content_block_tools/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ContentBlockTools
-  VERSION = "1.6.2"
+  VERSION = "1.7.0"
 end

data/lib/content_block_tools.rb

@@ -6,6 +6,7 @@ require "gds-api-adapters"
 require "govspeak"
 
 require "content_block_tools/helpers/govspeak"
+require "content_block_tools/helpers/override_classes"
 
 require "content_block_tools/presenters/field_presenters/base_presenter"
 require "content_block_tools/presenters/field_presenters/contact/email_presenter"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: content_block_tools
 version: !ruby/object:Gem::Version
-  version: 1.6.2
+  version: 1.7.0
 platform: ruby
 authors:
 - GOV.UK Dev
@@ -185,6 +185,7 @@ files:
 - lib/content_block_tools/content_block_reference.rb
 - lib/content_block_tools/engine.rb
 - lib/content_block_tools/helpers/govspeak.rb
+- lib/content_block_tools/helpers/override_classes.rb
 - lib/content_block_tools/presenters/field_presenters/base_presenter.rb
 - lib/content_block_tools/presenters/field_presenters/contact/email_presenter.rb
 - lib/content_block_tools/version.rb