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

Jump to bottom

[PM-7930] Add ability to pop out extension to user decryption options component #9037

Merged
merged 11 commits into from
Jun 16, 2024
Merged

[PM-7930] Add ability to pop out extension to user decryption options component #9037

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
14c98a2
Added app-pop-out to components
trmartin4 May 4, 2024
3760698
Removed debugging.
trmartin4 May 4, 2024
98a9b00
Merge branch 'main' into auth/pm-7930/add-pop-out-option-to-tde
JaredSnider-Bitwarden May 6, 2024
e445a09
Merge branch 'main' into auth/pm-7930/add-pop-out-option-to-tde
trmartin4 May 9, 2024
dbd115d
Merge branch 'main' into auth/pm-7930/add-pop-out-option-to-tde
trmartin4 May 9, 2024
9ebeb90
Merge branch 'main' into auth/pm-7930/add-pop-out-option-to-tde
bnagawiecki May 10, 2024
bd3906c
Merge branch 'auth/pm-7930/add-pop-out-option-to-tde' of https://gith…
trmartin4 May 14, 2024
c1dc88c
Merge branch 'main' into auth/pm-7930/add-pop-out-option-to-tde
trmartin4 May 18, 2024
ab20496
Merge branch 'main' into auth/pm-7930/add-pop-out-option-to-tde
bnagawiecki May 22, 2024
fe92441
Removed pop-out from login via auth request.
trmartin4 Jun 1, 2024
e48ba3e
Undid header changes.
trmartin4 Jun 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 7 additions & 4 deletions apps/browser/src/auth/popup/login-decryption-options/login-decryption-options.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
<div id="login-initiated">
<header>
<h1 class="margin-auto">
<app-header>
<div class="left">
<app-pop-out></app-pop-out>
</div>
<h1 class="center">
<span class="title">{{ "loginInitiated" | i18n }}</span>
</h1>
</header>

<div class="right"></div>
</app-header>
<div class="content login-page">
<div class="full-loading-spinner" *ngIf="loading">
<i class="bwi bwi-spinner bwi-spin bwi-3x" aria-hidden="true"></i>
Expand Down
10 changes: 7 additions & 3 deletions apps/browser/src/auth/popup/login-via-auth-request.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
<div class="login-with-device">
<header>
<h1 class="login-center">
<app-header>
<div class="left">
<app-pop-out></app-pop-out>
</div>
<h1 class="center">
<span class="title">{{ "logIn" | i18n }}</span>
</h1>
</header>
<div class="right"></div>
</app-header>
<div class="content login-page">
<ng-container *ngIf="state == StateEnum.StandardAuthRequest">
<div>
Expand Down