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

Merge branch 'frontend'

Browse source
This commit is contained in:
wildkif 2019-05-08 22:19:25 +03:00
commit 89b1025449
9 changed files with 11 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/gui/qt-daemon/html/assets/i18n/en.json
View file

@ -45,8 +45,7 @@
"ERROR": "System error",
"COMPLETE": "Completion",
"SYNCING": "Syncing blockchain",
"LOADING": "Loading blockchain data",
"TESTNET": ""
"LOADING": "Loading blockchain data"
}
},
"MAIN": {

7
src/gui/qt-daemon/html/assets/scss/layout/_sidebar.scss
View file

@ -202,13 +202,6 @@ app-sidebar {
background-color: themed(onlineColor);
}
}
.testnet {
@include themify($themes) {
color: themed(mainTextColor);
}
}
}
.progress-bar-container {

2
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/styles.js
View file

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

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

@ -54,22 +54,22 @@
<div class="sidebar-synchronization-status">
<div class="status-container">
<span class="offline" *ngIf="variablesService.daemon_state === 0">
{{ 'SIDEBAR.SYNCHRONIZATION.OFFLINE' | translate }} <span class="testnet">{{ 'SIDEBAR.SYNCHRONIZATION.TESTNET' | translate }}</span>
{{ 'SIDEBAR.SYNCHRONIZATION.OFFLINE' | translate }}
</span>
<span class="syncing" *ngIf="variablesService.daemon_state === 1">
{{ 'SIDEBAR.SYNCHRONIZATION.SYNCING' | translate }} <span class="testnet">{{ 'SIDEBAR.SYNCHRONIZATION.TESTNET' | translate }}</span>
{{ 'SIDEBAR.SYNCHRONIZATION.SYNCING' | translate }}
</span>
<span class="online" *ngIf="variablesService.daemon_state === 2">
{{ 'SIDEBAR.SYNCHRONIZATION.ONLINE' | translate }} <span class="testnet">{{ 'SIDEBAR.SYNCHRONIZATION.TESTNET' | translate }}</span>
{{ 'SIDEBAR.SYNCHRONIZATION.ONLINE' | translate }}
</span>
<span class="loading" *ngIf="variablesService.daemon_state === 3">
{{ 'SIDEBAR.SYNCHRONIZATION.LOADING' | translate }}
</span>
<span class="offline" *ngIf="variablesService.daemon_state === 4">
{{ 'SIDEBAR.SYNCHRONIZATION.ERROR' | translate }} <span class="testnet">{{ 'SIDEBAR.SYNCHRONIZATION.TESTNET' | translate }}</span>
{{ 'SIDEBAR.SYNCHRONIZATION.ERROR' | translate }}
</span>
<span class="online" *ngIf="variablesService.daemon_state === 5">
{{ 'SIDEBAR.SYNCHRONIZATION.COMPLETE' | translate }} <span class="testnet">{{ 'SIDEBAR.SYNCHRONIZATION.TESTNET' | translate }}</span>
{{ 'SIDEBAR.SYNCHRONIZATION.COMPLETE' | translate }}
</span>
</div>
<div class="progress-bar-container">

3
src/gui/qt-daemon/html_source/src/assets/i18n/en.json
View file

@ -45,8 +45,7 @@
"ERROR": "System error",
"COMPLETE": "Completion",
"SYNCING": "Syncing blockchain",
"LOADING": "Loading blockchain data",
"TESTNET": "(testnet)"
"LOADING": "Loading blockchain data"
}
},
"MAIN": {

7
src/gui/qt-daemon/html_source/src/assets/scss/layout/_sidebar.scss
View file

@ -202,13 +202,6 @@ app-sidebar {
background-color: themed(onlineColor);
}
}
.testnet {
@include themify($themes) {
color: themed(mainTextColor);
}
}
}
.progress-bar-container {