Upstream/bitwarden-desktop
1
0
Fork 0
mirror of https://github.com/bitwarden/desktop.git synced 2024-12-02 13:13:31 +01:00
Code Issues Projects Releases Wiki Activity

dont use flex for password-wrapper positioning

Browse Source
This commit is contained in:
Kyle Spearrin 2019-04-01 13:40:49 -04:00
parent 81c5b5577b
commit 9f842f6fbd
7 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jslib

@ -1 +1 @@
Subproject commit f39bdc4269c1105211ac901b7d2d51978375b222 Subproject commit 2ef1b7d65c02f7f204a0bb5a46c28aa093be274d

4
src/app/app.module.ts
View File

@ -35,7 +35,7 @@ import { AutofocusDirective } from 'jslib/angular/directives/autofocus.directive
import { BlurClickDirective } from 'jslib/angular/directives/blur-click.directive'; import { BlurClickDirective } from 'jslib/angular/directives/blur-click.directive';
import { BoxRowDirective } from 'jslib/angular/directives/box-row.directive'; import { BoxRowDirective } from 'jslib/angular/directives/box-row.directive';
import { FallbackSrcDirective } from 'jslib/angular/directives/fallback-src.directive'; import { FallbackSrcDirective } from 'jslib/angular/directives/fallback-src.directive';
import { FlexCopyDirective } from 'jslib/angular/directives/flex-copy.directive'; import { SelectCopyDirective } from 'jslib/angular/directives/select-copy.directive';
import { StopClickDirective } from 'jslib/angular/directives/stop-click.directive'; import { StopClickDirective } from 'jslib/angular/directives/stop-click.directive';
import { StopPropDirective } from 'jslib/angular/directives/stop-prop.directive'; import { StopPropDirective } from 'jslib/angular/directives/stop-prop.directive';
import { TrueFalseValueDirective } from 'jslib/angular/directives/true-false-value.directive'; import { TrueFalseValueDirective } from 'jslib/angular/directives/true-false-value.directive';
@ -155,7 +155,6 @@ registerLocaleData(localeZhTw, 'zh-TW');
EnvironmentComponent, EnvironmentComponent,
ExportComponent, ExportComponent,
FallbackSrcDirective, FallbackSrcDirective,
FlexCopyDirective,
FolderAddEditComponent, FolderAddEditComponent,
GroupingsComponent, GroupingsComponent,
HintComponent, HintComponent,
@ -170,6 +169,7 @@ registerLocaleData(localeZhTw, 'zh-TW');
PremiumComponent, PremiumComponent,
RegisterComponent, RegisterComponent,
SearchCiphersPipe, SearchCiphersPipe,
SelectCopyDirective,
SettingsComponent, SettingsComponent,
ShareComponent, ShareComponent,
StopClickDirective, StopClickDirective,

2
src/app/vault/password-generator-history.component.html
View File

@ -9,7 +9,7 @@
<div class="box-content condensed"> <div class="box-content condensed">
<div class="box-content-row box-content-row-flex" *ngFor="let h of history"> <div class="box-content-row box-content-row-flex" *ngFor="let h of history">
<div class="row-main"> <div class="row-main">
<div class="text password-wrapper monospaced" appFlexCopy <div class="password-wrapper monospaced" appSelectCopy
[innerHTML]="h.password | colorPassword"></div> [innerHTML]="h.password | colorPassword"></div>
<span class="detail">{{h.date | date:'medium'}}</span> <span class="detail">{{h.date | date:'medium'}}</span>
</div> </div>

4
src/app/vault/password-generator.component.html
View File

@ -2,7 +2,9 @@
<div class="modal-dialog modal-sm"> <div class="modal-dialog modal-sm">
<div class="modal-content"> <div class="modal-content">
<div class="modal-body"> <div class="modal-body">
<div class="password-block" [innerHTML]="password | colorPassword" appFlexCopy></div> <div class="password-block">
<div class="password-wrapper" [innerHTML]="password | colorPassword" appSelectCopy></div>
</div>
<div class="box"> <div class="box">
<div class="box-content condensed"> <div class="box-content condensed">
<a class="box-content-row" href="#" appStopClick appBlurClick (click)="regenerate()"> <a class="box-content-row" href="#" appStopClick appBlurClick (click)="regenerate()">

4
src/app/vault/view.component.html
View File

@ -26,9 +26,9 @@
<div class="box-content-row box-content-row-flex" *ngIf="cipher.login.password"> <div class="box-content-row box-content-row-flex" *ngIf="cipher.login.password">
<div class="row-main"> <div class="row-main">
<span class="row-label">{{'password' | i18n}}</span> <span class="row-label">{{'password' | i18n}}</span>
<div [hidden]="showPassword" class="monospaced password-wrapper" appFlexCopy> <div [hidden]="showPassword" class="monospaced">
{{cipher.login.maskedPassword}}</div> {{cipher.login.maskedPassword}}</div>
<div [hidden]="!showPassword" class="monospaced password-wrapper" appFlexCopy <div [hidden]="!showPassword" class="monospaced password-wrapper" appSelectCopy
[innerHTML]="cipher.login.password | colorPassword"></div> [innerHTML]="cipher.login.password | colorPassword"></div>
</div> </div>
<div class="action-buttons"> <div class="action-buttons">

1
src/scss/box.scss
View File

@ -153,6 +153,7 @@
.row-main { .row-main {
flex-grow: 1; flex-grow: 1;
min-width: 0;
} }
&.box-content-row-flex, .box-content-row-flex, &.box-content-row-checkbox, &.box-content-row-input, &.box-content-row-flex, .box-content-row-flex, &.box-content-row-checkbox, &.box-content-row-input,

9
src/scss/misc.scss
View File

@ -184,12 +184,9 @@ p.lead {
} }
.password-wrapper { .password-wrapper {
display: flex !important; word-break: break-all;
flex-wrap: wrap; white-space: pre-wrap;
min-width: 0;
span {
white-space: pre;
}
} }
.password-number { .password-number {