Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-platform
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
edx-platform
Commits
ef9935d2
Commit
ef9935d2
authored
Jul 26, 2017
by
hamzamunir7300
Committed by
GitHub
Jul 26, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #15591 from edx/Learner-1254
Background color changed for microsoft button in social auth login
parents
9b15f580
3f9f0781
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
5 deletions
+11
-5
common/djangoapps/third_party_auth/settings.py
+6
-0
lms/static/sass/partials/base/_variables.scss
+1
-1
lms/static/sass/views/_login-register.scss
+4
-4
No files found.
common/djangoapps/third_party_auth/settings.py
View file @
ef9935d2
...
...
@@ -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
=
[
...
...
lms/static/sass/partials/base/_variables.scss
View file @
ef9935d2
...
...
@@ -201,7 +201,7 @@ $twitter-blue: #55ACEE;
$facebook-blue
:
#3B5998
;
$linkedin-blue
:
#0077B5
;
$google-red
:
#D73924
;
$microsoft-bl
ue
:
#00BCF2
;
$microsoft-bl
ack
:
#000000
;
// shadows
$shadow
:
rgba
(
0
,
0
,
0
,
0
.2
)
!
default
;
...
...
lms/static/sass/views/_login-register.scss
View file @
ef9935d2
...
...
@@ -520,16 +520,16 @@
}
&
.button-oa2-azuread-oauth2
{
color
:
darken
(
$microsoft-blue
,
20%
)
;
color
:
$microsoft-black
;
.icon
{
background
:
$microsoft-bl
ue
;
background
:
$microsoft-bl
ack
;
}
&
:hover
,
&
:focus
{
background-color
:
$microsoft-bl
ue
;
border
:
1px
solid
$microsoft-bl
ue
;
background-color
:
$microsoft-bl
ack
;
border
:
1px
solid
$microsoft-bl
ack
;
color
:
$white
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment