File tree Expand file tree Collapse file tree 2 files changed +9
-4
lines changed Expand file tree Collapse file tree 2 files changed +9
-4
lines changed Original file line number Diff line number Diff line change 2
2
"name" : " @bootstrap-styled/css-mixins" ,
3
3
"version" : " 2.0.1" ,
4
4
"description" : " Bootstrap v4 css-in-js mixins for Bootstrap Styled." ,
5
- "main" : " lib/index.js" ,
5
+ "main" : " lib/index.js" ,
6
6
"jsnext:main" : " dist/@bootstrap-styled/css-mixins.es.js" ,
7
7
"module" : " dist/@bootstrap-styled/css-mixins.es.js" ,
8
8
"homepage" : " https://bootstrap-styled.github.io/css-mixins" ,
Original file line number Diff line number Diff line change @@ -3,7 +3,7 @@ import { borderRadius } from './border-radius';
3
3
import { hover , hoverFocus } from './hover' ;
4
4
import { boxShadow } from './box-shadow' ;
5
5
import { transition } from './transition' ;
6
- import { ifThen , ifElse } from './conditional' ;
6
+ import { ifElse } from './conditional' ;
7
7
import { linearGradientRe } from './regex' ;
8
8
9
9
export const defaultProps = {
@@ -104,8 +104,13 @@ export function buttonVariant(
104
104
&.active,
105
105
.show > &.dropdown-toggle {
106
106
color: ${ buttonColor } ;
107
- ${ ifThen ( activeBackground . includes ( 'linear-gradient' ) , 'background-image: none;' ) }
108
- background-color: ${ activeBackground } ;
107
+ ${ ifElse ( activeBackground . includes ( 'linear-gradient' ) , `
108
+ background: ${ activeBackground } ;
109
+ ` , `
110
+ background-color: ${ activeBackground } ;
111
+ background-image: none;
112
+ ` ) }
113
+
109
114
border-color: ${ activeBorder } ;
110
115
${ boxShadow ( enableShadows , btnActiveBoxShadow ) }
111
116
}
You can’t perform that action at this time.
0 commit comments