Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #15591 from edx/Learner-1254

Browse Source 
Background color changed for microsoft button in social auth login
This commit is contained in:
hamzamunir7300
2017-07-26 20:42:21 +05:00
committed by GitHub
parent 9b15f58037 3f9f078189
commit ef9935d2af
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
common/djangoapps/third_party_auth/settings.py
View File

@@ -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 = [

2
lms/static/sass/partials/base/_variables.scss
View File

@@ -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;

8
lms/static/sass/views/_login-register.scss
View File

@@ -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;
}
}