fix(progressButtons): fix hover effect for shrink

pull/3/head
alex 2016-03-02 14:29:49 +03:00
parent 5df2e90bb7
commit 34432efc85
1 changed files with 20 additions and 15 deletions

View File

@ -59,19 +59,19 @@ $hover: 24;
@include styleButton($danger, $danger - $hover); @include styleButton($danger, $danger - $hover);
} }
} }
.bootstrap-select{
.bootstrap-select {
.dropdown-toggle:focus { .dropdown-toggle:focus {
outline: none !important; outline: none !important;
} }
button.btn-default:focus{ button.btn-default:focus {
color: $default; color: $default;
} }
.btn{ .btn {
transition: none; transition: none;
} }
} }
button.btn.btn-primary { button.btn.btn-primary {
@include buttonColor($primary, $primary); @include buttonColor($primary, $primary);
&:active, &:target { &:active, &:target {
@ -84,7 +84,7 @@ button.btn.btn-default {
@include buttonColor(transparent, $default); @include buttonColor(transparent, $default);
&:active, &:target { &:active, &:target {
background-color: rgba(0, 0, 0, 0.2); background-color: rgba(0, 0, 0, 0.2);
color: $default ; color: $default;
} }
} }
@ -127,30 +127,31 @@ button.btn.btn-danger {
transform: none; transform: none;
} }
} }
@mixin buttonGroupColor($color) { @mixin buttonGroupColor($color) {
border-color: $color - $hover/2; border-color: $color - $hover/2;
&:hover{ &:hover {
border-color: $color - $hover; border-color: $color - $hover;
} }
} }
.btn-group { .btn-group {
button.btn.btn-primary{ button.btn.btn-primary {
@include buttonGroupColor($primary); @include buttonGroupColor($primary);
} }
button.btn.btn-default{ button.btn.btn-default {
@include buttonGroupColor($default); @include buttonGroupColor($default);
} }
button.btn.btn-danger{ button.btn.btn-danger {
@include buttonGroupColor($danger); @include buttonGroupColor($danger);
} }
button.btn.btn-info{ button.btn.btn-info {
@include buttonGroupColor($info); @include buttonGroupColor($info);
} }
button.btn.btn-success{ button.btn.btn-success {
@include buttonGroupColor($success); @include buttonGroupColor($success);
} }
button.btn.btn-warning{ button.btn.btn-warning {
@include buttonGroupColor($warning); @include buttonGroupColor($warning);
} }
.dropdown-menu { .dropdown-menu {
@ -158,8 +159,6 @@ button.btn.btn-danger {
} }
} }
.btn-toolbar { .btn-toolbar {
display: inline-block; display: inline-block;
} }
@ -209,10 +208,16 @@ button.progress-button {
margin-bottom: 0; margin-bottom: 0;
border-radius: 0; border-radius: 0;
} }
&:hover, &.btn.disabled { &:hover {
transform: none; transform: none;
} }
&.progress-button-style-shrink.btn.disabled.progress-button-dir-horizontal:hover {
transform: scaleY(.3);
}
&.progress-button-style-shrink.btn.disabled.progress-button-dir-vertical:hover {
transform: scaleX(.1);
}
&.btn.btn-primary { &.btn.btn-primary {
@include progressButtonColor($primary); @include progressButtonColor($primary);