From fa2d40bdad0c19e8f0bf73a01a5e2182b821f0cf Mon Sep 17 00:00:00 2001 From: Gustavo Cortez Date: Wed, 30 Apr 2014 16:11:55 -0300 Subject: [PATCH 1/3] Initial page. Signin. --- css/main.css | 31 +++++++++++++++++-- index.html | 65 +++++++++++++++++----------------------- js/controllers/signin.js | 3 +- js/services/video.js | 2 +- 4 files changed, 59 insertions(+), 42 deletions(-) diff --git a/css/main.css b/css/main.css index 843c6bacc..1c7475cb9 100644 --- a/css/main.css +++ b/css/main.css @@ -13,10 +13,12 @@ html, body {height: 100%;} #wrap {min-height: 100%;} -#main {overflow:auto; +#main { + overflow:auto; padding-bottom: 91px;} /* must be same height as the footer */ -#footer {position: relative; +#footer { + position: relative; margin-top: -91px; /* negative value of footer height */ height: 91px; clear:both; @@ -27,6 +29,7 @@ html, body {height: 100%;} display: block; width: 130px; height: 51px; + margin: 0 auto; } @media (max-width: 640px) { @@ -189,6 +192,13 @@ span.panel-res { margin: 0.5rem 0 1rem; } +.line-dashed { + border-top: 2px dashed #ccc; + margin: 3rem 0; + padding: 1rem 0; +} + + small.is-valid { font-weight: bold; } @@ -332,3 +342,20 @@ hr { margin: 2.25rem 0;} background: #C0392B; } +.box-signin { + padding: 20px 40px; + border: 1px solid #eee; + background-color: #fff; + text-align: center; + margin-bottom: 20px; +} + +.box-signin h3 { + margin-bottom: 20px; +} + +.box-signin .button { + margin: 20px 0; + width: 200px; +} + diff --git a/index.html b/index.html index 1673917ab..5d99e22d8 100644 --- a/index.html +++ b/index.html @@ -14,7 +14,7 @@
-
+
@@ -135,58 +135,47 @@ Looking for peers...
-
-
-
-

Create a New Wallet

-
-
- + +
+
+
-
-
-
-
-
+
+
-
-
-
-
-
-

Join a Wallet in Creation

- -
-
- -
-
-
-
- - Import from file +
+ + Create a new wallet · + + Import from file
-
+
diff --git a/js/controllers/signin.js b/js/controllers/signin.js index f1e8b2fe4..6b472e143 100644 --- a/js/controllers/signin.js +++ b/js/controllers/signin.js @@ -6,8 +6,9 @@ angular.module('copay.signin').controller('SigninController', $scope.wallets = walletFactory.getWallets(); $scope.selectedWalletId = $scope.wallets.length ? $scope.wallets[0].id : null; - $scope.create = function() { + $scope.create = function(walletName) { $scope.loading = true; + $rootScope.walletName = walletName; $location.path('setup'); }; diff --git a/js/services/video.js b/js/services/video.js index 367296934..4f59a5e67 100644 --- a/js/services/video.js +++ b/js/services/video.js @@ -7,7 +7,7 @@ var Video = function() { this.mediaConnections = {}; this.localStream = null; - this.onlineSound = new Audio('../../sound/online.wav'); + this.onlineSound = new Audio('./sound/online.wav'); }; Video.prototype.setOwnPeer = function(peer, wallet, cb) { From bf90bdda9edbe526dcc8bae4180c64127d6eccd4 Mon Sep 17 00:00:00 2001 From: Gustavo Cortez Date: Wed, 30 Apr 2014 16:49:26 -0300 Subject: [PATCH 2/3] Cleaning code. --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index 28253fd7b..17f60421d 100644 --- a/index.html +++ b/index.html @@ -159,7 +159,7 @@

Create a new wallet

- +
From 2b16903515c15a94839e4a9490fcd6f37a302caf Mon Sep 17 00:00:00 2001 From: Gustavo Cortez Date: Thu, 1 May 2014 09:42:31 -0300 Subject: [PATCH 3/3] Fix position logo. --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index 16a2b19bd..2af1f9782 100644 --- a/index.html +++ b/index.html @@ -14,7 +14,7 @@
-
+