Move inline container style definition to farm_ui_theme.

glenlivet99 · Apr 1, 2023 · 5ada077 · 5ada077
1 parent 7b3639e
commit 5ada077
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 9 deletions.
diff --git a/modules/core/quick/farm_quick.libraries.yml b/modules/core/quick/farm_quick.libraries.yml
diff --git a/modules/core/quick/src/Form/QuickForm.php b/modules/core/quick/src/Form/QuickForm.php
@@ -116,9 +116,6 @@ public function buildForm(array $form, FormStateInterface $form_state, $id = NUL
       ];
     }
 
-    // Attach quick form CSS/JS.
-    $form['#attached']['library'][] = 'farm_quick/quick';
-
     return $form;
   }
 

diff --git a/modules/core/quick/css/quick.css → modules/core/ui/theme/css/quick.css b/modules/core/quick/css/quick.css → modules/core/ui/theme/css/quick.css
@@ -1,4 +1,4 @@
-.inline {
+form.quick-form .inline-container {
   display: flex;
   flex-wrap: wrap;
   column-gap: 2em;

diff --git a/modules/core/ui/theme/farm_ui_theme.libraries.yml b/modules/core/ui/theme/farm_ui_theme.libraries.yml
@@ -24,6 +24,10 @@ map:
       css/map.css: { }
   dependencies:
     - farm_map/farm_map
+quick:
+  css:
+    theme:
+      css/quick.css: { }
 toolbar:
   css:
     theme:

diff --git a/modules/core/ui/theme/farm_ui_theme.module b/modules/core/ui/theme/farm_ui_theme.module
@@ -6,6 +6,7 @@
  */
 
 use Drupal\Core\Block\BlockPluginInterface;
+use Drupal\Core\Form\FormStateInterface;
 
 /**
  * Implements hook_theme().
@@ -30,6 +31,13 @@ function farm_ui_theme_element_info_alter(array &$info) {
   }
 }
 
+/**
+ * Implements hook_form_BASE_FORM_ID_alter().
+ */
+function farm_ui_theme_form_quick_form_alter(&$form, FormStateInterface $form_state, $form_id) {
+  $form['#attached']['library'][] = 'farm_ui_theme/quick';
+}
+
 /**
  * Implements hook_preprocess_HOOK().
  */

diff --git a/modules/quick/planting/src/Plugin/QuickForm/Planting.php b/modules/quick/planting/src/Plugin/QuickForm/Planting.php
@@ -358,7 +358,7 @@ protected function buildLogForm(string $log_type, array $include_fields = [], ar
       'quantity' => [
         '#type' => 'container',
         '#attributes' => [
-          'class' => ['inline'],
+          'class' => ['inline-container'],
         ],
         'value' => [
           '#type' => 'textfield',
-Original file line number
+Diff line change
@@ Expand Up @@
           ];
         }
-        // Attach quick form CSS/JS.
-        $form['#attached']['library'][] = 'farm_quick/quick';
         return $form;
       }
@@ Expand Down @@