Merge branch 'master' into feature/update-notification

vxsx · vxsx · commit 3f42c144a88a · 2016-09-15T08:43:36.000+02:00
Conflicts:
	djangocms_admin_style/static/djangocms_admin_style/css/djangocms-admin.css
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -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)
diff --git a/djangocms_admin_style/sass/components/_forms.scss b/djangocms_admin_style/sass/components/_forms.scss
@@ -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 {
diff --git a/djangocms_admin_style/sass/components/_tables.scss b/djangocms_admin_style/sass/components/_tables.scss
@@ -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;
@@ -199,6 +199,13 @@
                 }
             }
         }
+        .related-widget-wrapper {
+            select {
+                float: none;
+                vertical-align: top;
+                width: auto !important;
+            }
+        }
         &.delete {
             a {
                 float: left;
@@ -226,6 +233,7 @@
         .related-widget-wrapper {
             // make sure that form fields are not truncated on focus
             overflow: visible;
+            float: none;
         }
     }
     tr {
@@ -366,3 +374,11 @@
         }
     }
 }
+
+.change-list table.navigator-table {
+    tbody {
+        td {
+            vertical-align: middle !important;
+        }
+    }
+}
diff --git a/djangocms_admin_style/static/djangocms_admin_style/css/djangocms-admin.css b/djangocms_admin_style/static/djangocms_admin_style/css/djangocms-admin.css

Original file line number	Diff line number	Diff line change
`@@ -403,7 +403,7 @@ form {`
`403`	`403`	`border-color: $gray-lighter;`
`404`	`404`	`}`
`405`	`405`	`}`
`406`		`- .form-row {`
	`406`	`+ .form-row:not(tr) {`
`407`	`407`	`padding: 0 2px 25px;`
`408`	`408`	`border-bottom-color: $gray-lighter;`
`409`	`409`	`&.errors {`
Original file line number	Diff line number	Diff line change
`@@ -178,8 +178,8 @@`
`178`	`178`	`white-space: nowrap;`
`179`	`179`	`select {`
`180`	`180`	`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;`
`183`	`183`	`height: 36px;`
`184`	`184`	`margin: 0;`
`185`	`185`	`padding-right: 30px;`
`@@ -199,6 +199,13 @@`
`199`	`199`	`}`
`200`	`200`	`}`
`201`	`201`	`}`
	`202`	`+ .related-widget-wrapper {`
	`203`	`+ select {`
	`204`	`+ float: none;`
	`205`	`+ vertical-align: top;`
	`206`	`+ width: auto !important;`
	`207`	`+ }`
	`208`	`+ }`
`202`	`209`	`&.delete {`
`203`	`210`	`a {`
`204`	`211`	`float: left;`
`@@ -226,6 +233,7 @@`
`226`	`233`	`.related-widget-wrapper {`
`227`	`234`	`// make sure that form fields are not truncated on focus`
`228`	`235`	`overflow: visible;`
	`236`	`+ float: none;`
`229`	`237`	`}`
`230`	`238`	`}`
`231`	`239`	`tr {`
`@@ -366,3 +374,11 @@`
`366`	`374`	`}`
`367`	`375`	`}`
`368`	`376`	`}`
	`377`	`+`
	`378`	`+.change-list table.navigator-table {`
	`379`	`+ tbody {`
	`380`	`+ td {`
	`381`	`+ vertical-align: middle !important;`
	`382`	`+ }`
	`383`	`+ }`
	`384`	`+}`