diff --git a/core/modules/field_ui/css/field_ui.admin.css b/core/modules/field_ui/css/field_ui.admin.css index f85e101..0cf7a68 100644 --- a/core/modules/field_ui/css/field_ui.admin.css +++ b/core/modules/field_ui/css/field_ui.admin.css @@ -3,21 +3,6 @@ * Stylesheet for the Field UI module. */ -/* Add new field page. */ -.field-ui-field-storage-add-form .field-type-wrapper .form-item { - float: left; - margin-right: 1em; - vertical-align: text-bottom; -} -[dir="rtl"] .field-ui-field-storage-add-form .field-type-wrapper .form-item { - float: right; - margin-left: 1em; - margin-right: 0; -} -.field-ui-field-storage-add-form .field-type-wrapper .form-item-separator { - margin-top: 2.3em; -} - /* 'Manage fields' and 'Manage display' overviews */ .field-ui-overview .region-title td { font-weight: bold; diff --git a/core/modules/field_ui/src/Form/FieldStorageAddForm.php b/core/modules/field_ui/src/Form/FieldStorageAddForm.php index f4f2358..862984b 100644 --- a/core/modules/field_ui/src/Form/FieldStorageAddForm.php +++ b/core/modules/field_ui/src/Form/FieldStorageAddForm.php @@ -141,7 +141,7 @@ public function buildForm(array $form, FormStateInterface $form_state, $entity_t $form['add'] = array( '#type' => 'container', - '#attributes' => array('class' => array('field-type-wrapper', 'clearfix')), + '#attributes' => array('class' => array('form--inline', 'clearfix')), ); $form['add']['new_storage_type'] = array( diff --git a/core/modules/system/css/system.module.css b/core/modules/system/css/system.module.css index a3a9be2..9eb87dc 100644 --- a/core/modules/system/css/system.module.css +++ b/core/modules/system/css/system.module.css @@ -285,11 +285,20 @@ tr .ajax-progress-throbber .throbber { float: left; /* LTR */ margin-right: 0.5em; /* LTR */ } -[dir="rtl"].form--inline .form-item { +[dir="rtl"] .form--inline .form-item { float: right; margin-right: 0; margin-left: 0.5em; } +.form--inline .form-item-separator { + margin-top: 2.3em; + margin-right: 1em; /* LTR */ + margin-left: 0.5em; /* LTR */ +} +[dir="rtl"] .form--inline .form-item-separator { + margin-right: 0.5em; + margin-left: 1em; +} .form--inline .form-actions { clear: left; /* LTR */ } diff --git a/core/modules/views/css/views.exposed_form.css b/core/modules/views/css/views.exposed_form.css deleted file mode 100644 index 273e598..0000000 --- a/core/modules/views/css/views.exposed_form.css +++ /dev/null @@ -1,20 +0,0 @@ -/** - * @file - * Styling for Views exposed forms. - */ -.views-exposed-form .form-item { - /* Display exposed form elements horizontally. */ - float: left; /* LTR */ - margin-right: .25em; /* LTR */ -} -[dir="rtl"] .views-exposed-form .form-item { - float: right; - margin-left: .25em; -} - -.views-exposed-form .form-actions { - clear: left; /* LTR */ -} -[dir="rtl"] .views-exposed-form .form-actions { - clear: right; -} diff --git a/core/modules/views_ui/src/ViewEditForm.php b/core/modules/views_ui/src/ViewEditForm.php index 055a12b..243ca6b 100644 --- a/core/modules/views_ui/src/ViewEditForm.php +++ b/core/modules/views_ui/src/ViewEditForm.php @@ -107,7 +107,6 @@ public function form(array $form, FormStateInterface $form_state) { $form['#attached']['library'][] = 'core/jquery.ui.dialog'; $form['#attached']['library'][] = 'core/drupal.states'; $form['#attached']['library'][] = 'core/drupal.tabledrag'; - $form['#attached']['library'][] = 'views/views.exposed-form'; $form['#attached']['library'][] = 'views_ui/views_ui.admin'; $form['#attached']['library'][] = 'views_ui/admin.styling';