diff --git a/css/main.css b/css/main.css index ed9589164..6cb25e0a3 100644 --- a/css/main.css +++ b/css/main.css @@ -149,6 +149,12 @@ h3 { border-right: 2px dashed #E3E3E3; } +@media (max-width: 1025px) { + .line-dashed-v { + border: none; + } +} + .line-dashed-h { margin: 1rem 0; border-bottom: 2px dashed #E3E3E3; @@ -224,6 +230,7 @@ hr { margin: 2.25rem 0;} .size-60 { font-size: 60px; } .size-72 { font-size: 72px; } .m10t {margin-top: 10px;} +.m10b {margin-bottom: 10px;} .m10r {margin-right: 10px;} .m10 {margin: 10px !important;} .m15 {margin: 15px !important;} @@ -301,6 +308,63 @@ hr { margin: 2.25rem 0;} padding: 2.7px; } +.box-setup { + padding: 20px 30px; + border: 1px solid #eee; + background: #fff; + overflow: hidden; + margin-bottom: 10px; +} + +.box-setup-copayers { + position: relative; + background: #ffffff; + border: 2px solid #eee; +} + +.box-setup-copayers:after, .box-setup-copayers:before { + bottom: 100%; + left: 50%; + border: solid transparent; + content: " "; + height: 0; + width: 0; + position: absolute; + pointer-events: none; +} + +.box-setup-copayers:after { + border-color: rgba(255, 255, 255, 0); + border-bottom-color: #ffffff; + border-width: 30px; + margin-left: -30px; +} + +.box-setup-copayers:before { + border-color: rgba(238, 238, 238, 0); + border-bottom-color: #eee; + border-width: 33px; + margin-left: -33px; +} + +.box-setup-copayers-fix { + overflow: hidden; + padding: 10px 10px 0 10px; +} + +.box-setup-copay { + width: 60px; + height: 60px; + float: left; + margin-right: 10px; + margin-bottom: 10px; + border: 3px solid #eee; +} + +.box-setup-copay-required { + border: 3px solid green; +} + .tx-copayers { background: #F8F8F8; -moz-box-shadow: inset 0px 0px 4px 0px rgba(0,0,0,0.05), inset 0px 1px 1px 0px rgba(0,0,0,0.05); diff --git a/index.html b/index.html index 5b0c9405a..142651e4f 100644 --- a/index.html +++ b/index.html @@ -207,36 +207,44 @@
-
-

Create new multisig wallet

-
+
+
Select total number of copayers
-
-
-
+
Select required number of signatures
-
-
Wallet name (optional)
-
- -
-
+
+
+
+
+
+ Copayer {{$index+1}}-{{totalCopayers}} +
+
+
+
+
+
+
Wallet name (optional)
+ +
+
+ +
+
-
- Go back -
+ Go back
diff --git a/js/controllers/setup.js b/js/controllers/setup.js index e867af9f0..adab10310 100644 --- a/js/controllers/setup.js +++ b/js/controllers/setup.js @@ -5,6 +5,11 @@ angular.module('copay.setup').controller('SetupController', $scope.loading = false; + // ng-repeat defined number of times instead of repeating over array? + $scope.getNumber = function(num) { + return new Array(num); + } + $scope.totalCopayers = config.wallet.totalCopayers; $scope.TCValues = []; for (var n = 1; n <= config.limits.totalCopayers; n++)