updates styles and add class if no actions

django-cms · Jan 5, 2016 · cd374b7 · cd374b7
1 parent ee08b4f
commit cd374b7
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/djangocms_admin_style/sass/components/_changelist.scss b/djangocms_admin_style/sass/components/_changelist.scss
@@ -126,11 +126,10 @@
         }
         #toolbar {
             overflow: hidden;
-            float: left;
             height: auto;
             min-height: 30px;
             padding-left: 0;
-            margin: 0 30px 5px 0 !important;
+            margin: 0 30px 10px 0 !important;
             border: 0 !important;
             background: none !important;
             form label {
@@ -148,6 +147,10 @@
                 vertical-align: middle;
                 box-sizing: border-box;
             }
+            &.actions-visible {
+                float: left;
+                margin-bottom: 5px !important;
+            }
         }
         #changelist-filter {
             // resets position to float filter next to changelist

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
diff --git a/djangocms_admin_style/static/js/base-admin.js b/djangocms_admin_style/static/js/base-admin.js
@@ -64,6 +64,10 @@
                 if ($.fn.touchSupport && $('.drag-handler').length) {
                     $(window).touchSupport();
                 }
+                // floats toolbar if actions are disabled #275, #285
+                if ($('#changelist-form').find('.actions').length) {
+                    $('#toolbar').addClass('actions-visible');
+                }
             });
         })(window.jQuery || window.django.jQuery);
     }