Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed #34383 -- Fixed layout of admin fieldsets with multiple fields on the same line. #16678

Merged
merged 1 commit into from
Mar 28, 2023

Conversation

knyghty
Copy link
Member

@knyghty knyghty commented Mar 23, 2023

No description provided.

@felixxm
Copy link
Member

felixxm commented Mar 23, 2023

We should probably also add the flex-container class to DIVs added in e678046:

image

@felixxm
Copy link
Member

felixxm commented Mar 23, 2023

I think we should remove flex from .aligned on really small screens

diff --git a/django/contrib/admin/static/admin/css/responsive.css b/django/contrib/admin/static/admin/css/responsive.css
index a75d1c5d66..058e196968 100644
--- a/django/contrib/admin/static/admin/css/responsive.css
+++ b/django/contrib/admin/static/admin/css/responsive.css
@@ -564,8 +564,6 @@ input[type="submit"], button {
 
     .aligned .form-row,
     .aligned .form-row > div {
-        display: flex;
-        flex-wrap: wrap;
         max-width: 100vw;
     }
 

to get ("Change user" view):
image

instead of:

image

@felixxm
Copy link
Member

felixxm commented Mar 23, 2023

@knyghty Thanks 👍 Great team work 🤝

@knyghty knyghty marked this pull request as ready for review March 23, 2023 15:58
@knyghty
Copy link
Member Author

knyghty commented Mar 23, 2023

@felixxm Fixed those, seems to work as I'd expect now... from what I've tested.

@felixxm felixxm self-assigned this Mar 23, 2023
@felixxm felixxm changed the title Fixed #34383 -- Fixed layout error in admin. Fixed #34383 -- Fixed layout of admin fieldsets with multiple fields on the same line. Mar 23, 2023
Copy link
Member

@felixxm felixxm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@knyghty Thanks 👍

I added one more minor fix, and pushed changes to tests.

@felixxm
Copy link
Member

felixxm commented Mar 23, 2023

@camarone Does it work for you?

…on the same line.

Thanks Antonio Candido Nazareth junior for the report.

Regression in 96a5983.

Co-authored-by: Mariusz Felisiak <felisiak.mariusz@gmail.com>
@felixxm
Copy link
Member

felixxm commented Mar 27, 2023

buildbot, test on selenium.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants