Skip to content

Commit d6aad17

Browse files
authored
Merge pull request #370 from divio/bugfix/tabular-selects
Fixed an issue with related widget wrappers and selects inside of tables
2 parents c194435 + 89a3e22 commit d6aad17

File tree

4 files changed

+13
-4
lines changed

4 files changed

+13
-4
lines changed

CHANGELOG.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ CHANGELOG
1414
* Fixed an issue with sortable tables
1515
* Fixed an issue with datetime fields
1616
* Fixed an issue with long names and smaller screens in change list
17+
* Fixed an issue with related widget wrappers and selects inside of tables
1718
* Added single js bundle vs many small javascript files
1819

1920
1.2.3 (2016-06-22)

djangocms_admin_style/sass/components/_forms.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,7 @@ form {
403403
border-color: $gray-lighter;
404404
}
405405
}
406-
.form-row {
406+
.form-row:not(tr) {
407407
padding: 0 2px 25px;
408408
border-bottom-color: $gray-lighter;
409409
&.errors {

djangocms_admin_style/sass/components/_tables.scss

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,8 +178,8 @@
178178
white-space: nowrap;
179179
select {
180180
max-width: 160px !important;
181-
// makes sure that select with related widget links fits in table row #360
182-
min-width: initial;
181+
min-width: 120px !important;
182+
width: auto !important;
183183
height: 36px;
184184
margin: 0;
185185
padding-right: 30px;
@@ -199,6 +199,13 @@
199199
}
200200
}
201201
}
202+
.related-widget-wrapper {
203+
select {
204+
float: none;
205+
vertical-align: top;
206+
width: auto !important;
207+
}
208+
}
202209
&.delete {
203210
a {
204211
float: left;
@@ -226,6 +233,7 @@
226233
.related-widget-wrapper {
227234
// make sure that form fields are not truncated on focus
228235
overflow: visible;
236+
float: none;
229237
}
230238
}
231239
tr {

djangocms_admin_style/static/djangocms_admin_style/css/djangocms-admin.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)