Merge branch 'dev'

Conflicts:
	app.js
	router.js

1 files changed, 0 insertions, 138 deletions

diff --git a/public/css/login.css b/public/css/login.css
deleted file mode 100644
index 5709783..0000000
--- a/public/css/login.css
+++ /dev/null
@@ -1,138 +0,0 @@
-body {
-  margin: 0;
-  padding: 0;
-  height: 100%;
-  background: #f2f9fe;
-  background: -moz-radial-gradient(center, ellipse cover, #f2f9fe 0%, #d6f0fd 100%);
-/* FF3.6+ */
-  background: -webkit-gradient(radial, center center, 0px, center center, 100%, color-stop(0%, #f2f9fe), color-stop(100%, #d6f0fd));
-/* Chrome,Safari4+ */
-  background: -webkit-radial-gradient(center, ellipse cover, #f2f9fe 0%, #d6f0fd 100%);
-/* Chrome10+,Safari5.1+ */
-  background: -o-radial-gradient(center, ellipse cover, #f2f9fe 0%, #d6f0fd 100%);
-/* Opera 12+ */
-  background: -ms-radial-gradient(center, ellipse cover, #f2f9fe 0%, #d6f0fd 100%);
-/* IE10+ */
-  background: radial-gradient(center, ellipse cover, #f2f9fe 0%, #d6f0fd 100%);
-/* W3C */
-}
-#login-container {
-  width: 340px;
-  margin: 160px auto;
-}
-#login-container label {
-  margin: 15px 0 5px 5px;
-}
-#login-container button {
-  width: 150px;
-  padding: 6px 40px 6px 40px;
-  float: left;
-  margin-top: 15px;
-}
-#login-container .checkbox {
-  margin: 23px 0 0 180px;
-}
-#login-container .btm-links {
-  text-align: center;
-  margin-top: 10px;
-}
-#login-container #create-account {
-  float: right;
-  margin-right: 13px;
-}
-#login-container #forgot-password {
-  float: left;
-  margin-left: 10px;
-}
-#account-form-container {
-  width: 460px;
-  margin: 100px auto;
-}
-#country-list {
-  width: 280px;
-}
-.modal-form-errors li {
-  color: #808080;
-  text-shadow: -1px 1px 0 #fff;
-  -moz-text-shadow: -1px 1px 0 #fff;
-  -webkit-text-shadow: -1px 1px 0 #fff;
-  color: #d8000c;
-}
-.modal-single-input {
-  width: 452px;
-  margin: -200px 0 0 -232px;
-}
-.modal-single-input form {
-  color: #808080;
-  text-shadow: -1px 1px 0 #fff;
-  -moz-text-shadow: -1px 1px 0 #fff;
-  -webkit-text-shadow: -1px 1px 0 #fff;
-  margin-bottom: 0;
-}
-.modal-single-input form button {
-  width: 80px;
-  top: 213px;
-  position: absolute;
-}
-.modal-single-input form #cancel {
-  right: 110px;
-}
-.modal-single-input form #submit {
-  right: 18px;
-}
-.modal-single-input .modal-body {
-  height: 140px;
-  overflow: hidden;
-  padding-bottom: 0;
-}
-.modal-single-input .modal-footer {
-  height: 20px;
-}
-.modal-alert {
-  width: 310px;
-  margin: -200px 0 0 -150px;
-}
-#btn-logout {
-  width: 100px;
-  top: 1px;
-  right: 8px;
-  position: absolute;
-}
-#print {
-  padding: 20px;
-}
-#four04 {
-  padding: 20px;
-}
-.clear-fix {
-  clear: both;
-}
-.well {
-  margin-left: 0;
-  border: 1px solid #ccc;
-}
-.form-horizontal .control-label {
-  width: 80px;
-}
-.form-horizontal .controls {
-  margin-left: 120px;
-}
-.form-horizontal .form-actions {
-  padding: 17px 0 0 270px;
-}
-label {
-  color: #808080;
-  text-shadow: -1px 1px 0 #fff;
-  -moz-text-shadow: -1px 1px 0 #fff;
-  -webkit-text-shadow: -1px 1px 0 #fff;
-}
-.subheading {
-  color: #808080;
-  text-shadow: -1px 1px 0 #fff;
-  -moz-text-shadow: -1px 1px 0 #fff;
-  -webkit-text-shadow: -1px 1px 0 #fff;
-  margin-top: 3px;
-}
-button i {
-  padding-left: 8px;
-}