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

Merge remote-tracking branch 'origin/frontend' into frontend

Browse source 
# Conflicts:
#	src/gui/qt-daemon/html/main.js
#	src/gui/qt-daemon/html/main.js.map
This commit is contained in:
wildkif 2019-05-07 12:09:01 +03:00
commit 636fc4f9b3
3 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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_source/src/app/staking/staking.component.scss
View file

@ -45,12 +45,14 @@
}
.chart {
position: relative;
display: flex;
align-items: center;
flex: 1 1 auto;
min-height: 40rem;
> div {
position: absolute;
width: 100%;
height: 100%;
}