diff --git a/core/themes/olivero/config/install/olivero.settings.yml b/core/themes/olivero/config/install/olivero.settings.yml index a4248de13b7d6fc7330f40255b24d7ec56671567..1e5d0344dbee352d7241da802e0348b97ab36d51 100644 --- a/core/themes/olivero/config/install/olivero.settings.yml +++ b/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 diff --git a/core/themes/olivero/config/schema/olivero.schema.yml b/core/themes/olivero/config/schema/olivero.schema.yml index aa72e00ffe2bf78b870b3adae3f7ee21710b5b99..0bd946db2874b9def00ee170fa4bad331259fb25 100644 --- a/core/themes/olivero/config/schema/olivero.schema.yml +++ b/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' diff --git a/core/themes/olivero/olivero.post_update.php b/core/themes/olivero/olivero.post_update.php index a7272268385701dc191dda827e2e81679207983f..f033945e02be45f1a74e43d353c25f784c7f398f 100644 --- a/core/themes/olivero/olivero.post_update.php +++ b/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); -} diff --git a/core/themes/olivero/olivero.theme b/core/themes/olivero/olivero.theme index c502d98c765b156992f62e23a8dc6f539a4d2e1e..6d4aa96bb0bf5400a3abd1180a8145d3b34212d9 100644 --- a/core/themes/olivero/olivero.theme +++ b/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'); } /** diff --git a/core/themes/olivero/templates/field/field--comment.html.twig b/core/themes/olivero/templates/field/field--comment.html.twig index 9a07538eee377705c93ad2b27073fb3560a0d4f5..c69553cea34e8cf923767ae66e138f1b0944fab8 100644 --- a/core/themes/olivero/templates/field/field--comment.html.twig +++ b/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> diff --git a/core/themes/olivero/theme-settings.php b/core/themes/olivero/theme-settings.php index 805261e329e4a0195ca5e5e78fe6a93ad480c852..849df4c11d5d0f5c9b35c6d47d9e90fac000854f 100644 --- a/core/themes/olivero/theme-settings.php +++ b/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'), - ]; }