Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SSO Login Support #2491

Merged
merged 11 commits into from
Jun 21, 2018
Merged

SSO Login Support #2491

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
37f134d
v2 sso work
andrewghobrial Jun 19, 2018
f8add79
Merge remote-tracking branch 'parent/v2-master' into v2-master
andrewghobrial Jun 19, 2018
17588e4
OAuth SSO front-end and back-end for v2
andrewghobrial Jun 20, 2018
03050a8
Merge remote-tracking branch 'parent/v2-master' into v2-master
andrewghobrial Jun 20, 2018
74ca1f3
remove IDE settings
andrewghobrial Jun 20, 2018
5f93541
remove accidentally committed files
andrewghobrial Jun 20, 2018
1793d8e
Merge pull request #2479 from andrewghobrial/v2-master
nwmac Jun 21, 2018
2c1ff6a
Fix code climate scss issue
nwmac Jun 21, 2018
53e5f47
Merge remote-tracking branch 'origin/v2-master' into sso-login
nwmac Jun 21, 2018
ca22dc1
Fix merge issue and remove unreachable return statement
nwmac Jun 21, 2018
bfc2394
Fix lint issue
nwmac Jun 21, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix code climate scss issue
  • Loading branch information
@nwmac
nwmac committed Jun 21, 2018
commit 2c1ff6af1ee351ff42563cf3649fa566b7a01e8d
6 changes: 3 additions & 3 deletions src/frontend/app/features/login/login-page/login-page.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
height: 180px;
opacity: 1;
transition: height $time $cubic 100ms, opacity $time * 2 $cubic $time + 50ms;
&.login-sso {
height: auto;
}
&.login-sso {
height: auto;
}
}
&__loading {
display: none;
Expand Down