From 945cb3253f1349e30aafa4e7cb57bb507a2ea0cc Mon Sep 17 00:00:00 2001
From: madd15 <joshdeakin@adam.com.au>
Date: Tue, 24 Jun 2014 10:25:35 +0930
Subject: [PATCH] Fix #117

Fix CCS for #117
#166 also fixed edit user page
---
 public/assets/css/bootstrap/bootstrap.css |  6 +++---
 public/assets/css/lib/uniform.default.css | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/public/assets/css/bootstrap/bootstrap.css b/public/assets/css/bootstrap/bootstrap.css
index 8d14a543de..10f2741047 100755
--- a/public/assets/css/bootstrap/bootstrap.css
+++ b/public/assets/css/bootstrap/bootstrap.css
@@ -1609,7 +1609,7 @@ textarea.form-control {
 .checkbox input[type="checkbox"],
 .checkbox-inline input[type="checkbox"] {
   float: left;
-  margin-left: -20px;
+  margin-left: 0;
 }
 .radio + .radio,
 .checkbox + .checkbox {
@@ -1765,8 +1765,8 @@ textarea.input-lg {
 .form-horizontal .checkbox,
 .form-horizontal .radio-inline,
 .form-horizontal .checkbox-inline {
-  margin-top: 0;
-  margin-bottom: 0;
+  margin-top: 5px;
+  margin-bottom: 5px;
   padding-top: 7px;
 }
 .form-horizontal .form-group {
diff --git a/public/assets/css/lib/uniform.default.css b/public/assets/css/lib/uniform.default.css
index 697c996307..ad280bfff9 100644
--- a/public/assets/css/lib/uniform.default.css
+++ b/public/assets/css/lib/uniform.default.css
@@ -11,7 +11,7 @@ http://uniformjs.com/
 */
 /* General settings */
 div.selector, div.selector span, div.checker span, div.radio span, div.uploader, div.uploader span.action, div.button, div.button span {
-  background-image: url("../../img/uniform/sprite.png");
+  background-image: url("../../../img/uniform/sprite.png");
   background-repeat: no-repeat;
   -webkit-font-smoothing: antialiased; }
 div.selector, div.checker, div.button, div.radio, div.uploader {
@@ -28,7 +28,7 @@ div.selector, div.selector *, div.radio, div.radio *, div.checker, div.checker *
   padding: 0; }
 
 .highContrastDetect {
-  background: url("../../img/uniform/bg-input.png") repeat-x 0 0;
+  background: url("../../../img/uniform/bg-input.png") repeat-x 0 0;
   width: 0px;
   height: 0px; }
 
@@ -37,12 +37,12 @@ input.uniform-input,
 select.uniform-multiselect,
 textarea.uniform {
   padding: 3px;
-  background: url("../../img/uniform/bg-input.png") repeat-x 0 0;
+  background: url("../../../img/uniform/bg-input.png") repeat-x 0 0;
   outline: 0; }
   input.uniform-input.active,
   select.uniform-multiselect.active,
   textarea.uniform.active {
-    background: url("../../img/uniform/bg-input-focus.png") repeat-x 0 0; }
+    background: url("../../../img/uniform/bg-input-focus.png") repeat-x 0 0; }
 
 /* Remove default webkit and possible mozilla .search styles.
  * Keeping this as :active to remove browser styles */
@@ -340,7 +340,7 @@ div.checker {
 
 /* Radio */
 div.radio {
-  margin-right: 3px; }
+  margin-right: 20px; }
 
 /* Uploader */
 div.uploader span.action {