Merge 'release' into 'master' #2195

Merged
neb-b merged 17 commits from release-0.27.0 into master 2019-01-15 21:49:49 +01:00
2 changed files with 4 additions and 1 deletions
Showing only changes of commit ce5caea9a2 - Show all commits
src/renderer
component/walletBalance
scss/component

View file

@ -16,7 +16,9 @@ const WalletBalance = (props: Props) => {
</header>
<div className="card__content">
{(balance || balance === 0) && <CreditAmount large amount={balance} precision={8} />}
{(balance || balance === 0) && (
<CreditAmount badge={false} large amount={balance} precision={8} />
)}
</div>
</section>
);

View file

@ -38,6 +38,7 @@
}
.badge--large {
font-weight: 600;
font-size: 3.5rem;
line-height: 1;
}