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

View File

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

View File

@ -116,27 +116,6 @@
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 {
padding: 1rem 0.8rem;
}

View File

@ -2,7 +2,10 @@
angular.module('copayApp.controllers').controller('CopayersController',
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() {
controllerUtils.updateAddressList();

View File

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

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 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 ng-if="!$root.wallet.isReady()">
<h2>
<span translate>Waiting copayers for</span>
{{$root.wallet.getName()}}
<small>{{$root.wallet.requiredCopayers}}-{{'of'|translate}}-{{$root.wallet.totalCopayers}}</small>
<div ng-if="!$root.wallet.isReady()">
<div class="panel oh">
<h2 class="line-b">
Share this secret with your other copayers
<small>{{$root.wallet.requiredCopayers}}-of-{{$root.wallet.totalCopayers}}</small>
</h2>
<div class="panel oh">
<qrcode size="350" data="{{$root.wallet.getSecret()}}"></qrcode>
<div class="secret">
<h3 translate>Share this secret with your other copayers</h3>
{{$root.wallet.getSecret()}}
<span class="btn-copy" clip-copy="$root.wallet.getSecret()"></span>
</div>
<div class="text-center">
<qrcode size="250" data="{{$root.wallet.getSecret()}}"></qrcode>
</div>
<div class="secret m20t">
{{$root.wallet.getSecret()}}
<span class="btn-copy" clip-copy="$root.wallet.getSecret()"></span>
</div>
</div>
<div class="panel p20">
<div class="oh">
<div ng-include="'views/includes/copayer.html'"></div>
<div class="copay-box" ng-if="!$root.wallet.isReady()">
<span ng-include="'views/includes/photo.html'"></span>
<p class="size-12 text-white text-light m0">
<i class="fi-loop icon-rotate spinner"></i>
<span translate>Waiting...</span>
</p>
</div>
</div>
</div>
<div class="panel oh">
<div ng-include="'views/includes/copayer.html'"></div>
<div class="copay-box" ng-if="!$root.wallet.isReady()">
<span ng-include="'views/includes/photo.html'"></span>
<p class="size-12 text-white text-light m0">
<i class="fi-loop icon-rotate spinner"></i>
<span translate>Waiting...</span>
</p>
</div>
</div>
</div>
</div> <!-- end of row -->
</div>

View File

@ -4,7 +4,7 @@
<i class="size-60 fi-bitcoin-circle icon-rotate spinner"></i>
<span translate>Accessing your profile...</span>
</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">
<img src="img/logo-negative-beta.svg" alt="Copay" width="146" height="59">
<div ng-include="'views/includes/version.html'"></div>

View File

@ -1,19 +1,32 @@
<div class="home-wallet" ng-controller="HomeWalletController">
<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="panel">
<div class="row collapse">
<div class="large-1 small-2 columns">
<div class="avatar-wallet">{{$root.wallet.getName() | limitTo: 1}}</div>
</div>
<div class="large-9 small-5 columns">
<h2 class="ellipsis m10t">{{$root.wallet.getName()}}</h2>
</div>
<div class="large-2 small-5 columns text-right text-black" ng-if="$root.wallet && !$root.updatingBalance" data-options="disable_for_touch:true">
<b class="db m5b size-21">{{totalBalance || 0 |noFractionNumber}} {{$root.wallet.settings.unitName}}</b>
<span class="size-14 m5t text-gray">{{totalBalanceAlternative |noFractionNumber:2}} {{alternativeIsoCode}}</span>
<div class="row">
<div class="large-12 columns">
<div class="panel oh">
<div class="row">
<div class="large-8 medium-6 small-3 columns">
<div class="avatar-wallet left">{{$root.wallet.getName() | limitTo: 1}}</div>
<h2 class="ellipsis m10t left hide-for-small-only">{{$root.wallet.getName()}}</h2>
</div>
<div class="large-4 medium-6 small-9 columns">
<div class="text-right">
<span class="size-21">
<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>
@ -40,28 +53,15 @@
</div>
</div>
</div>
<!-- List of copayers -->
<div class="large-6 columns">
<div class="panel oh">
<h2 class="line-b" translate>Copayers</h2>
<div class="copay-box" ng-repeat="copayer in copayersList()">
<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 ng-include="'views/includes/copayer.html'"></div>
</div>
</div>
</div>
</div>
</div>

View File

@ -6,10 +6,11 @@
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>
<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>

View File

@ -1,5 +1,15 @@
<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>
@ -17,11 +27,6 @@
</ul>
</div>
<div class="right">
<a class="button tiny secondary radius oh" 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>
<a class="button tiny secondary radius m0" href="#!/manage" title="Manage wallets"><i class="fi-plus"></i> {{'Manage wallets' | translate }}</a>
</div>

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>