From 34cd7b7e6304d9758b2d339ef2d09af3dacc67c0 Mon Sep 17 00:00:00 2001 From: Jessica Lawshe <5312836+lawshe@users.noreply.github.com> Date: Wed, 13 Sep 2023 07:29:27 -0500 Subject: [PATCH] Merge pull request #14546 from overleaf/jel-sso-managed-disabled [web] Alert for group SSO settings when managed users is not enabled GitOrigin-RevId: 16a04b9a0d9df33c72b888eaa058c94e6c949555 --- .../web/frontend/extracted-translations.json | 1 + .../stylesheets/components/alerts.less | 18 ++++++++++++++++++ services/web/locales/en.json | 1 + 3 files changed, 20 insertions(+) diff --git a/services/web/frontend/extracted-translations.json b/services/web/frontend/extracted-translations.json index 73f9b80c5f..59a228d300 100644 --- a/services/web/frontend/extracted-translations.json +++ b/services/web/frontend/extracted-translations.json @@ -311,6 +311,7 @@ "emails_and_affiliations_explanation": "", "emails_and_affiliations_title": "", "enable_managed_users": "", + "enabled_managed_users_set_up_sso": "", "enabling": "", "end_of_document": "", "enter_image_url": "", diff --git a/services/web/frontend/stylesheets/components/alerts.less b/services/web/frontend/stylesheets/components/alerts.less index e84a12d6e4..8e6c045e3f 100755 --- a/services/web/frontend/stylesheets/components/alerts.less +++ b/services/web/frontend/stylesheets/components/alerts.less @@ -116,3 +116,21 @@ text-decoration: none; } } + +.design-system { + .alert { + display: flex; + flex-direction: row; + + .icon { + flex: 1 1 auto; + padding: 0 16px 0 4px; + } + } + .alert-info { + background-color: @blue-10; + border: 1px solid @blue-20; + border-radius: @border-radius-base-new; + color: @content-primary; + } +} diff --git a/services/web/locales/en.json b/services/web/locales/en.json index bed2f30f99..169d05cbe4 100644 --- a/services/web/locales/en.json +++ b/services/web/locales/en.json @@ -485,6 +485,7 @@ "empty_zip_file": "Zip doesn’t contain any file", "en": "English", "enable_managed_users": "Enable Managed Users", + "enabled_managed_users_set_up_sso": "You need to enable Managed Users to set up SSO.", "enabling": "Enabling", "end_of_document": "End of document", "enter_image_url": "Enter image URL",