diff --git a/app/assets/javascripts/protocols/index.js b/app/assets/javascripts/protocols/index.js index 7b37c115b..15e8b13bf 100644 --- a/app/assets/javascripts/protocols/index.js +++ b/app/assets/javascripts/protocols/index.js @@ -689,7 +689,9 @@ var ProtocolsIndex = (function() { actionToolbar.find('.btn').addClass('notransition'); actionToolbar.find('.btn').removeClass('btn-primary').addClass('btn-light'); actionToolbar.find('.btn:visible').first().addClass('btn-primary').removeClass('btn-light'); - actionToolbar.find('.btn').removeClass('notransition'); + setTimeout(function() { + actionToolbar.find('.btn').removeClass('notransition'); + }, 500); actionToolbar.find('.emptyPlaceholder').toggleClass('hidden', actionToolbar.find('.btn:visible').length > 0); } diff --git a/app/assets/stylesheets/extend/datatable.scss b/app/assets/stylesheets/extend/datatable.scss index 48141d062..ca3c0392a 100644 --- a/app/assets/stylesheets/extend/datatable.scss +++ b/app/assets/stylesheets/extend/datatable.scss @@ -67,15 +67,6 @@ td { padding-left: 10px; - &:first-child { - display: flex; - justify-content: center; - } - - &:last-child { - display: table-cell; - } - .nowrap { white-space: nowrap; } diff --git a/app/assets/stylesheets/protocols/index.scss b/app/assets/stylesheets/protocols/index.scss index 15f949f58..4d1f4d11c 100644 --- a/app/assets/stylesheets/protocols/index.scss +++ b/app/assets/stylesheets/protocols/index.scss @@ -85,18 +85,10 @@ height: 100%; td { + padding: 8px; vertical-align: middle; white-space: nowrap; } - - - td:first-child { - padding: 16px 0; - } - - td:not(:first-child) { - padding: 8px; - } } // Cells diff --git a/config/locales/en.yml b/config/locales/en.yml index 96592ab7f..d764f4718 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -3203,7 +3203,7 @@ en: everyone_else: "Everyone else at %{team_name}" reset: "Inherit role" remove_access: "Remove access" - grant_access: "Grant new access" + grant_access: "Grant access" create: success: one: "You have successfully granted access to %{count} member to the project." @@ -3218,13 +3218,13 @@ en: new_resource_assignments: "Grant new access to %{resource}" new_assignments_form: title: "Select members" - submit: "Grant new access" + submit: "Grant access" submit_singular: "Grant access to 1 member" submit_plural: "Grant access to {num} members" find_people_html: "Find people" new_protocol_assignments_form: title: "Select members" - submit: "Grant new access" + submit: "Grant access" submit_singular: "Grant access to 1 member" submit_plural: "Grant access to {num} members" find_people_html: "Find people"