Skip to content

Commit

Permalink
Merge pull request #370 from divio/bugfix/tabular-selects
Browse files Browse the repository at this point in the history
Fixed an issue with related widget wrappers and selects inside of tables
  • Loading branch information
vxsx authored Sep 7, 2016
2 parents c194435 + 89a3e22 commit d6aad17
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 4 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ CHANGELOG
* Fixed an issue with sortable tables
* Fixed an issue with datetime fields
* Fixed an issue with long names and smaller screens in change list
* Fixed an issue with related widget wrappers and selects inside of tables
* Added single js bundle vs many small javascript files

1.2.3 (2016-06-22)
Expand Down
2 changes: 1 addition & 1 deletion djangocms_admin_style/sass/components/_forms.scss
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,7 @@ form {
border-color: $gray-lighter;
}
}
.form-row {
.form-row:not(tr) {
padding: 0 2px 25px;
border-bottom-color: $gray-lighter;
&.errors {
Expand Down
12 changes: 10 additions & 2 deletions djangocms_admin_style/sass/components/_tables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -178,8 +178,8 @@
white-space: nowrap;
select {
max-width: 160px !important;
// makes sure that select with related widget links fits in table row #360
min-width: initial;
min-width: 120px !important;
width: auto !important;
height: 36px;
margin: 0;
padding-right: 30px;
Expand All @@ -199,6 +199,13 @@
}
}
}
.related-widget-wrapper {
select {
float: none;
vertical-align: top;
width: auto !important;
}
}
&.delete {
a {
float: left;
Expand Down Expand Up @@ -226,6 +233,7 @@
.related-widget-wrapper {
// make sure that form fields are not truncated on focus
overflow: visible;
float: none;
}
}
tr {
Expand Down

Large diffs are not rendered by default.

0 comments on commit d6aad17

Please sign in to comment.