Merge branch 'master' of github.com:tinper-bee/tinper-bee-core

This commit is contained in:
ahua52 2016-12-27 15:16:28 +08:00
commit 32fd918847
1 changed files with 27 additions and 30 deletions

View File

@ -191,24 +191,6 @@
}
}
@mixin colorful-button($name) {
.u-button-$name {
color: #fff;
background-color: $button-info-color;
border:1px $button-info-color solid;
}
.u-button-$name.focus, .u-button-$name:focus, .u-button-$name:hover {
background-color: $button-info-hover-color;
border-color: $button-info-hover-color;
}
.u-button-$name.active, .u-button-$name:active, .open>.dropdown-toggle.u-button-$name {
background-color: $button-info-active-color;
border-color: $button-info-active-color;
}
}
/* Shadows */
// Focus shadow mixin.
@ -333,25 +315,40 @@
border-top-left-radius: $radius;
}
//边框按钮颜色
@mixin border-button-styles-variant($text-color,$bg-color,$bg-hover-color) {
@mixin border-button-styles-variant($text-color,$bg-color,$bg-hover-color,$bg-active-color) {
color: $text-color;
border:1px $bg-color solid;
&.active,&:hover,&:active,&:focus{
color:#fff;
background-color: $bg-hover-color;
border-color: $bg-hover-color;
&.focus, &:focus, &:hover {
background-color: $bg-hover-color;
border-color: $bg-hover-color;
color:$bg-hover-color;
}
&.active, &:active {
color:$bg-active-color;
background-color: $bg-active-color;
border-color: $bg-active-color;
}
}
//按钮颜色
@mixin button-styles-variant($text-color,$bg-color,$bg-hover-color) {
color: $text-color;
background-color: $bg-color;
border:1px $bg-color solid;
&.active,&:hover,&:active,&:focus{
@mixin button-styles-variant($text-color,$bg-color,$bg-hover-color,$bg-active-color) {
color: $text-color;
background-color: $bg-color;
border:1px $bg-color solid;
&.focus, &:focus, &:hover {
background-color: $bg-hover-color;
border-color: $bg-hover-color;
}
&.active, &:active {
background-color: $bg-active-color;
border-color: $bg-active-color;
}
}
//按钮尺寸
@ -443,7 +440,7 @@
background-color: $bg-color;
}
//alert
//alert
@mixin alert-styles-variant($bg-color,$text-color) {
background-color: $bg-color;
border-color: $bg-color;
@ -1276,4 +1273,4 @@
transform-origin: 0% 0%;
transform: scaleY(0);
}
}
}