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

Fix activity title, input padding and show more link

Browse source
This commit is contained in:
Gustavo Maximiliano Cortez 2016-02-23 16:16:48 -03:00
commit 2675966760
2 changed files with 23 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

34
public/views/walletHome.html
View file

@ -159,13 +159,9 @@
</div> </div>
<div class="oh pr" ng-show="index.txHistory[0] || index.txProgress > 5"> <div class="oh pr" ng-show="index.txHistory[0] || index.txProgress > 5">
<ul class="no-bullet m0"> <h4 class="title" ng-click="index.startSearch(); search=''" ng-show="!index.isSearching" translate>Activity
<li ng-click="index.startSearch(); search=''" ng-show="!index.isSearching" > <i class="dib m5l size-16 pointer fi-magnifying-glass"></i>
<h4 class="title m0" translate>Activity </h4>
<i class="fi-magnifying-glass"></i>
</h4>
</li>
</ul>
<div ng-show="index.updatingTxHistory && index.txProgress > 5"> <div ng-show="index.updatingTxHistory && index.txProgress > 5">
<div class="row p20 text-center"> <div class="row p20 text-center">
@ -218,7 +214,7 @@
</div> </div>
</div> </div>
<div ng-repeat="btx in index.txHistorySearchResults track by btx.txid" <div ng-repeat="btx in index.txHistorySearchResults track by btx.txid"
ng-click="home.openTxModal(btx)" fast-click callback-fn="home.openTxModal(btx)"
class="row collapse last-transactions-content"> class="row collapse last-transactions-content">
<div class="large-6 medium-6 small-6 columns size-14"> <div class="large-6 medium-6 small-6 columns size-14">
<div class="m10r left"> <div class="m10r left">
@ -280,17 +276,17 @@
<div class="m20t text-center"> <div class="m20t text-center">
<a class="text-gray size-12" <a class="text-gray size-12"
ng-show="index.historyShowMore && !index.isSearching" ng-show="index.historyShowMore"
ng-click="index.showMore()" > ng-click="index.showMore()">
{{index.completeHistory.length - index.txHistory.length}}<span translate>more</span> <span translate>Show more</span>
<i class="icon-arrow-down4"></i> <span ng-if="!index.isSearching">
</a> ({{index.completeHistory.length - index.txHistory.length}})
<a class="text-gray size-12" </span>
ng-show="index.historyShowMore && index.isSearching" <span ng-if="index.isSearching">
ng-click="index.showMore()"> {{index.result.length - index.txHistorySearchResults.length}}
{{index.result.length - index.txHistorySearchResults.length}} <span translate>more</span> </span>
<i class="icon-arrow-down4"></i> <i class="icon-arrow-down4"></i>
</a> </a>
</div> </div>
</div> </div>

11
src/css/main.css
View file

@ -83,8 +83,10 @@ h4.title a {
margin:0; margin:0;
} }
.walletHome h4 { .walletHome h4.title {
padding: 15px 0px 5px 10px; padding: 0 0 10px 15px;
margin: 5px 0 5px 0;
font-size: 16px;
} }
@ -525,6 +527,7 @@ ul.manage li {
.m40b {margin-bottom: 40px;} .m40b {margin-bottom: 40px;}
.m50b {margin-bottom: 50px;} .m50b {margin-bottom: 50px;}
.m10r {margin-right: 10px;} .m10r {margin-right: 10px;}
.m5l {margin-left: 5px;}
.m15l {margin-left: 15px;} .m15l {margin-left: 15px;}
.m15t {margin-top: 15px;} .m15t {margin-top: 15px;}
.m20r {margin-right: 20px;} .m20r {margin-right: 20px;}
@ -804,10 +807,11 @@ table tbody tr:last-child td {
.searchBar input{ .searchBar input{
margin-bottom: auto; margin-bottom: auto;
border-bottom: 0px solid #E9EDF0; border-bottom: 0px solid #E9EDF0;
padding-left: 8px;
} }
.searchBar i{ .searchBar i{
position: absolute; position: absolute;
padding: 8px; padding: 8px 0 8px 8px;
} }
.searchBar .small-11{ .searchBar .small-11{
@ -825,6 +829,7 @@ table tbody tr:last-child td {
margin-bottom: 10px; margin-bottom: 10px;
background-color: rgba(0, 0, 0, 0.02); background-color: rgba(0, 0, 0, 0.02);
border-radius: 10px; border-radius: 10px;
position: relative;
} }
/*//////////////////////////// BUTTON OUTLINE ////////////////////////////*/ /*//////////////////////////// BUTTON OUTLINE ////////////////////////////*/