diff --git a/API.js b/API.js
index e5e36636c..dbfd9ae8e 100644
--- a/API.js
+++ b/API.js
@@ -6,7 +6,7 @@ var API = function(opts) {
API.prototype._init = function(opts) {
var self = this;
-
+
opts = opts || {};
self.opts = opts;
@@ -53,12 +53,12 @@ API.prototype._command = function(command, args, callback) {
if (typeof self["_cmd_" + command] == 'function') {
var f = API.prototype[command];
- if (f.argTypes[f.argTypes.length-1][1] == 'function')
+ if (f.argTypes[f.argTypes.length - 1][1] == 'function')
return self["_cmd_" + command].apply(self, args.concat([callback]));
else
return callback(null, self["_cmd_" + command].apply(self, args));
};
-
+
return callback(new Error('invalid command'));
};
@@ -66,9 +66,9 @@ API._checkArgTypes = function(command, args) {
var f = API.prototype[command];
if (f.argTypes.length != args.length) {
-
+
//if the function doesn't have a callback
- if (!(f.argTypes.length == args.length + 1 && f.argTypes[f.argTypes.length-1][1] == 'function'))
+ if (!(f.argTypes.length == args.length + 1 && f.argTypes[f.argTypes.length - 1][1] == 'function'))
return false;
}
@@ -98,7 +98,7 @@ API.prototype._cmd_echo = function(str, callback) {
API.prototype.echo = decorate('echo', [
['str', 'string'],
['callback', 'function']
- ]);
+]);
API.prototype._cmd_echoNumber = function(num, callback) {
var self = this;
@@ -109,7 +109,7 @@ API.prototype._cmd_echoNumber = function(num, callback) {
API.prototype.echoNumber = decorate('echoNumber', [
['num', 'number'],
['callback', 'function']
- ]);
+]);
API.prototype._cmd_echoObject = function(obj, callback) {
var self = this;
@@ -120,7 +120,7 @@ API.prototype._cmd_echoObject = function(obj, callback) {
API.prototype.echoObject = decorate('echoObject', [
['obj', 'object'],
['callback', 'function']
- ]);
+]);
/*
API.prototype.getBalance = function(callback) {
@@ -140,7 +140,7 @@ API.prototype._cmd_getArgTypes = function(command, callback) {
if (command[0] == '_' || typeof API.prototype[command] != 'function')
return callback(new Error('Invalid command'));
-
+
var argTypes = API.prototype[command].argTypes;
return callback(null, argTypes);
@@ -149,7 +149,7 @@ API.prototype._cmd_getArgTypes = function(command, callback) {
API.prototype.getArgTypes = decorate('getArgTypes', [
['command', 'string'],
['callback', 'function']
- ]);
+]);
API.prototype._cmd_getCommands = function(callback) {
var self = this;
@@ -167,7 +167,7 @@ API.prototype._cmd_getCommands = function(callback) {
API.prototype.getCommands = decorate('getCommands', [
['callback', 'function']
- ]);
+]);
API.prototype._cmd_getWallets = function(callback) {
var self = this;
@@ -177,7 +177,7 @@ API.prototype._cmd_getWallets = function(callback) {
API.prototype.getWallets = decorate('getWallets', [
['callback', 'function']
- ]);
+]);
API.prototype._cmd_help = function(callback) {
this._cmd_getCommands.apply(this, arguments);
@@ -185,6 +185,6 @@ API.prototype._cmd_help = function(callback) {
API.prototype.help = decorate('help', [
['callback', 'function']
- ]);
+]);
module.exports = require('soop')(API);
diff --git a/Gruntfile.js b/Gruntfile.js
index 3951d93c1..809a2cc95 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -15,7 +15,7 @@ module.exports = function(grunt) {
stderr: true
},
command: grunt.option('target') === 'dev' ?
- 'node ./util/build.js -d ' : 'node ./util/build.js '
+ 'node ./util/build.js -d ' : 'node ./util/build.js '
}
},
watch: {
@@ -46,6 +46,6 @@ module.exports = function(grunt) {
}
});
- grunt.registerTask('default', ['shell','watch']);
+ grunt.registerTask('default', ['shell', 'watch']);
};
diff --git a/app.js b/app.js
index 08351a4f5..2c514a2fa 100644
--- a/app.js
+++ b/app.js
@@ -1,6 +1,6 @@
var express = require('express');
-var http = require('http');
-var app = express();
+var http = require('http');
+var app = express();
app.start = function(port, callback) {
diff --git a/css/main.css b/css/main.css
index 3e6504ec0..5c748b33f 100644
--- a/css/main.css
+++ b/css/main.css
@@ -15,7 +15,7 @@ html, body {height: 100%;}
#main {
overflow:auto;
- padding-bottom: 91px;} /* must be same height as the footer */
+ padding-bottom: 80px;} /* must be same height as the footer */
.main-home {
padding-bottom: 28px !important;
@@ -37,9 +37,8 @@ html, body {height: 100%;}
#footer {
position: fixed;
- margin-top: -96px; /* negative value of footer height */
-
- height: 80px;
+ margin-top: -80px; /* negative value of footer height */
+ height: 70px;
clear:both;
padding: 5px 2rem;
bottom: 0;
@@ -65,7 +64,6 @@ html, body {height: 100%;}
.logo {
display: block;
height: 51px;
- margin: 0 auto;
}
.top-bar-section li:not(.has-form) a:not(.button) {
@@ -173,12 +171,6 @@ h3 {
border-right: 2px dashed #E3E3E3;
}
-@media (max-width: 640px) {
- .line-dashed-v {
- border: none;
- }
-}
-
.line-dashed-h {
margin: 1rem 0;
border-bottom: 2px dashed #E3E3E3;
@@ -238,28 +230,13 @@ input[type=number]::-webkit-outer-spin-button {
line-height: inherit;
}
-@media (max-width: 641px) {
- .hide_menu {
- display: none;
- }
- .show_menu {
- display: block;
- }
- .top-bar-section ul li {
- width: 100%;
- }
-}
-
-@media (max-width: 750px) {
- .top-bar-section ul li>a {
- font-size: 70%;
- }
-}
-
.new-address {
width: 220px;
}
+.transactions button, .transactions .button {
+ padding: 0.5rem 2rem;
+}
hr { margin: 2.25rem 0;}
@@ -406,10 +383,13 @@ hr { margin: 2.25rem 0;}
margin-right: 10px;
margin-bottom: 10px;
border: 3px solid #eee;
+ opacity: 0.3;
+ border-radius: 0.3rem;
}
.box-setup-copay-required {
- border: 3px solid green;
+ border: 3px solid #1ABC9C;
+ opacity: 1;
}
.tx-copayers {
@@ -655,52 +635,3 @@ ul.pagination li.current a:hover, ul.pagination li.current a:focus {
color:white;
}
-@media only screen and (max-width: 40em) {
-
- #main, .header-content {
- font-size: 80%;
- line-height: 140%;
- }
-
- .top-bar {
- background: #1ABC9C;
- }
-
- .header-content {
- padding: 0.3rem 0rem 1rem 0.4rem;
- }
-
- .logo {
- background-size: 90px 44px !important;
- float: left;
- margin-top: 0.7rem;
- width: 130px;
- }
-
- .header-content .small-9 {
- text-align: right !important;
- }
-
- .header-content .line-dashed-v {
- border: none !important;
- }
-
- .box-backup {
- margin: 0.6rem 0;
- }
-
- #footer {
- font-size: 80%;
- padding: 0.2rem 0.5rem;
- }
-
- .box-status {
- height: 71px;
- }
-
- .box-copayers figure {
- height: 71px;
- width: 71px;
- }
-
-}
diff --git a/css/mobile.css b/css/mobile.css
new file mode 100644
index 000000000..1662fa149
--- /dev/null
+++ b/css/mobile.css
@@ -0,0 +1,50 @@
+@media (max-width: 1024px) {
+ .logo {
+ background-size: 90px 44px !important;
+ height: 41px;
+ }
+
+ .header-content {
+ font-size: 70%;
+ line-height: 120%;
+ font-weight: normal;
+ }
+
+ .line-dashed-v {
+ border: none !important;
+ }
+
+ .top-bar-section ul li>a {
+ font-size: 70%;
+ }
+}
+
+@media (max-width: 640px) {
+ .hide_menu {
+ display: none;
+ }
+ .show_menu {
+ display: block;
+ }
+ .top-bar-section ul li {
+ width: 100%;
+ }
+ .top-bar-section ul li>a {
+ padding: 0 0 0 15px;
+ }
+
+ .top-bar {
+ background: #1ABC9C;
+ }
+
+ .header-content .small-7 {
+ text-align: right !important;
+ padding-top: 0;
+ }
+
+ .box-copayers figure {
+ height: 71px;
+ width: 71px;
+ }
+
+}
diff --git a/css/tpl-default.css b/css/tpl-default.css
index da429721c..ec67f171a 100644
--- a/css/tpl-default.css
+++ b/css/tpl-default.css
@@ -175,10 +175,6 @@ small.has-error {
border-radius: 10px;
}
-.transactions button, .transactions .button {
- padding: 0.5rem 2rem;
-}
-
button.radius, .button.radius {
-webkit-border-radius: 5px;
border-radius: 5px;
@@ -325,3 +321,28 @@ input.ng-invalid-wallet-secret {
background: #fff;
}
+.tooltip {
+ background: #16A085;
+ color: #fff;
+ font-weight: normal;
+ font-size: 12px;
+ padding: 3px 5px;
+ -webkit-border-radius: 3px;
+ -moz-border-radius: 3px;
+ border-radius: 3px;
+ border: 1px solid #16A085;
+}
+
+.tooltip>.nub {
+ border-color:transparent transparent #16A085 transparent;
+}
+.tooltip.tip-top>.nub {
+ border-color:#16A085 transparent transparent transparent;
+}
+.tooltip.tip-right>.nub {
+ border-color:transparent #16A085 transparent transparent;
+}
+.tooltip.tip-left>.nub {
+ border-color:transparent transparent transparent #16A085;
+}
+
diff --git a/index.html b/index.html
index f0dc4934b..60cdcfdb3 100644
--- a/index.html
+++ b/index.html
@@ -9,6 +9,7 @@
+
@@ -16,10 +17,10 @@
+