diff --git a/common/djangoapps/third_party_auth/settings.py b/common/djangoapps/third_party_auth/settings.py index 917f398e7d..89bc544d4f 100644 --- a/common/djangoapps/third_party_auth/settings.py +++ b/common/djangoapps/third_party_auth/settings.py @@ -15,6 +15,9 @@ _MIDDLEWARE_CLASSES = ( 'third_party_auth.middleware.ExceptionMiddleware', ) _SOCIAL_AUTH_LOGIN_REDIRECT_URL = '/dashboard' +_SOCIAL_AUTH_AZUREAD_OAUTH2_AUTH_EXTRA_ARGUMENTS = { + 'msafed': 0 +} def apply_settings(django_settings): @@ -35,6 +38,9 @@ def apply_settings(django_settings): # Where to send the user once social authentication is successful. django_settings.SOCIAL_AUTH_LOGIN_REDIRECT_URL = _SOCIAL_AUTH_LOGIN_REDIRECT_URL + # Adding extra key value pair in the url query string for microsoft as per request + django_settings.SOCIAL_AUTH_AZUREAD_OAUTH2_AUTH_EXTRA_ARGUMENTS = _SOCIAL_AUTH_AZUREAD_OAUTH2_AUTH_EXTRA_ARGUMENTS + # Inject our customized auth pipeline. All auth backends must work with # this pipeline. django_settings.SOCIAL_AUTH_PIPELINE = [ diff --git a/lms/static/sass/partials/base/_variables.scss b/lms/static/sass/partials/base/_variables.scss index 27bfac453d..6ff97cec34 100644 --- a/lms/static/sass/partials/base/_variables.scss +++ b/lms/static/sass/partials/base/_variables.scss @@ -201,7 +201,7 @@ $twitter-blue: #55ACEE; $facebook-blue: #3B5998; $linkedin-blue: #0077B5; $google-red: #D73924; -$microsoft-blue: #00BCF2; +$microsoft-black: #000000; // shadows $shadow: rgba(0,0,0,0.2) !default; diff --git a/lms/static/sass/views/_login-register.scss b/lms/static/sass/views/_login-register.scss index af0128dd62..0872ccd786 100644 --- a/lms/static/sass/views/_login-register.scss +++ b/lms/static/sass/views/_login-register.scss @@ -520,16 +520,16 @@ } &.button-oa2-azuread-oauth2 { - color: darken($microsoft-blue, 20%); + color: $microsoft-black; .icon { - background: $microsoft-blue; + background: $microsoft-black; } &:hover, &:focus { - background-color: $microsoft-blue; - border: 1px solid $microsoft-blue; + background-color: $microsoft-black; + border: 1px solid $microsoft-black; color: $white; } }