BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed layout for small devices. remove unused function and css classes.

This commit is contained in:
Gustavo Maximiliano Cortez 2014-11-03 14:10:59 -03:00
parent 40a13ecef8
commit 885765b873
10 changed files with 92 additions and 166 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
css/src/main.css
View File

@ -144,9 +144,12 @@ header .alt-currency {
right: 0; right: 0;
} }
.head .title h1 { .head .title {
float: left; float: left;
padding-left: 2rem; padding-left: 2rem;
}
.head .title h1 {
margin: 0; margin: 0;
} }
@ -349,7 +352,7 @@ a:hover {
.main { .main {
margin-left: 250px; margin-left: 250px;
padding: 100px 2rem; padding: 100px 1rem;
background-color: #F8F8FB; background-color: #F8F8FB;
} }
@ -655,11 +658,7 @@ input[type=number]::-webkit-outer-spin-button {
} }
.spinner { .spinner {
display:inline-block; display: inline-block;
width: 1em;
text-align:center;
line-height:1em;
vertical-align:middle;
} }
.highlight{ .highlight{
@ -1134,6 +1133,7 @@ button.gray:focus,
border-radius: 100%; border-radius: 100%;
vertical-align: middle; vertical-align: middle;
overflow: hidden; overflow: hidden;
text-align: center;
} }
a:hover .photo-container { a:hover .photo-container {
@ -1205,19 +1205,10 @@ a:hover .photo-container {
cursor: pointer; cursor: pointer;
} }
.copay-box-small {
width: 45px;
text-align: center;
margin-right: 10px;
padding-bottom: 5px;
float: left;
}
.copay-box { .copay-box {
width: 70px; width: 70px;
text-align: center; text-align: center;
margin-right: 20px; margin-right: 20px;
padding-bottom: 5px;
float: left; float: left;
} }
@ -1264,26 +1255,6 @@ input.ng-invalid-match, input.ng-invalid-match:focus {
border-color: red; border-color: red;
} }
.copayers h3, .copayers h4, .waiting-copayers h4 {
color: #fff;
font-weight: 100;
}
.copayers {
width: 100%;
background-color: #213140;
/* position: absolute; */
/* bottom: 0; */
/* left: 0; */
padding: 20px;
border-top: 1px solid #475065;
/* overflow-y: hidden; */
}
.copayers i {
opacity: 0.6;
}
.black { .black {
background-color: #2C3E50; background-color: #2C3E50;
} }
@ -1321,6 +1292,11 @@ a.text-warning:hover {color: #FD7262;}
margin-top: 15%; margin-top: 15%;
} }
.loading-screen .spinner {
vertical-align: middle;
margin-right: 15px;
}
.box-setup .panel { .box-setup .panel {
background-color: #2C3E50; background-color: #2C3E50;
padding: 1rem; padding: 1rem;
@ -1363,24 +1339,18 @@ a.text-warning:hover {color: #FD7262;}
} }
.panel qrcode { .panel qrcode {
float: left;
width: 160px;
height: 160px;
padding: 5px 0 0 5px;
background-color: white; background-color: white;
} }
.panel qrcode canvas { .panel qrcode canvas {
width: 150px; width: 250px;
height: 150px; height: 250px;
} }
.panel .secret { .panel .secret {
float: left;
margin-left: 2rem;
overflow-wrap: break-word; overflow-wrap: break-word;
word-wrap: break-word; word-wrap: break-word;
text-align: left; text-align: center;
} }
.panel { .panel {

21
css/src/mobile.css
View File

@ -116,27 +116,6 @@
color: white; color: white;
} }
.panel .secret {
padding-top: 0.5rem;
display: block;
width: 100%;
margin-left: 0;
text-align: center;
}
.panel qrcode {
display: block;
float: none;
margin: 0 auto;
width: 160px;
height: 160px;
}
.panel qrcode canvas {
width: 150px;
height: 150px;
}
.addresses .panel { .addresses .panel {
padding: 1rem 0.8rem; padding: 1rem 0.8rem;
} }

5
js/controllers/copayers.js
View File

@ -2,7 +2,10 @@
angular.module('copayApp.controllers').controller('CopayersController', angular.module('copayApp.controllers').controller('CopayersController',
function($scope, $rootScope, $location, controllerUtils) { function($scope, $rootScope, $location, controllerUtils) {
$rootScope.title = 'Copayers'; if (!$rootScope.wallet.isReady()) {
$rootScope.title = 'Waiting copayers for ' + $rootScope.wallet.getName();
}
$scope.loading = false;
$scope.goToWallet = function() { $scope.goToWallet = function() {
controllerUtils.updateAddressList(); controllerUtils.updateAddressList();

8
js/controllers/homeWallet.js
View File

@ -6,17 +6,9 @@ angular.module('copayApp.controllers').controller('HomeWalletController',
$rootScope.title = 'Home'; $rootScope.title = 'Home';
if ($rootScope.addrInfos) { if ($rootScope.addrInfos) {
$scope.address = $rootScope.addrInfos[0]; $scope.address = $rootScope.addrInfos[0];
} }
$scope.copayersList = function() {
if ($rootScope.wallet) {
$scope.copayers = $rootScope.wallet.getRegisteredPeerIds();
}
return $scope.copayers;
}
} }
); );

52
views/copayers.html
View File

@ -1,35 +1,37 @@
<div class="waiting-copayers" ng-controller="CopayersController"> <div ng-controller="CopayersController">
<div ng-if='$root.wallet && $root.wallet.isReady()' ng-init="goToWallet()"></div> <div ng-if='$root.wallet && $root.wallet.isReady()' ng-init="goToWallet()"></div>
<div class="row collapse"> <h1 translate class="hide-for-large-up">
Waiting copayers for {{$root.wallet.getName()}}
<small>{{$root.wallet.requiredCopayers}}-of-{{$root.wallet.totalCopayers}}</small>
</h1>
<div class="row">
<div class="large-12 columns"> <div class="large-12 columns">
<div ng-if="!$root.wallet.isReady()"> <div ng-if="!$root.wallet.isReady()">
<h2> <div class="panel oh">
<span translate>Waiting copayers for</span> <h2 class="line-b">
{{$root.wallet.getName()}} Share this secret with your other copayers
<small>{{$root.wallet.requiredCopayers}}-{{'of'|translate}}-{{$root.wallet.totalCopayers}}</small> <small>{{$root.wallet.requiredCopayers}}-of-{{$root.wallet.totalCopayers}}</small>
</h2> </h2>
<div class="panel oh"> <div class="text-center">
<qrcode size="350" data="{{$root.wallet.getSecret()}}"></qrcode> <qrcode size="250" data="{{$root.wallet.getSecret()}}"></qrcode>
<div class="secret"> </div>
<h3 translate>Share this secret with your other copayers</h3> <div class="secret m20t">
{{$root.wallet.getSecret()}} {{$root.wallet.getSecret()}}
<span class="btn-copy" clip-copy="$root.wallet.getSecret()"></span> <span class="btn-copy" clip-copy="$root.wallet.getSecret()"></span>
</div>
</div> </div>
</div> </div>
<div class="panel p20"> </div>
<div class="oh"> <div class="panel oh">
<div ng-include="'views/includes/copayer.html'"></div> <div ng-include="'views/includes/copayer.html'"></div>
<div class="copay-box" ng-if="!$root.wallet.isReady()"> <div class="copay-box" ng-if="!$root.wallet.isReady()">
<span ng-include="'views/includes/photo.html'"></span> <span ng-include="'views/includes/photo.html'"></span>
<p class="size-12 text-white text-light m0"> <p class="size-12 text-white text-light m0">
<i class="fi-loop icon-rotate spinner"></i> <i class="fi-loop icon-rotate spinner"></i>
<span translate>Waiting...</span> <span translate>Waiting...</span>
</p> </p>
</div>
</div>
</div> </div>
</div>
</div> </div>
</div> <!-- end of row --> </div> <!-- end of row -->
</div> </div>

2
views/home.html
View File

@ -4,7 +4,7 @@
<i class="size-60 fi-bitcoin-circle icon-rotate spinner"></i> <i class="size-60 fi-bitcoin-circle icon-rotate spinner"></i>
<span translate>Accessing your profile...</span> <span translate>Accessing your profile...</span>
</div> </div>
<div class="large-4 large-centered medium-6 medium-centered columns" ng-show="!loading && !retreiving"> <div class="large-4 large-centered medium-6 medium-centered columns" ng-if="!loading && !retreiving">
<div class="logo-setup"> <div class="logo-setup">
<img src="img/logo-negative-beta.svg" alt="Copay" width="146" height="59"> <img src="img/logo-negative-beta.svg" alt="Copay" width="146" height="59">
<div ng-include="'views/includes/version.html'"></div> <div ng-include="'views/includes/version.html'"></div>

56
views/homeWallet.html
View File

@ -1,19 +1,32 @@
<div class="home-wallet" ng-controller="HomeWalletController"> <div class="home-wallet" ng-controller="HomeWalletController">
<div ng-show='$root.wallet.isReady()'> <div ng-show='$root.wallet.isReady()'>
<h1 translate class="hide-for-large-up">Home</h1> <h1 translate class="hide-for-large-up">Home</h1>
<!-- Wallet name and balance --> <div class="row">
<div class="panel"> <div class="large-12 columns">
<div class="row collapse"> <div class="panel oh">
<div class="large-1 small-2 columns"> <div class="row">
<div class="avatar-wallet">{{$root.wallet.getName() | limitTo: 1}}</div> <div class="large-8 medium-6 small-3 columns">
</div> <div class="avatar-wallet left">{{$root.wallet.getName() | limitTo: 1}}</div>
<div class="large-9 small-5 columns"> <h2 class="ellipsis m10t left hide-for-small-only">{{$root.wallet.getName()}}</h2>
<h2 class="ellipsis m10t">{{$root.wallet.getName()}}</h2> </div>
</div> <div class="large-4 medium-6 small-9 columns">
<div class="large-2 small-5 columns text-right text-black" ng-if="$root.wallet && !$root.updatingBalance" data-options="disable_for_touch:true"> <div class="text-right">
<b class="db m5b size-21">{{totalBalance || 0 |noFractionNumber}} {{$root.wallet.settings.unitName}}</b> <span class="size-21">
<span class="size-14 m5t text-gray">{{totalBalanceAlternative |noFractionNumber:2}} {{alternativeIsoCode}}</span> <strong>
<span ng-if="!$root.updatingBalance">{{totalBalance || 0 |noFractionNumber}}</span>
<span ng-if="$root.updatingBalance"><i class="fi-bitcoin-circle icon-rotate spinner"></i></span>
{{$root.wallet.settings.unitName}}
</strong>
</span>
<span class="size-14 db m5t text-gray">
<span ng-if="!$root.updatingBalance">{{totalBalanceAlternative |noFractionNumber:2}}</span>
<span ng-if="$root.updatingBalance"><i class="fi-bitcoin-circle icon-rotate spinner"></i></span>
{{alternativeIsoCode}}
</span>
</div>
</div>
</div>
</div> </div>
</div> </div>
</div> </div>
@ -40,28 +53,15 @@
</div> </div>
</div> </div>
</div> </div>
<!-- List of copayers --> <!-- List of copayers -->
<div class="large-6 columns"> <div class="large-6 columns">
<div class="panel oh"> <div class="panel oh">
<h2 class="line-b" translate>Copayers</h2> <h2 class="line-b" translate>Copayers</h2>
<div class="copay-box" ng-repeat="copayer in copayersList()"> <div ng-include="'views/includes/copayer.html'"></div>
<span ng-include="'views/includes/photo.html'"></span>
<div
class="ellipsis"
tooltip="ID: {{copayer.peerId}}"
tooltip-placement="bottom">
<small class="text-gray" ng-show="copayer.index == 0">
<i class="fi-check m5r"></i>{{'Me'|translate}}</small>
<small class="text-gray" ng-show="copayer.index > 0"><i class="fi-check m5r"></i>{{copayer.nick}}</small>
</div>
<div translate class="success label m10t" ng-show="isBackupReady(copayer)">Ready</div>
</div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>

9
views/includes/copayer.html
View File

@ -6,10 +6,11 @@
tooltip="ID: {{copayer.peerId}}" tooltip="ID: {{copayer.peerId}}"
tooltip-placement="bottom"> tooltip-placement="bottom">
<small class="text-gray" ng-show="copayer.index == 0"> <small class="text-gray" ng-show="copayer.index == 0">
<i class="fi-check m5r"></i>{{'Me'|translate}}</small> <i class="fi-check m5r"></i> {{'Me'|translate}}
<small class="text-gray" ng-show="copayer.index > 0"><i class="fi-check m5r"></i>{{copayer.nick}}</small> </small>
<small class="text-gray" ng-show="copayer.index > 0">
<i class="fi-check m5r"></i> {{copayer.nick}}
</small>
</div> </div>
<div translate class="success label m10t" ng-show="isBackupReady(copayer)">Ready</div>
</div> </div>
</div> </div>

19
views/includes/head.html
View File

@ -1,5 +1,15 @@
<div class="title"> <div class="title">
<h1>{{$root.title}}</h1> <h1>
{{$root.title}}
<small>
<a class="text-gray" ng-click="refresh()" ng-if="!$root.updatingBalance">
<i class="fi-refresh"></i>
</a>
<span ng-if="$root.updatingBalance">
<i class="fi-bitcoin-circle icon-rotate spinner"></i>
</span>
</small>
</h1>
</div> </div>
@ -17,11 +27,6 @@
</ul> </ul>
</div> </div>
<div class="right"> <div class="right">
<a class="button tiny secondary radius oh" href="#!/manage" title="Manage wallets"><i class="fi-plus"></i> {{'Manage wallets' | translate }}</a> <a class="button tiny secondary radius m0" href="#!/manage" title="Manage wallets"><i class="fi-plus"></i> {{'Manage wallets' | translate }}</a>
</div>
<div class="right m20r m5t">
<a ng-click="refresh()" class="size-18 text-gray">
<i class="fi-refresh right"></i>
</a>
</div> </div>

26
views/includes/peer-list.html
View File

@ -1,26 +0,0 @@
<div ng-controller="CopayersController"
class="copayers"
ng-mouseenter="showCopayers=1"
ng-mouseleave="showCopayers=0">
<h3>
<i class="fi-torsos-all size-21 m20r"></i>
<span translate>Copayers</span>
<small class="m15l">
{{$root.wallet.requiredCopayers}} <span translate>of</span> {{$root.wallet.totalCopayers}}
</small>
</h3>
<div class="copay-box-small" ng-repeat="copayer in copayersList()"
ng-show="showCopayers">
<img
class="br100 online"
src="./img/satoshi.gif"
alt="{{copayer.peerId}}"
width="30">
<div tooltip-placement="top" tooltip="{{copayer.nick}}">
<small class="text-gray db" ng-show="copayer.index == 0">{{'Me'|translate}}</small>
<small class="text-gray ellipsis" ng-show="copayer.index > 0">{{copayer.nick}}</small>
</div>
</div>
</div>