diff --git a/django/contrib/admin/static/admin/css/responsive.css b/django/contrib/admin/static/admin/css/responsive.css index fbf0d88b40..9ef585b350 100644 --- a/django/contrib/admin/static/admin/css/responsive.css +++ b/django/contrib/admin/static/admin/css/responsive.css @@ -287,9 +287,6 @@ input[type="submit"], button { flex: 0 1 auto; } - .stacked select { - margin-bottom: 0; - } .stacked .selector-available, .stacked .selector-chosen { width: auto; diff --git a/django/contrib/admin/static/admin/css/widgets.css b/django/contrib/admin/static/admin/css/widgets.css index 43271f8c08..85cb9c48de 100644 --- a/django/contrib/admin/static/admin/css/widgets.css +++ b/django/contrib/admin/static/admin/css/widgets.css @@ -235,9 +235,9 @@ padding: 3px 3px 3px 5px; } -.stacked .selector-chooseall, .stacked .selector-clearall { - display: none; -} +/* .stacked .selector-chooseall, .stacked .selector-clearall { + display: block; +} */ .stacked .selector-add { background: url(../img/selector-icons.svg) 0 -48px no-repeat; diff --git a/tests/admin_widgets/tests.py b/tests/admin_widgets/tests.py index 7588c2cc32..a384920c44 100644 --- a/tests/admin_widgets/tests.py +++ b/tests/admin_widgets/tests.py @@ -1297,13 +1297,12 @@ class HorizontalVerticalFilterSeleniumTests(AdminWidgetSeleniumTestCase): remove_all_button = "#id_%s_remove_all" % field_name self.assertEqual(self.is_disabled(choose_button), choose_btn_disabled) self.assertEqual(self.is_disabled(remove_button), remove_btn_disabled) - if mode == "horizontal": - self.assertEqual( - self.is_disabled(choose_all_button), choose_all_btn_disabled - ) - self.assertEqual( - self.is_disabled(remove_all_button), remove_all_btn_disabled - ) + self.assertEqual( + self.is_disabled(choose_all_button), choose_all_btn_disabled + ) + self.assertEqual( + self.is_disabled(remove_all_button), remove_all_btn_disabled + ) def execute_basic_operations(self, mode, field_name): from selenium.webdriver.common.by import By @@ -1374,16 +1373,7 @@ class HorizontalVerticalFilterSeleniumTests(AdminWidgetSeleniumTestCase): ) # Click 'Remove all' -------------------------------------------------- - if mode == "horizontal": - self.selenium.find_element(By.ID, remove_all_button).click() - elif mode == "vertical": - # There 's no 'Remove all' button in vertical mode, so individually - # select all options and click 'Remove'. - for option in self.selenium.find_elements( - By.CSS_SELECTOR, to_box + " > option" - ): - option.click() - self.selenium.find_element(By.ID, remove_button).click() + self.selenium.find_element(By.ID, remove_all_button).click() self.assertSelectOptions( from_box, [