Merge branch '4-2-stable'

Author: scambra

CHANGELOG.rdoc

@@ -3,8 +3,11 @@
 - Use :subform_columns option in :horizontal and :vertical show_ui too
 - Add layout multiple support to ActionColumns, so forms can have columns
 
-= 4.2.3 (unreleased)
+= 4.2.3
 - Make simplified searches on LogicalQueryParser bridge working with upstream gem, no need for my fork
+- Styles for radio form_ui
+- Fix style for checkbox list in subform
+- Fix constraints (broken on 4.2.2 on some cases)
 
 = 4.2.2
 - Support setting form_ui_options with nil, for subforms

Gemfile.lock

@@ -7,7 +7,7 @@ GIT
 PATH
   remote: .
   specs:
-    active_scaffold (4.2.2)
+    active_scaffold (4.2.3)
       dartsass-sprockets (~> 3.2.0)
       ice_nine (~> 0.11)
       method_source (~> 1.1)

app/assets/stylesheets/active_scaffold_layout.scss

@@ -750,6 +750,12 @@ float: left;
 .active-scaffold li.form-element dd input[type="checkbox"] {
 margin-top: 6px;
 }
+.active-scaffold form input[type=radio] {
+  margin-right: 5px;
+}
+.active-scaffold form label:has(input[type=radio]) {
+  margin-right: 10px;
+}
 
 .active-scaffold li.form-element dd .select-field:not(.draggable-lists-container) {
   display: inline-block;
@@ -1052,7 +1058,7 @@ padding: 0 2px 2px 2px;
 border: solid 1px;
 }
 
-.active-scaffold .sub-form .checkbox-list label {
+.active-scaffold .sub-form .checkbox-list li {
 display: block;
 }
 

gemfiles/Gemfile.rails-7.2.x.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    active_scaffold (4.2.2)
+    active_scaffold (4.2.3)
       dartsass-sprockets (~> 3.2.0)
       ice_nine (~> 0.11)
       method_source (~> 1.1)

gemfiles/Gemfile.rails-8.0.x.lock

@@ -11,7 +11,7 @@ GIT
 PATH
   remote: ..
   specs:
-    active_scaffold (4.2.2)
+    active_scaffold (4.2.3)
       dartsass-sprockets (~> 3.2.0)
       ice_nine (~> 0.11)
       method_source (~> 1.1)

gemfiles/Gemfile.rails-8.1.x.lock

@@ -6,7 +6,7 @@ GIT
 PATH
   remote: ..
   specs:
-    active_scaffold (4.2.2)
+    active_scaffold (4.2.3)
       dartsass-sprockets (~> 3.2.0)
       ice_nine (~> 0.11)
       method_source (~> 1.1)

lib/active_scaffold/version.rb

@@ -4,7 +4,7 @@ module ActiveScaffold
   module Version
     MAJOR = 4
     MINOR = 2
-    PATCH = 2
+    PATCH = 3
     FIX = nil
 
     STRING = [MAJOR, MINOR, PATCH, FIX].compact.join('.')