diff --git a/app/assets/javascripts/label_templates/label_templates_datatable.js b/app/assets/javascripts/label_templates/label_templates_datatable.js index 12f25b366..d0aaf47c5 100644 --- a/app/assets/javascripts/label_templates/label_templates_datatable.js +++ b/app/assets/javascripts/label_templates/label_templates_datatable.js @@ -145,6 +145,7 @@ function updateButtons() { window.actionToolbarComponent.fetchActions({ label_template_ids: rowsSelectedIDs() }); + $('.dataTables_scrollBody').css('padding-bottom', `${rowsSelectedIDs().length > 0 ? 68 : 0}px`); } function reloadTable() { @@ -280,6 +281,7 @@ initDeleteModal(); initRefreshFluicsButton(); window.initActionToolbar(); + window.actionToolbarComponent.setBottomOffset(75); } }); } diff --git a/app/assets/javascripts/protocols/index.js b/app/assets/javascripts/protocols/index.js index 26cec3e74..f8d26c03d 100644 --- a/app/assets/javascripts/protocols/index.js +++ b/app/assets/javascripts/protocols/index.js @@ -30,7 +30,7 @@ var ProtocolsIndex = (function() { window.initActionToolbar(); window.actionToolbarComponent.setReloadCallback(reloadTable); // make room for pagination - window.actionToolbarComponent.setBottomOffset(75); + window.actionToolbarComponent.setBottomOffset(70); updateButtons(); initProtocolsTable(); initKeywordFiltering(); @@ -645,6 +645,7 @@ var ProtocolsIndex = (function() { function updateButtons() { window.actionToolbarComponent.fetchActions({ protocol_ids: rowsSelected.join(',') }); + $('.dataTables_scrollBody').css('padding-bottom', `${rowsSelected.length > 0 ? 68 : 0}px`); } function initLocalFileImport() { diff --git a/app/assets/javascripts/repositories/repository_datatable.js b/app/assets/javascripts/repositories/repository_datatable.js index bfc130a2e..c0b44e72f 100644 --- a/app/assets/javascripts/repositories/repository_datatable.js +++ b/app/assets/javascripts/repositories/repository_datatable.js @@ -54,6 +54,7 @@ var RepositoryDatatable = (function(global) { function updateButtons() { if (window.actionToolbarComponent) { window.actionToolbarComponent.fetchActions({ repository_row_ids: rowsSelected }); + $('.dataTables_scrollBody').css('padding-bottom', `${rowsSelected.length > 0 ? 68 : 0}px`); } if (currentMode === 'viewMode') { @@ -656,7 +657,7 @@ var RepositoryDatatable = (function(global) { }, fnInitComplete: function() { window.initActionToolbar(); - + window.actionToolbarComponent.setBottomOffset(70); initHeaderTooltip(); disableCheckboxToggleOnCheckboxPreview(); diff --git a/app/javascript/vue/label_template/container.vue b/app/javascript/vue/label_template/container.vue index 20a074411..5b3590799 100644 --- a/app/javascript/vue/label_template/container.vue +++ b/app/javascript/vue/label_template/container.vue @@ -1,14 +1,6 @@