Merge branch 'master' into feature/update-notification

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

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)

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 {

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;
+        }
+    }
+}