Fix Conflicts:

views/unsupported.html
This commit is contained in:
Gustavo Maximiliano Cortez 2014-08-06 18:51:04 -03:00
commit 0c2141c380
53 changed files with 1983 additions and 1297 deletions

View file

@ -1006,7 +1006,7 @@ input.ng-invalid-match, input.ng-invalid-match:focus {
.text-primary {color: #1ABC9C;}
.text-secondary {color: #3498DB;}
.text-white {color: #fff;}
.text-warning {color: #CA5649;}
.footer-setup a.text-gray:hover {color: #fff;}
a.text-gray:hover {color: #2C3E50;}
@ -1014,6 +1014,7 @@ a.text-black:hover {color: #213140;}
a.text-primary:hover {color: #50E3C2;}
a.text-secondary:hover {color: #4A90E2;}
a.text-white:hover {color: #ccc;}
a.text-warning:hover {color: #FD7262;}
.box-setup-copayers {
background: #2C3E50;