Revert "Issue #3439844 by ivnish, KrakenBite, larowlan, smustgrave: Add...

Revert "Issue #3439844 by ivnish, KrakenBite, larowlan, smustgrave: Add setting to move comment form after comments"

This reverts commit 26e593af.

core/themes/olivero/config/install/olivero.settings.yml

@@ -13,4 +13,3 @@ third_party_settings:
 mobile_menu_all_widths: 0
 site_branding_bg_color: default
 base_primary_color: '#1b9ae4'
-comment_form_position: 0

core/themes/olivero/config/schema/olivero.schema.yml

@@ -38,6 +38,3 @@ olivero.settings:
     base_primary_color:
       type: color_hex
       label: 'Base Primary Color'
-    comment_form_position:
-      type: integer
-      label: 'Comment form position'

core/themes/olivero/olivero.post_update.php

@@ -13,12 +13,3 @@ function olivero_post_update_add_olivero_primary_color() {
     ->set('base_primary_color', '#1b9ae4')
     ->save();
 }
-
-/**
- * Sets the `comment_form_position` value of Olivero's theme settings.
- */
-function olivero_post_update_add_comment_form_position() {
-  \Drupal::configFactory()->getEditable('olivero.settings')
-    ->set('comment_form_position', 0)
-    ->save(TRUE);
-}

core/themes/olivero/olivero.theme

@@ -540,8 +540,6 @@ function olivero_preprocess_field__comment(&$variables) {
 
     $variables['#cache']['contexts'][] = 'user';
   }
-
-  $variables['comment_form_position'] = theme_get_setting('comment_form_position');
 }
 
 /**

core/themes/olivero/templates/field/field--comment.html.twig

@@ -42,10 +42,6 @@
     {{ title_suffix }}
   {% endif %}
 
-  {% if comment_form_position %}
-    {{ comments }}
-  {% endif %}
-
   {% if comment_form %}
     <div class="add-comment">
       {% if user_picture %}
@@ -61,8 +57,6 @@
     </div>
   {% endif %}
 
-  {% if not comment_form_position %}
-    {{ comments }}
-  {% endif %}
+  {{ comments }}
 
 </section>

core/themes/olivero/theme-settings.php

@@ -117,14 +117,4 @@ function olivero_form_system_theme_settings_alter(&$form, FormStateInterface $fo
       ],
     ];
   }
-
-  $form['olivero_settings']['olivero_utilities']['comment_form_position'] = [
-    '#type' => 'radios',
-    '#title' => t('Comment form position'),
-    '#options' => [
-      0 => t('Before comments'),
-      1 => t('After comments'),
-    ],
-    '#default_value' => theme_get_setting('comment_form_position'),
-  ];
 }