diff --git a/services/web/frontend/extracted-translations.json b/services/web/frontend/extracted-translations.json index b9edf91664..25d290dc61 100644 --- a/services/web/frontend/extracted-translations.json +++ b/services/web/frontend/extracted-translations.json @@ -7,6 +7,7 @@ "a_file_with_that_name_already_exists_and_will_be_overriden": "", "a_more_comprehensive_list_of_keyboard_shortcuts": "", "about_to_archive_projects": "", + "about_to_delete_cert": "", "about_to_delete_projects": "", "about_to_delete_tag": "", "about_to_delete_the_following_project": "", @@ -254,6 +255,7 @@ "delete_and_leave_projects": "", "delete_authentication_token": "", "delete_authentication_token_info": "", + "delete_certificate": "", "delete_figure": "", "delete_projects": "", "delete_row_or_column": "", diff --git a/services/web/frontend/stylesheets/modules/group-settings.less b/services/web/frontend/stylesheets/modules/group-settings.less index 7b0a3888ed..ce1a12ecc7 100644 --- a/services/web/frontend/stylesheets/modules/group-settings.less +++ b/services/web/frontend/stylesheets/modules/group-settings.less @@ -157,6 +157,10 @@ h3.group-settings-title { .sso-config-info-section { margin-bottom: @margin-md; padding: 0 @padding-base-horizontal; + + &:last-child { + margin-bottom: 0; + } } .sso-config-info-label { @@ -329,16 +333,30 @@ h3.group-settings-title { } .certificate-wrapper { - display: flex; - align-items: baseline; - - &.certificate-full { - flex-wrap: wrap; + .certificate-delete { + text-decoration: none; + margin-left: 16px; + span { + vertical-align: middle; + } } + .certificate-delete, + .view-more { + padding: 0; + } +} + +.certificate-truncated { + display: flex; + align-items: center; .view-more { flex-grow: 0; flex-shrink: 0; + margin-left: 16px; + } + .certificate-delete { + display: inline-flex; } } @@ -354,11 +372,7 @@ h3.group-settings-title { } .certificate-full & { word-break: break-all; - - .break { - flex-basis: 100%; - height: 0; - } + display: block; } } diff --git a/services/web/locales/en.json b/services/web/locales/en.json index c6e6e71fa0..4d98f492c2 100644 --- a/services/web/locales/en.json +++ b/services/web/locales/en.json @@ -18,6 +18,7 @@ "a_more_comprehensive_list_of_keyboard_shortcuts": "A more comprehensive list of keyboard shortcuts can be found in <0>this __appName__ project template", "about": "About", "about_to_archive_projects": "You are about to archive the following projects:", + "about_to_delete_cert": "You are about to delete the following certificate:", "about_to_delete_projects": "You are about to delete the following projects:", "about_to_delete_tag": "You are about to delete the following tag (any projects in them will not be deleted):", "about_to_delete_the_following_project": "You are about to delete the following project", @@ -376,6 +377,7 @@ "delete_and_leave_projects": "Delete and Leave Projects", "delete_authentication_token": "Delete Authentication token", "delete_authentication_token_info": "You’re about to delete a Git authentication token. If you do, it can no longer be used to authenticate your identity when performing Git operations.", + "delete_certificate": "Delete certificate", "delete_figure": "Delete figure", "delete_projects": "Delete Projects", "delete_row_or_column": "Delete row or column",