bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-17 08:43:33 +00:00
Code Issues Releases Wiki Activity

merge sso feature branch (#523)

Browse Source 
* Update jslib (101c568 -> 14b01f2) (#506)

* Update jslib (14b01f2 -> 1513b25) (#510)

* [jslib] Update (1513b25 -> 7c3a9d6) (#516)

* update jslib (1513b25 -> 7c3a9d6)

* Updated call to constructor super

* [SSO] Added SSO flows & functionality (#513)

* update jslib

* bump version

* Added sso button (wip)

* Added sso & change password // Added modules/routes // Added strings for localization

* Added password strength comp // reverted login route

* Updated sso component to send client id // added routing for sso // added crypto function to services module provider list

* Added deep linking

* First round of UI updates // Added sso browser launching // Added missing strings

* Updated UI and added missing strings

* Removed extra change password style

* Let constructor for WindowMain handle default width/height

* Prepared for jslib update

* Update jslib (1513b25 -> 7c3a9d6)

* Update login super

* Added params for launchSsoBrowser function

* Update jslib (7c3a9d6 -> 4203937)

* Added missing strings, removed unnecessary class param

* Upgrade TypeScript (#517)

* Updated password score // Update styles

* Removed password-strength component files

* Cleaned up module class // Fixed UL/LI formatting issues

* Use exisiting loading string // removed new string

* Update jslib (4203937 -> 9957125)

* Updated class to perform new submit actions

* Upgrade Angular (#520)

* di resolution for CryptoFunctionServiceAbstraction

* Update jslib (9957125 -> 5d874d0) (#521)

* Updated change password flow to match web

* Updated callout style

Co-authored-by: Kyle Spearrin <kyle.spearrin@gmail.com>
Co-authored-by: Oscar Hinton <hinton.oscar@gmail.com>

Co-authored-by: Vincent Salucci <26154748+vincentsalucci@users.noreply.github.com>
Co-authored-by: Oscar Hinton <hinton.oscar@gmail.com>
This commit is contained in:
Kyle Spearrin
2020-08-21 09:50:36 -04:00
committed by GitHub
parent 83901e1e7c
commit 0ba2589461
14 changed files with 382 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/scss/misc.scss
View File

@@ -391,4 +391,9 @@ app-root > #loading {
}
}
}
ul {
padding-left: 40px;
margin: 0;
}
}

62
src/scss/pages.scss
View File

@@ -1,6 +1,6 @@
@import "variables.scss";
#login-page, #lock-page {
#login-page, #lock-page, #sso-page, #set-password-page {
display: flex;
justify-content: center;
align-items: center;
@@ -123,6 +123,66 @@
}
}
#sso-page {
.content {
width: 300px;
.box {
margin-top: 30px;
margin-bottom: 30px;
text-align: center;
}
}
}
#set-password-page {
.content {
width: 500px;
p {
text-align: center
}
p.lead, h1 {
font-size: $font-size-large;
text-align: center;
margin-bottom: 20px;
font-weight: normal;
}
.buttons {
&:not(.with-rows), .buttons-row {
display: flex;
margin-bottom: 10px;
}
&:not(.with-rows), .buttons-row:last-child {
margin-bottom: 20px;
}
button {
margin-right: 10px;
&:last-child {
margin-right: 0;
}
}
}
.box {
margin-bottom: 15px;
&.last {
margin-bottom: 20px;
}
}
.box-content {
margin-bottom: 10px;
}
}
}
#register-page {
.content {
width: 400px;