diff --git a/core/modules/views/css/views.exposed_form-rtl.css b/core/modules/views/css/views.exposed_form-rtl.css index 165eb68..f060211 100644 --- a/core/modules/views/css/views.exposed_form-rtl.css +++ b/core/modules/views/css/views.exposed_form-rtl.css @@ -2,3 +2,10 @@ * @file * Right-to-Left styling for Views exposed forms. */ +.views-exposed-form .form-item { + float: right; + margin-left: .25em; +} +.views-exposed-form .form-actions { + clear: right; +} diff --git a/core/modules/views/css/views.exposed_form.css b/core/modules/views/css/views.exposed_form.css index 35c19c7..94344e8 100644 --- a/core/modules/views/css/views.exposed_form.css +++ b/core/modules/views/css/views.exposed_form.css @@ -2,12 +2,11 @@ * @file * Styling for Views exposed forms. */ -.views-exposed-form .views-exposed-widget { - display: inline-block; +.views-exposed-form .form-item { + /* Display exposed form elements horizontally. */ + float: left; /* LTR */ + margin-right: .25em; /* LTR */ } - -.views-exposed-form .form-item, -.views-exposed-form .form-submit { - margin-top: 0; - margin-bottom: 0; +.views-exposed-form .form-actions { + clear: left; /* LTR */ } diff --git a/core/modules/views/templates/views-exposed-form.html.twig b/core/modules/views/templates/views-exposed-form.html.twig index d579440..5a34f2f 100644 --- a/core/modules/views/templates/views-exposed-form.html.twig +++ b/core/modules/views/templates/views-exposed-form.html.twig @@ -19,9 +19,5 @@ {{ q }} {% endif %}
-
- {% hide(form.submit) %} - {{ form }} -
- {{ form.submit }} + {{ form }}
diff --git a/core/modules/views/views.module b/core/modules/views/views.module index b0c958e..8bb66b7 100644 --- a/core/modules/views/views.module +++ b/core/modules/views/views.module @@ -1356,11 +1356,12 @@ function views_exposed_form($form, &$form_state) { } } - $form['submit'] = array( + $form['actions'] = array('#type' => 'actions'); + $form['actions']['submit'] = array( // Prevent from showing up in $_GET. '#name' => '', '#type' => 'submit', - '#value' => t('Apply'), + '#value' => t('Filter'), '#id' => drupal_html_id('edit-submit-' . $view->storage->id()), );