diff --git a/.gitignore b/.gitignore index c557e3302..af45d2c34 100644 --- a/.gitignore +++ b/.gitignore @@ -28,15 +28,6 @@ npm-debug.log .DS_Store public/lib/* -db/txs/* -db/txs -db/testnet/txs/* -db/testnet/txs -db/blocks/* -db/blocks -db/testnet/blocks/* -db/testnet/blocks - public/js/angularjs-all.js public/js/main.js public/js/vendors.js @@ -49,3 +40,4 @@ lib/* !lib/socket.io.js js/copayBundle.js +js/config.js diff --git a/css/main.css b/css/main.css index e92211b0c..bedc96ff4 100644 --- a/css/main.css +++ b/css/main.css @@ -58,7 +58,6 @@ body { .header { background: #111; color: white; - overflow: hidden; margin-bottom: 30px; } @@ -71,6 +70,10 @@ body { color: #fff; } +.top-bar { + height: auto; +} + .panel { color: #333; background: #FFFFFF; @@ -164,7 +167,7 @@ span.panel-res { color: #FBE500; } -.alert-box.warning { +.alert-box.warning, .alert-box.error { background-color: #C0392A; border-color: #C0392A; color: #fff; @@ -174,6 +177,14 @@ span.panel-res { color:#C0392A; } +small.is-valid { + color: #04B404; +} + +small.has-error { + color: #f04124; +} + hr { margin: 2.25rem 0;} button.primary { background-color: #111; } @@ -203,4 +214,4 @@ button.secondary:hover { background-color: #FFDF00 !important;} .p20h {padding: 0 20px;} .m30v {margin: 30px 0;} .m30a {margin: 30px auto;} -.br100 {border-radius: 100%;} \ No newline at end of file +.br100 {border-radius: 100%;} diff --git a/index.html b/index.html index 3fe435694..6e75ec4ad 100644 --- a/index.html +++ b/index.html @@ -45,11 +45,14 @@ -
{{o.address}}
- +{{o.value}} BTC
+ +{{o.address}}