1
0
mirror of https://github.com/ascribe/onion.git synced 2024-12-22 09:23:13 +01:00

Merge branch 'AP-6-polline-consignment-wallet' into AP-7-artcity-consignment-wallet

This commit is contained in:
Tim Daubenschütz 2016-02-04 15:53:36 +01:00
commit d5f52e876e

View File

@ -171,13 +171,13 @@ $polline--highlight-color: #2882fa;
fieldset[disabled] .btn-default.focus, fieldset[disabled] .btn-default.focus,
fieldset[disabled] .btn-default:active, fieldset[disabled] .btn-default:active,
fieldset[disabled] .btn-default.active { fieldset[disabled] .btn-default.active {
background-color: lighten($polline--highlight-color, 30%); background-color: lighten($polline--button-default-color, 30%);
border-color: lighten($polline--highlight-color, 30%); border-color: lighten($polline--button-default-color, 30%);
} }
.btn-default { .btn-default {
background-color: $polline--highlight-color; background-color: $polline--button-default-color;
border-color: $polline--highlight-color; border-color: $polline--button-default-color;
&:hover, &:hover,
&:active, &:active,
@ -188,8 +188,8 @@ $polline--highlight-color: #2882fa;
&.active:hover, &.active:hover,
&.active:focus, &.active:focus,
&.active.focus { &.active.focus {
background-color: lighten($polline--highlight-color, 30%); background-color: lighten($polline--button-default-color, 30%);
border-color: lighten($polline--highlight-color, 30%); border-color: lighten($polline--button-default-color, 30%);
} }
} }