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 22 "name" : " @bootstrap-styled/css-mixins" ,
33 "version" : " 2.0.1" ,
44 "description" : " Bootstrap v4 css-in-js mixins for Bootstrap Styled." ,
5- "main" : " lib/index.js" ,
5+ "main" : " lib/index.js" ,
66 "jsnext:main" : " dist/@bootstrap-styled/css-mixins.es.js" ,
77 "module" : " dist/@bootstrap-styled/css-mixins.es.js" ,
88 "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';
33import { hover , hoverFocus } from './hover' ;
44import { boxShadow } from './box-shadow' ;
55import { transition } from './transition' ;
6- import { ifThen , ifElse } from './conditional' ;
6+ import { ifElse } from './conditional' ;
77import { linearGradientRe } from './regex' ;
88
99export const defaultProps = {
@@ -104,8 +104,13 @@ export function buttonVariant(
104104 &.active,
105105 .show > &.dropdown-toggle {
106106 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+
109114 border-color: ${ activeBorder } ;
110115 ${ boxShadow ( enableShadows , btnActiveBoxShadow ) }
111116 }
You can’t perform that action at this time.
0 commit comments