diff --git a/src/sass/icons.scss b/src/sass/icons.scss index 543ab49d2..fd352e9ca 100644 --- a/src/sass/icons.scss +++ b/src/sass/icons.scss @@ -14,6 +14,19 @@ padding-left: 74px; } + +.icon-svg { + display: flex; + justify-content: center; + align-items: center; + > img { + background-repeat:no-repeat; + background-clip: padding-box; + background-size: contain; + height: 18px; + } +} + .big-icon-svg { padding: 0 7px; > .bg { diff --git a/src/sass/ionic.scss b/src/sass/ionic.scss index c7c3e0f1c..4b1d5b6b1 100644 --- a/src/sass/ionic.scss +++ b/src/sass/ionic.scss @@ -27,3 +27,14 @@ ion-tabs.ion-tabs-transparent { } } } + +// .placeholder-icon padding cannot be modified by a variable +$placeholder-icon-padding: 10px; +.placeholder-icon { + &:first-child { + padding-right: $placeholder-icon-padding; + } + &:last-child { + padding-left: $placeholder-icon-padding; + } +} diff --git a/src/sass/views/tab-receive.scss b/src/sass/views/tab-receive.scss index 100d730e1..0192e213f 100644 --- a/src/sass/views/tab-receive.scss +++ b/src/sass/views/tab-receive.scss @@ -32,9 +32,6 @@ font-size: .8rem; i { font-size: 1.3rem; - &.ion-social-bitcoin-outline { - border-right: 1px solid rgb(228, 228, 228); - } } } .bit-address { @@ -111,6 +108,10 @@ margin-bottom:1rem; } } + .receive-tab-bitcoin-icon { + border-right: 1px solid rgb(228, 228, 228); + padding-right: 10px; + } } @keyframes fadeIn { diff --git a/www/img/icon-bitcoin-symbol.svg b/www/img/icon-bitcoin-symbol.svg new file mode 100644 index 000000000..39d4cc30b --- /dev/null +++ b/www/img/icon-bitcoin-symbol.svg @@ -0,0 +1,13 @@ + + + + + + diff --git a/www/views/modals/tx-details.html b/www/views/modals/tx-details.html index b5a118a29..f9221752b 100644 --- a/www/views/modals/tx-details.html +++ b/www/views/modals/tx-details.html @@ -56,7 +56,7 @@
- +
{{btx.merchant.domain}} diff --git a/www/views/modals/txp-details.html b/www/views/modals/txp-details.html index de3091d91..6fdbc6262 100644 --- a/www/views/modals/txp-details.html +++ b/www/views/modals/txp-details.html @@ -52,7 +52,7 @@
To - + Multiple recipients diff --git a/www/views/tab-receive.html b/www/views/tab-receive.html index d362be66d..b4fada7de 100644 --- a/www/views/tab-receive.html +++ b/www/views/tab-receive.html @@ -18,7 +18,7 @@
- + ...
@@ -39,7 +39,7 @@
- + address not yet available
@@ -76,7 +76,7 @@
- + ... {{addr}}
diff --git a/www/views/tab-send.html b/www/views/tab-send.html index 1ce95e42a..305e15838 100644 --- a/www/views/tab-send.html +++ b/www/views/tab-send.html @@ -6,7 +6,7 @@
Recipient