Commit 7e47c675 authored by dev0tion's avatar dev0tion

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

parents c0469d0e b4d93db0
...@@ -10,10 +10,6 @@ code {color: $spacegray !important;} ...@@ -10,10 +10,6 @@ code {color: $spacegray !important;}
.form-control:-moz-placeholder { color: $input-color-placeholder; } /* Mozilla Firefox 4 to 18 */ .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 */ .form-control:-ms-input-placeholder { color: $input-color-placeholder; } /* Internet Explorer 10-11 */
// badge default
.badge {
&.badge-default {color: $gray;}
}
// feedback // feedback
.form-control-feedback { .form-control-feedback {
color: $pink; color: $pink;
......
...@@ -167,3 +167,11 @@ $btn-primary-color: $white !important; ...@@ -167,3 +167,11 @@ $btn-primary-color: $white !important;
a {color: $link-color !important;} a {color: $link-color !important;}
} }
} }
// SETUP
.badge {
&.badge-default {
color: $gray;
background-color: $white !important;
}
}
...@@ -31,10 +31,6 @@ code { ...@@ -31,10 +31,6 @@ code {
} }
/* Internet Explorer 10-11 */ /* Internet Explorer 10-11 */
.badge.badge-default {
color: #98A3B3;
}
.form-control-feedback { .form-control-feedback {
color: #FF5B8A; color: #FF5B8A;
margin: .5em 0; margin: .5em 0;
...@@ -5319,11 +5315,11 @@ a.badge:focus, a.badge:hover { ...@@ -5319,11 +5315,11 @@ a.badge:focus, a.badge:hover {
} }
.badge-default { .badge-default {
background-color: rgba(152, 163, 179, 0.15); background-color: #fff;
} }
.badge-default[href]:focus, .badge-default[href]:hover { .badge-default[href]:focus, .badge-default[href]:hover {
background-color: rgba(123, 137, 157, 0.15); background-color: #e6e6e6;
} }
.badge-primary { .badge-primary {
...@@ -9945,4 +9941,9 @@ a.text-gray-dark:focus, a.text-gray-dark:hover { ...@@ -9945,4 +9941,9 @@ a.text-gray-dark:focus, a.text-gray-dark:hover {
color: #148DC7 !important; color: #148DC7 !important;
} }
.badge.badge-default {
color: #98A3B3;
background-color: #fff !important;
}
/*# sourceMappingURL=styles.css.map */ /*# sourceMappingURL=styles.css.map */
\ No newline at end of file
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment