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

Merge pull request #3614 from cmgustavo/bug/ui-issues-01

Browse source 
Bug/ui issues 01
This commit is contained in:
Matias Alejo Garcia 2015-12-08 16:44:21 -03:00
commit 344e466b0b
5 changed files with 28 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

17
public/views/includes/menu-item.html
View file

@ -1,11 +1,14 @@
<a ng-click="index.setTab(item, false, 0, true)"
ng-style="{'color': index.tab == item.link ? index.backgroundColor : '#4B6178'}" id="menu-{{item.link}}">
<i class="size-18 {{item.icon}} db" ng-class="{ 'icon-activity': item.link=='walletHome' }"></i>
<div class="size-10 tu" ng-class="{ 'name-activity': item.link=='walletHome' }">
<a ng-click="index.setTab(item, false, 0, true)"
ng-style="{'color': index.tab == item.link ? index.backgroundColor : '#A5B2BF'}"
id="menu-{{item.link}}">
<i class="size-18 {{item.icon}} db"></i>
<span class="size-10 tu">
{{ item.title|translate }}
<span class="label activity round" ng-style="{'background-color':index.backgroundColor}" ng-if="item.link=='walletHome' && index.pendingTxProposalsCountForUs > 0">
<span class="label round"
ng-style="{'background-color':index.backgroundColor}"
ng-if="item.link=='walletHome' && index.pendingTxProposalsCountForUs > 0">
{{ index.pendingTxProposalsCountForUs }}
</span>
<span class="menu-activity hide-for-large-only" ng-if="item.link=='walletHome'">
</div>
</span>
<div ng-if="item.link == 'walletHome'" class="menu-wallet-home"></div>
</a>

10
public/views/walletHome.html
View file

@ -132,7 +132,7 @@
</div>
</div>
<div class="camera-icon" ng-show="index.isComplete">
<qr-scanner on-scan="home.onQrCodeScanned(data)" before-scan="home.openSendScreen()"></qr-scanner>
<qr-scanner on-scan="home.onQrCodeScanned(data)"></qr-scanner>
</div>
</div> <!-- oh -->
@ -381,7 +381,7 @@
</a>
</h4>
<div class="camera-icon" ng-show="index.isComplete">
<qr-scanner on-scan="home.onQrCodeScanned(data)" before-scan="home.openSendScreen()"></qr-scanner>
<qr-scanner on-scan="home.onQrCodeScanned(data)"></qr-scanner>
</div>
</div>
<div class="box-notification m20t" ng-show="home.error" ng-click="home.resetError()">
@ -414,10 +414,10 @@
<div class="addressbook-input" ng-show="!sendForm.address.$invalid && _address">
{{index.addressbook[_address] || _address}}
</div>
<a class="postfix button"
ng-style="{'background-color':index.backgroundColor}"
<a class="postfix size-12 m0 text-gray"
ng-style="{'color':index.backgroundColor}"
ng-click="home.openDestinationAddressModal(index.otherWallets, _address)">
<i class="fi-plus size-14 lh"></i>
<i class="icon-wallet text-bold size-18"></i>
</a>
</div>
</div>

1
src/css/main.css
View file

@ -1052,6 +1052,7 @@ input.ng-invalid-match, input.ng-invalid-match:focus {
.text-success {color: #1ABC9C;}
.text-spacing {letter-spacing:2px;}
.text-capitalize {text-transform: capitalize;}
.text-shadow {text-shadow: 2px 2px 3px rgba(150, 150, 150, 1);}
.payment-uri .panel {
line-height: 1.4;

33
src/css/mobile.css
View file

@ -172,8 +172,8 @@ _:-ms-fullscreen, :root .main {
padding-top: 1rem !important;
}
.menu-activity {
background-image: linear-gradient(-180deg, #F1F3F5 0%, #FFFFFF 30%);
.menu-wallet-home {
background: #fff linear-gradient(-180deg, #F1F3F5 0%, #FFFFFF 30%);
box-shadow: 0px -1px 0px 0px rgba(165,178,191,0.35);
width: 100%;
height: 8rem;
@ -187,26 +187,6 @@ _:-ms-fullscreen, :root .main {
z-index: -999;
}
.icon-activity {
font-size: 30px;
position: absolute;
display: block;
left: 0;
right: 0;
top: -4px;
}
.name-activity {
margin-top: 18px;
}
.label.activity {
position: absolute;
top: 11px;
font-size: 9px;
padding: 0.15rem 0.25rem;
}
.amount {
width: 100%;
text-align: center;
@ -274,6 +254,7 @@ _:-ms-fullscreen, :root .main {
top: inherit;
right: 15px;
bottom: 45px;
line-height: 12px;
}
.send .camera-icon a {
@ -298,6 +279,14 @@ ul.copayer-list img {
display: block;
}
.bottombar-item a.active span, .bottombar-item a.active i {
font-weight: bold;
}
.bottombar-item a.active .label {
text-shadow: none;
}
.box-founds {
background-color: #213140;
}

5
src/js/controllers/walletHome.js
View file

@ -97,13 +97,10 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
};
this.onQrCodeScanned = function(data) {
if (data) go.send();
$rootScope.$emit('dataScanned', data);
};
this.openSendScreen = function() {
go.send();
};
rateService.whenAvailable(function() {
self.isRateAvailable = true;
$rootScope.$digest();