dont use flex for password-wrapper positioning.

This commit is contained in:
Kyle Spearrin 2019-04-01 13:19:00 -04:00
parent f8ac02c24c
commit e895dd31c8
8 changed files with 10 additions and 18 deletions

2
jslib

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

View File

@ -50,8 +50,8 @@ 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 { InputVerbatimDirective } from 'jslib/angular/directives/input-verbatim.directive'; import { InputVerbatimDirective } from 'jslib/angular/directives/input-verbatim.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';
@ -169,7 +169,6 @@ registerLocaleData(localeZhTw, 'zh-TW');
EnvironmentComponent, EnvironmentComponent,
ExportComponent, ExportComponent,
FallbackSrcDirective, FallbackSrcDirective,
FlexCopyDirective,
FolderAddEditComponent, FolderAddEditComponent,
FoldersComponent, FoldersComponent,
GroupingsComponent, GroupingsComponent,
@ -189,6 +188,7 @@ registerLocaleData(localeZhTw, 'zh-TW');
PrivateModeComponent, PrivateModeComponent,
RegisterComponent, RegisterComponent,
SearchCiphersPipe, SearchCiphersPipe,
SelectCopyDirective,
SettingsComponent, SettingsComponent,
ShareComponent, ShareComponent,
StopClickDirective, StopClickDirective,

View File

@ -20,7 +20,7 @@
<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="row-main-content"> <div class="row-main-content">
<div class="text monospaced password-wrapper no-ellipsis" appFlexCopy <div class="monospaced password-wrapper" 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>

View File

@ -11,7 +11,7 @@
</div> </div>
</header> </header>
<content> <content>
<div class="password-block password-wrapper" [innerHTML]="password | colorPassword" appFlexCopy></div> <div class="password-block password-wrapper" [innerHTML]="password | colorPassword" appSelectCopy></div>
<div class="box list"> <div class="box list">
<div class="box-content single-line"> <div class="box-content single-line">
<a class="box-content-row text-primary" href="#" appStopClick appBlurClick <a class="box-content-row text-primary" href="#" appStopClick appBlurClick

View File

@ -225,6 +225,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-flex, .box-content-row-flex, &.box-content-row-checkbox,

View File

@ -146,12 +146,8 @@ p.lead {
} }
.password-wrapper { .password-wrapper {
display: flex !important; word-break: break-all;
flex-wrap: wrap; white-space: pre-wrap;
span {
white-space: pre;
}
} }
.password-number { .password-number {

View File

@ -12,11 +12,6 @@ app-password-generator .password-block {
font-size: $font-size-large; font-size: $font-size-large;
font-family: $font-family-monospace; font-family: $font-family-monospace;
text-align: center; text-align: center;
display: flex;
flex-wrap: wrap;
align-items: center;
justify-content: center;
text-align: center;
margin: 20px; margin: 20px;
} }

View File

@ -36,9 +36,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" appSelectCopy>
{{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">