Merge pull request #284 from divio/bugfix/removes-sorted-m2m-max-height

shows full sortedm2m list content
django-cms · Jan 4, 2016 · e83f652 · e83f652
2 parents 42946e9 + c4301ce
commit e83f652
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -11,6 +11,7 @@ CHANGELOG
 * Fix sortedm2m label and link alignment on firefox
 # Fix sortedm2m list width on mobile
 # Align sortedm2m label if it breaks to new line
+# Remove sortedm2m vertical scrollbar and show full list content
 
 1.0.7 (2015-12-03)
 ------------------

diff --git a/djangocms_admin_style/sass/components/_content.scss b/djangocms_admin_style/sass/components/_content.scss
@@ -294,7 +294,9 @@ ul.messagelist + #content {
         width: 100%;
     }
     .sortedm2m {
-        min-height: inherit !important;
+        min-height: initial !important;
+        // shows full list content without vertical scrollbar #284
+        max-height: initial !important;
         padding: 10px 0 !important;
         border: 0 !important;
         li {

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