Skip to content

Commit 590b1d0

Browse files
committed
feat: Update login modal
1 parent cefbe87 commit 590b1d0

File tree

5 files changed

+12
-16
lines changed

5 files changed

+12
-16
lines changed

src/app/accounts/login.component.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<form id="login-page" #form (ngSubmit)="submit()" [appApiAction]="localFormPromise" attr.aria-hidden="{{showingModal}}">
2-
<div class="content CozyTheme--inverted">
2+
<div class="content">
33
<img class="logo-image" alt="Bitwarden">
44
<p class="lead">{{'loginOrCreateNewAccount' | i18n}}</p>
55
<div class="box last">
66
<div class="box-content">
7-
<svg *ngIf="!canAuthWithOIDC" width="96" height="64" class="u-mb-half"><path fill="#FFF" fill-rule="evenodd" d="M80 32c8.837 0 16 7.163 16 16s-7.163 16-16 16-16-7.163-16-16 7.163-16 16-16zm0 8c-2.206 0-4 1.794-4 4v2h-1c-.552 0-1 .456-1 .995v8.01c0 .55.456.995 1.002.995h9.996c.553 0 1.002-.456 1.002-.995v-8.01A.995.995 0 0085 46h-1v-2c0-2.206-1.795-4-4-4zm0 8.5c.826 0 1.5.672 1.5 1.5 0 .552-.305 1.032-.75 1.29v2.46a.751.751 0 01-1.5 0v-2.46A1.49 1.49 0 0178.5 50a1.5 1.5 0 011.5-1.5zM47.755 0c4.455 0 8.665 1.689 11.85 4.762 2.779 2.679 4.507 6.147 4.97 9.9 8.201.724 14.74 7.229 15.374 15.339L80 30c-9.941 0-18 8.059-18 18H32.946C23.6 48 16 40.507 16 31.297c0-4.393 1.716-8.542 4.833-11.681a16.942 16.942 0 0110.096-4.903c.452-3.772 2.185-7.26 4.975-9.95C39.09 1.689 43.298 0 47.754 0zM80 42c1.103 0 2 1.121 2 2.5V46h-4v-1.5c0-1.379.897-2.5 2-2.5zM55.386 28a1.132 1.132 0 00-1.113 1.154c.011.203.02.3.056.51.04.227.096.46.172.692-3.7 3.16-9.297 3.168-13.007.023.165-.49.233-.942.233-1.234a1.13 1.13 0 00-1.104-1.143 1.136 1.136 0 00-1.157 1.1c0 .11-.04.36-.135.618-.153.419-.41.771-.802 1.017a1.136 1.136 0 00-.333 1.597 1.127 1.127 0 001.538.323 4.21 4.21 0 00.505-.375C42.426 34.054 45.163 35 47.986 35c2.83 0 5.573-.95 7.764-2.73.16.141.332.27.517.387a1.134 1.134 0 001.307-1.848l-.101-.073-.077-.048a1.9 1.9 0 01-.546-.589 2.312 2.312 0 01-.316-1.003A1.128 1.128 0 0055.386 28z"></path></svg>
7+
<img *ngIf="!canAuthWithOIDC" width="96" height="64" class="u-mb-half" [src]="appIcon" />
88
<img *ngIf="canAuthWithOIDC" width="96" height="64" class="u-mb-half" [src]="appIconForOIDC" />
99
<h1>{{(canAuthWithOIDC ? 'authentification-oidc' : 'authentification') | i18n}}</h1>
1010
<p>{{'confirmYourIdentity' | i18n}}</p>

src/app/accounts/login.component.ts

+1
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ export class LoginComponent extends BaseLoginComponent implements OnDestroy {
5555
showingModal = false;
5656
isInCozyApp: boolean = false;
5757
baseUrl: string;
58+
appIcon = 'images/icon.svg';
5859
canAuthWithOIDC = false;
5960
appIconForOIDC = 'images/icons-login.svg';
6061
forceLoading = false;

src/scss/misc.scss

+2-6
Original file line numberDiff line numberDiff line change
@@ -436,11 +436,8 @@ img.icon-type {
436436
cursor:text;
437437
border: 1px solid;
438438
border-radius: 4px;
439-
border-color: #ffffffa3;
439+
border-color: $text-muted;
440440
position: relative;
441-
& ::selection {
442-
background: #b5d4ff;;
443-
}
444441

445442

446443
.error label {
@@ -449,7 +446,6 @@ img.icon-type {
449446

450447
label {
451448
font-size: 16px;
452-
color: #b5d4ff;
453449
}
454450

455451

@@ -478,7 +474,7 @@ img.icon-type {
478474
padding-right: 0;
479475
max-width: calc(100% - #{ $visible-label-left });
480476
transition: all 0.5s;
481-
background-color: #297EF2;
477+
background-color: white;
482478
}
483479

484480
&.eyed > .visible-label > label {

src/scss/pages.scss

+6-7
Original file line numberDiff line numberDiff line change
@@ -191,18 +191,18 @@
191191
padding: 40px;
192192
}
193193
.box-content {
194-
background-color: $brand-primary;
194+
background-color: white;
195195
padding: 48px 24px 24px 24px;
196196
font-size: 16px;
197-
color : white;
197+
color: $text-color;
198198
svg {
199199
margin-right: auto;
200200
margin-left: auto;
201201
display: block;
202202
}
203203
h1 {
204204
font-size: 24px;
205-
color : white;
205+
color : $text-color;
206206
margin-bottom: 0.35em;
207207
}
208208
.material-input{
@@ -211,10 +211,10 @@
211211
}
212212
input {
213213
background-color: unset;
214-
color : white;
214+
color : $text-color;
215215
}
216216
a {
217-
color:white;
217+
color:$text-color;
218218
margin-bottom: 40px;
219219
}
220220
a:hover {
@@ -230,9 +230,8 @@
230230
}
231231
}
232232
.box-content-row {
233-
background-color: unset !important;
234233
label {
235-
color:#b5d4ff;
234+
color:$text-muted;
236235
}
237236
}
238237

src/scss/variables.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ $font-family-monospace: Menlo, Monaco, Consolas, "Courier New", monospace;
55
$font-size-base: 16px;
66
$font-size-large: 18px;
77
$font-size-small: 12px;
8-
$text-color: #000000;
8+
$text-color: #424244;
99
$border-color: #f0f0f0;
1010
$border-color-dark: #ddd;
1111
$list-item-hover: #fbfbfb;

0 commit comments

Comments
 (0)