Merge branch 'ui' of http://www.github.com/stratisproject/breeze into ui

Breeze.UI/src/scss/_custom.scss

@@ -10,10 +10,6 @@ code {color: $spacegray !important;}
 .form-control:-moz-placeholder { color: $input-color-placeholder; }  /* Mozilla Firefox 4 to 18 */
 .form-control:-ms-input-placeholder { color: $input-color-placeholder; }  /* Internet Explorer 10-11 */
 
-// badge default
-.badge {
-  &.badge-default {color: $gray;}
-}
 // feedback
 .form-control-feedback {
   color: $pink;

Breeze.UI/src/scss/themes/_light.scss

@@ -167,3 +167,11 @@ $btn-primary-color: $white !important;
     a {color: $link-color !important;}
   }
 }
+
+// SETUP
+.badge {
+  &.badge-default {
+    color: $gray;
+    background-color: $white !important;
+  }
+}

Breeze.UI/src/styles.css

@@ -31,10 +31,6 @@ code {
 }
 
 /* Internet Explorer 10-11 */
-.badge.badge-default {
-  color: #98A3B3;
-}
-
 .form-control-feedback {
   color: #FF5B8A;
   margin: .5em 0;
@@ -5319,11 +5315,11 @@ a.badge:focus, a.badge:hover {
 }
 
 .badge-default {
-  background-color: rgba(152, 163, 179, 0.15);
+  background-color: #fff;
 }
 
 .badge-default[href]:focus, .badge-default[href]:hover {
-  background-color: rgba(123, 137, 157, 0.15);
+  background-color: #e6e6e6;
 }
 
 .badge-primary {
@@ -9945,4 +9941,9 @@ a.text-gray-dark:focus, a.text-gray-dark:hover {
   color: #148DC7 !important;
 }
 
+.badge.badge-default {
+  color: #98A3B3;
+  background-color: #fff !important;
+}
+
 /*# sourceMappingURL=styles.css.map */
\ No newline at end of file