Merge branch 'code_reorg'

4 files changed, 7 insertions, 181 deletions

diff --git a/public/css/calculator.css b/public/css/calculator.css
deleted file mode 100644
index d2211ff9..00000000
--- a/public/css/calculator.css
+++ /dev/null
@@ -1,104 +0,0 @@
-@import "bootstrap.min.css";
-@import "bootstrap-responsive.min.css";
-@import "jquery-ui.min.css";
-@import "jquery-ui.theme.min.css";
-body {
-  text-align: center;
-}
-body {
-  line-height: 100%;
-}
-h1 {
-  margin-top: 0;
-}
-div.container-fluid {
-  max-width: 480px;
-  margin-left: auto;
-  margin-right: auto;
-  text-align: left;
-  padding-bottom: 50px;
-}
-.navbar-toggle {
-  background-color: #428bca;
-  width: 100%;
-  position: absolute;
-  top: 0px;
-  height: 30px;
-  margin: 0;
-  float: none;
-  z-index: 1;
-}
-.navbar-toggle .glyphicon {
-  margin-top: -5px;
-}
-.navbar {
-  margin: 0;
-}
-.navbar-collapse.in {
-  overflow-y: visible;
-}
-.nav {
-  margin-top: 30px;
-}
-.nav li a {
-  padding: 10px 0 10px 10px;
-}
-.form-group label {
-  font-weight: normal;
-  font-size: 14px;
-  display: block;
-}
-.form-group p,
-.form-group span,
-.form-group .form-control {
-  font-size: 18px;
-}
-.form-group span,
-.form-group label {
-  color: #999;
-}
-.form-group .form-control {
-  height: auto;
-  padding: 3px;
-  display: inline-block;
-}
-div#calculator #exchange,
-div#calculator #amount {
-  width: 5em;
-}
-div#calculator span.btn {
-  font-size: 1.4em;
-  width: 80%;
-}
-div#calculator strong#total {
-  font-size: 30px;
-}
-div#calculator p#address {
-  padding-top: 10px;
-}
-div#calculator #title {
-  display: none;
-}
-div#calculator #logo {
-  display: none;
-  padding: 10px 0;
-  margin-bottom: 10px;
-  max-height: 250px;
-}
-div#calculator #error {
-  margin-top: 10px;
-}
-td#total {
-  font-weight: bold;
-  text-align: right;
-}
-#main-logo {
-  background-image: url('../img/coinos_logo.png');
-  width: 300px;
-  height: 80px;
-  margin-top: 10px;
-}
-.svg #main-logo {
-  background-image: url('../img/coinos_logo.svg') !important;
-  background-size: 300px 80px;
-}
diff --git a/public/css/calculator.less b/public/css/calculator.less
index f48f2dba..61349041 100644
--- a/public/css/calculator.less
+++ b/public/css/calculator.less
@@ -1,10 +1,8 @@
-@import "bootstrap.min.css";
-@import "bootstrap-responsive.min.css";
-@import "jquery-ui.min.css";
-@import "jquery-ui.theme.min.css";
+//= require css/bootstrap.min
+//= require css/bootstrap-responsive.min
+//= require css/jquery-ui.min
+//= require css/jquery-ui.theme.min
 
-body { text-align: center; }
-body { line-height: 100%; }
 h1 { margin-top: 0; }
 	
 div.container-fluid {
@@ -16,11 +14,12 @@ div.container-fluid {
 }
 
 .navbar-toggle { background-color: #428bca; width: 100%; position: absolute; top: 0px; height: 30px; margin: 0; float: none; z-index: 1; }
-.navbar-toggle .glyphicon { margin-top: -5px; }
+.navbar-toggle .glyphicon { margin-top: -5px; padding-left: 10px; }
 .navbar { margin: 0; }
 .navbar-collapse.in { overflow-y: visible; }
 .nav { margin-top: 30px; }
 .nav li a { padding: 10px 0 10px 10px; }
+#connection { display: none; }
 
 .form-group {
   label { font-weight: normal; font-size: 14px; display: block; }
@@ -31,7 +30,7 @@ div.container-fluid {
 
 div#calculator {
   #exchange, #amount { width: 5em; }
-  span.btn { font-size: 1.4em; width: 80%; }
+  span.btn { font-size: 16px; width: 100%; }
   strong#total { font-size: 30px; }
   p#address { padding-top: 10px; }
   #title { display: none; }
diff --git a/public/css/index.css b/public/css/index.css
deleted file mode 100644
index 8a3cd940..00000000
--- a/public/css/index.css
+++ /dev/null
@@ -1,49 +0,0 @@
-@import "bootstrap.min.css";
-@import "bootstrap-responsive.min.css";
-@import "font-awesome.css";
-.hero-unit {
-  background: url(/img/vancouver.jpg);
-  background-size: 100% 100%;
-}
-.hero-unit p {
-  background: rgba(255, 255, 255, 0.5);
-}
-.navbar-inverse,
-.navbar-inverse .navbar-link,
-.navbar-inverse .brand,
-.navbar-inverse .nav > li > a {
-  color: #eee;
-}
-footer {
-  background: black;
-  color: #ddd;
-  padding: 10px 0px 2px 5px;
-  margin: 0;
-  text-align: right;
-}
-#ask,
-#bid {
-  color: white;
-}
-div.directory {
-  width: 500px;
-  float: left;
-  border: 1px dashed #ccc;
-  padding: 10px;
-  margin: 10px;
-}
-div.directory img {
-  height: 180px;
-  float: left;
-  padding-right: 10px;
-}
-div.directory p {
-  font-size: 13px;
-}
-div.directory h2 a {
-  text-decoration: none;
-  color: #000;
-}
-div.row-fluid td.first {
-  text-align: right;
-}
diff --git a/public/css/signin.css b/public/css/signin.css
deleted file mode 100644
index 2f3291ff..00000000
--- a/public/css/signin.css
+++ /dev/null
@@ -1,20 +0,0 @@
-#main-logo {
-  margin-bottom: 15px;
-}
-.form-signin {
-  margin-bottom: 10px;
-}
-.form-signin .form-control {
-  height: auto;
-  -webkit-box-sizing: border-box;
-  -moz-box-sizing: border-box;
-  box-sizing: border-box;
-  padding: 10px;
-  font-size: 16px;
-}
-.notice {
-  border: 1px solid gray;
-  background: #eee;
-  padding: 10px;
-  margin-bottom: 15px;
-}