anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

Fix style css for the from wallet & activate the from wallet in the send tab

Browse source
This commit is contained in:
Jean-Baptiste Dominguez 2018-08-09 12:49:35 +09:00
commit 647e126169
3 changed files with 32 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/js/controllers/tab-send.js
View file

@ -33,6 +33,9 @@ angular.module('copayApp.controllers').controller('tabSendController', function(
text = text.substring(0, 200); text = text.substring(0, 200);
} }
var stateParams = sendFlowService.getState();
$scope.fromWallet = profileService.getWallet(stateParams.fromWalletId);
$scope.clipboardHasAddress = false; $scope.clipboardHasAddress = false;
$scope.clipboardHasContent = false; $scope.clipboardHasContent = false;
if ((text.indexOf('bitcoincash:') === 0 || text[0] === 'C' || text[0] === 'H' || text[0] === 'p' || text[0] === 'q') && text.replace('bitcoincash:', '').length === 42) { // CashAddr if ((text.indexOf('bitcoincash:') === 0 || text[0] === 'C' || text[0] === 'H' || text[0] === 'p' || text[0] === 'q') && text.replace('bitcoincash:', '').length === 42) { // CashAddr

14
src/sass/views/tab-send.scss
View file

@ -2,15 +2,15 @@
@extend .deflash-blue; @extend .deflash-blue;
&-header{ &-header{
height: 300px; //height: 300px;
width: 100%; width: 100%;
} }
&-contacts { &-contacts {
height: calc(100vh - 300px - 50px - 44px); /* screen size - button container - bottom-tab-menu - header top */ //height: calc(100vh - 300px - 50px - 44px); /* screen size - button container - bottom-tab-menu - header top */
&.ios { &.ios {
height: calc(100vh - 300px - 50px - 44px - 18px); // Remove the notification-bar height on iOS //height: calc(100vh - 300px - 50px - 44px - 18px); // Remove the notification-bar height on iOS
} }
overflow: scroll; //overflow: scroll;
} }
.input { .input {
@ -223,12 +223,12 @@
} }
} }
#tab-send-header { #tab-send-header {
height: 270px; //height: 270px;
} }
#tab-send-contacts { #tab-send-contacts {
height: calc(100vh - 270px - 50px - 44px); /* screen size - button container - bottom-tab-menu - header top */ //height: calc(100vh - 270px - 50px - 44px); /* screen size - button container - bottom-tab-menu - header top */
&.ios { &.ios {
height: calc(100vh - 270px - 50px - 44px - 18px); // Remove the notification-bar height on iOS //height: calc(100vh - 270px - 50px - 44px - 18px); // Remove the notification-bar height on iOS
} }
} }
} }

64
www/css/main.css
View file

@ -11168,16 +11168,8 @@ qrcode {
background-color: #fab915 !important; } background-color: #fab915 !important; }
#tab-send-header { #tab-send-header {
height: 300px;
width: 100%; } width: 100%; }
#tab-send-contacts {
height: calc(100vh - 300px - 50px - 44px);
/* screen size - button container - bottom-tab-menu - header top */
overflow: scroll; }
#tab-send-contacts.ios {
height: calc(100vh - 300px - 50px - 44px - 18px); }
#tab-send .input { #tab-send .input {
width: 100%; } width: 100%; }
#tab-send .input input { #tab-send .input input {
@ -11358,14 +11350,7 @@ qrcode {
#tab-send .send-wrapper .buttons .button-qr { #tab-send .send-wrapper .buttons .button-qr {
height: 60px; } height: 60px; }
#tab-send .send-wrapper .buttons .button-qr span { #tab-send .send-wrapper .buttons .button-qr span {
font-size: 16px; } font-size: 16px; } }
#tab-send #tab-send-header {
height: 270px; }
#tab-send #tab-send-contacts {
height: calc(100vh - 270px - 50px - 44px);
/* screen size - button container - bottom-tab-menu - header top */ }
#tab-send #tab-send-contacts.ios {
height: calc(100vh - 270px - 50px - 44px - 18px); } }
#wallet-origin-destination .header--request { #wallet-origin-destination .header--request {
padding: 30px 24px; padding: 30px 24px;
@ -15374,8 +15359,6 @@ log-options #check-bar .checkbox-icon {
#view-review .fee-summary { #view-review .fee-summary {
position: absolute; position: absolute;
bottom: 92px; } bottom: 92px; }
#view-review .fee-summary-spacer {
height: 15px; }
#view-review .shapeshift-banner, #view-review .bitpay-banner, #view-review .egifter-banner { #view-review .shapeshift-banner, #view-review .bitpay-banner, #view-review .egifter-banner {
box-shadow: none; } box-shadow: none; }
#view-review .warning { #view-review .warning {
@ -15551,31 +15534,28 @@ ion-content.padded-bottom-cta-with-summary {
.fee-summary .amount .fee-crypto { .fee-summary .amount .fee-crypto {
color: #A7A7A7; } color: #A7A7A7; }
.amount .start, .formatted-amount {
.amount .middle,
.amount .end,
.amount .currency {
display: inline-block; } display: inline-block; }
.formatted-amount .start,
.amount .start { .formatted-amount .middle,
font-size: 1em; } .formatted-amount .end,
.formatted-amount .currency {
.amount .middle { display: inline-block; }
font-size: 0.7857em; .formatted-amount .start {
margin-left: 5px; } font-size: 1em; }
.formatted-amount .middle {
.amount .end { font-size: 0.7857em;
font-size: 0.7857em; margin-left: 5px; }
margin-left: 5px; } .formatted-amount .end {
font-size: 0.7857em;
.amount.size-equal .middle, margin-left: 5px; }
.amount.size-equal .end { .formatted-amount.size-equal .middle,
font-size: 1em; } .formatted-amount.size-equal .end {
font-size: 1em; }
.amount .currency { .formatted-amount .currency {
font-size: 1em; font-size: 1em;
margin-left: 5px; margin-left: 5px;
text-transform: uppercase; } text-transform: uppercase; }
/* This is for rules that don't yet have a home. /* This is for rules that don't yet have a home.
* Our goal is to delete this file. Search the regex: /class=".*CLASS.*?"/ * Our goal is to delete this file. Search the regex: /class=".*CLASS.*?"/