Merge remote-tracking branch 'origin/wallet/task/440' into wallet/task/514

# Conflicts:
#	i18n/po/template.pot
#	src/js/controllers/amount.js
#	www/css/main.css
This commit is contained in:
Sebastiaan Pasma 2018-08-02 15:12:40 +02:00
commit 391201471d
No known key found for this signature in database
GPG key ID: 9A2B0C8B95A1D26F
22 changed files with 702 additions and 47 deletions

View file

@ -0,0 +1,13 @@
#view-review {
background-color: #494949;
slide-to-accept, slide-to-accept-success {
margin-bottom: constant(safe-area-inset-bottom); /* iOS 11.0 */
margin-bottom: env(safe-area-inset-bottom); /* iOS 11.2 */
}
.fee-summary {
position: absolute;
bottom: 92px;
}
}

View file

@ -50,3 +50,4 @@
@import "includes/logOptions";
@import "includes/checkBar";
@import "cashScan";
@import "review";