1
0
mirror of https://github.com/bitwarden/browser.git synced 2024-09-27 04:03:00 +02:00

implement callout component w/ generator policy (#395)

This commit is contained in:
Kyle Spearrin 2020-02-28 16:58:51 -05:00 committed by GitHub
parent e90405a453
commit ee167571a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 96 additions and 1 deletions

2
jslib

@ -1 +1 @@
Subproject commit 6c529422048c95645304ceb14250c8efce938f34
Subproject commit e93c534ec4f724eaa8b494f516b187bea67b132c

View File

@ -27,6 +27,7 @@ import { SettingsComponent } from './accounts/settings.component';
import { TwoFactorOptionsComponent } from './accounts/two-factor-options.component';
import { TwoFactorComponent } from './accounts/two-factor.component';
import { CalloutComponent } from 'jslib/angular/components/callout.component';
import { IconComponent } from 'jslib/angular/components/icon.component';
import { ModalComponent } from 'jslib/angular/components/modal.component';
@ -151,6 +152,7 @@ registerLocaleData(localeZhTw, 'zh-TW');
AutofocusDirective,
BlurClickDirective,
BoxRowDirective,
CalloutComponent,
CiphersComponent,
CollectionsComponent,
ColorPasswordPipe,

View File

@ -2,6 +2,9 @@
<div class="modal-dialog modal-sm" role="document">
<div class="modal-content">
<div class="modal-body">
<app-callout type="info" *ngIf="policyInEffect">
{{'passwordGeneratorPolicyInEffect' | i18n}}
</app-callout>
<div class="password-block">
<div class="password-wrapper" [innerHTML]="password | colorPassword" appSelectCopy></div>
</div>

View File

@ -1276,5 +1276,8 @@
},
"clone": {
"message": "Clone"
},
"passwordGeneratorPolicyInEffect": {
"message": "One or more organization policies are affecting your generator settings."
}
}

View File

@ -290,3 +290,84 @@ app-root > #loading {
.draggable {
cursor: move;
}
.callout {
padding: 10px;
margin-bottom: 10px;
border: 1px solid #000000;
border-left-width: 5px;
border-radius: 3px;
@include themify($themes) {
border-color: themed('calloutBorderColor');
background-color: themed('calloutBackgroundColor');
}
.callout-heading {
margin-top: 0;
}
h3.callout-heading {
font-weight: bold;
text-transform: uppercase;
}
&.callout-primary {
@include themify($themes) {
border-left-color: themed('primaryColor');
}
.callout-heading {
@include themify($themes) {
color: themed('primaryColor');
}
}
}
&.callout-info {
@include themify($themes) {
border-left-color: themed('infoColor');
}
.callout-heading {
@include themify($themes) {
color: themed('infoColor');
}
}
}
&.callout-danger {
@include themify($themes) {
border-left-color: themed('dangerColor');
}
.callout-heading {
@include themify($themes) {
color: themed('dangerColor');
}
}
}
&.callout-success {
@include themify($themes) {
border-left-color: themed('successColor');
}
.callout-heading {
@include themify($themes) {
color: themed('successColor');
}
}
}
&.callout-warning {
@include themify($themes) {
border-left-color: themed('warningColor');
}
.callout-heading {
@include themify($themes) {
color: themed('warningColor');
}
}
}
}

View File

@ -86,6 +86,8 @@ $themes: (
logoSuffix: 'dark',
passwordNumberColor: #007fde,
passwordSpecialColor: #c40800,
calloutBorderColor: $border-color-dark,
calloutBackgroundColor: $background-color,
),
dark: (
textColor: #ffffff,
@ -134,6 +136,8 @@ $themes: (
logoSuffix: 'white',
passwordNumberColor: #52bdfb,
passwordSpecialColor: #ff7c70,
calloutBorderColor: #2f2f2f,
calloutBackgroundColor: #363636,
),
nord: (
textColor: $nord5,
@ -182,6 +186,8 @@ $themes: (
logoSuffix: 'white',
passwordNumberColor: $nord8,
passwordSpecialColor: $nord12,
calloutBorderColor: $nord1,
calloutBackgroundColor: $nord2,
),
);