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

fix: Remove flex display for submit-row (as of Django 4.2) #507

Merged
merged 5 commits into from
Jan 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@
Changelog
=========

unreleased
==========

* Adjiust flex-container in newer Django versions (4.2+) for submit row and admin header

3.2.7 (2024-01-04)
==================

Expand All @@ -17,6 +22,7 @@ Changelog
* Fix broken color input (#429)
* Add Django as requirement in setup.py (#423)


3.2.5 (2023-08-22)
==================

Expand Down
17 changes: 17 additions & 0 deletions djangocms_admin_style/sass/components/_base.scss
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,24 @@ a.btn {
@include button-variant($btn-default-color, $btn-default-bgcolor, $btn-default-border, true);
}

.button.default, input[type=submit].default, .submit-row input.default {
float: right;
}

.submit-row {
display: block;
text-align: right;
input {
display: inline-block;
}
.deletelink-box, .deletelink {
display: inline-block;
float: left;
}
a.deletelink {
margin-left: 10px;
display: inline-block;
}
.btn {
padding: 10px 20px !important;
height: 36px !important;
Expand Down
1 change: 1 addition & 0 deletions djangocms_admin_style/sass/components/_forms.scss
Original file line number Diff line number Diff line change
Expand Up @@ -905,6 +905,7 @@ form select[multiple] {
.related-widget-wrapper {
// required in admin/aldryn_newsblog/article/add to ensure outline is not cut off #249
overflow: visible;
display: block;
width: 100%;
&.widget-wrapper-links-1 {
select, .select2 {
Expand Down
1 change: 1 addition & 0 deletions djangocms_admin_style/sass/components/_header.scss
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
box-shadow: $toolbar-shadow;
z-index: z(header);
#branding {
display: block;
width: 100%;
h1 {
// hides h1 because of text appears in list on dropdown menu
Expand Down

Large diffs are not rendered by default.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading