Charon/blockchain
1
0
Fork 0
forked from lthn/blockchain
Code Pull requests Activity

Merge branch 'release' into develop

Browse source
This commit is contained in:
sowle 2020-07-17 18:25:59 +03:00
commit cd5b3e1126
No known key found for this signature in database
GPG key ID: C07A24B2D89D49FC
5 changed files with 30 additions and 77 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/gui/qt-daemon/html/main.js
View file

File diff suppressed because one or more lines are too long

2
src/gui/qt-daemon/html/main.js.map
View file

File diff suppressed because one or more lines are too long

2
src/gui/qt-daemon/html_source/src/app/_shared/constants.ts
View file

@ -1,3 +1,3 @@
export const MIXIN: number = 10;
export const AUDITABLE_WALLET_HELP_PAGE: string = 'zano.org';
export const AUDITABLE_WALLET_HELP_PAGE: string = 'docs.zano.org/docs/auditable-wallets';
export const RCV_ADDR_QR_SCALE: number = 2;

17
src/gui/qt-daemon/html_source/src/app/sidebar/sidebar.component.html
View file

@ -5,19 +5,14 @@
<div class="sidebar-accounts-list scrolled-content">
<div class="sidebar-account" *ngFor="let wallet of variablesService.wallets" [class.active]="wallet?.wallet_id === walletActive" [routerLink]="['/wallet/' + wallet.wallet_id + '/history']">
<div class="wallet-type" (click)="goToAuditableWalletHelpPage($event)">
<div class="auditable" *ngIf="wallet.is_auditable && !wallet.is_watch_only">
<div class="content">Auditable</div>
<div class="content auditable" *ngIf="wallet.is_auditable && !wallet.is_watch_only">
Auditable
</div>
<div class="watch-only" *ngIf="!wallet.is_auditable && wallet.is_watch_only">
<div class="content">Watch-only</div>
<div class="content watch-only" *ngIf="!wallet.is_auditable && wallet.is_watch_only">
Watch-only
</div>
<div class="auditable-watch-only" *ngIf="wallet.is_auditable && wallet.is_watch_only">
<div>
<div class="content">Auditable</div>
</div>
<div>
<div class="content">Watch-only</div>
</div>
<div class="content auditable-watch-only" *ngIf="wallet.is_auditable && wallet.is_watch_only">
Auditable Watch-Only
</div>
</div>
<div class="close-wallet-wrapper">

80
src/gui/qt-daemon/html_source/src/app/sidebar/sidebar.component.scss
View file

@ -27,73 +27,31 @@
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 7px;
width: 7px;
height: 100%;
background-color: transparent;
transition: all ease .3s;
> div {
height: 100%;
width: 100%;
}
overflow: hidden;
&:hover {
height: auto;
.content {
opacity: 1;
}
.auditable {
background-color: transparent;
.content {
margin: 0 3rem;
background-color: #5cda9d;
}
}
.watch-only {
background-color: transparent;
.content {
margin: 0 3rem;
background-color: #8686ff;
}
}
.auditable-watch-only {
> div:first-child {
margin-right: 10px;
margin-left: 3rem;
}
> div:last-child {
margin-right: 3rem;
}
}
width: 28px;
}
.content {
padding: 5px;
height: 100%;
padding: 7px;
font-size: 12px;
text-align: center;
color: #000000;
line-height: 14px;
font-weight: 500;
color: #ffffff;
text-decoration: none;
text-transform: capitalize;
transition: all ease .3s;
opacity: 0;
}
.auditable {
background-color: #5cda9d;
}
.watch-only {
background-color: #8686ff;
}
.auditable-watch-only {
display: flex;
> div {
transition: all ease .3s;
width: 100%;
.content {
transition: none;
}
&:first-child {
background-color: #5cda9d;
}
&:last-child {
background-color: #8686ff;
}
writing-mode: vertical-rl;
text-orientation: mixed;
&.auditable {
background-color: #5cda9d;
}
&.watch-only, &.auditable-watch-only {
background-color: #8686ff;
}
}
}
@ -135,7 +93,7 @@
flex-direction: column;
flex-shrink: 0;
cursor: pointer;
padding: 2rem 3rem;
padding: 2.5rem 3rem;
.close-wallet-wrapper {
display: flex;
@ -144,8 +102,8 @@
button {
display: flex;
position: absolute;
top: 6px;
right: -20px;
top: -12px;
right: -18px;
padding: 0;
height: auto;
background: transparent;