Skip to content

Commit

Permalink
Merge branch 'master' into dmdimitrov/fix-10391-master
Browse files Browse the repository at this point in the history
  • Loading branch information
kdinev authored Nov 22, 2021
2 parents a408798 + 3a323fe commit e7daf1b
Showing 1 changed file with 1 addition and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
/// @type {Map}
/// @prop {Color} shadow-color [transparent] - The shadow color of the button.
/// @prop {Color} border-color [transparent] - The outline color of the button.
/// @prop {Color} focus-border-color [transparent] - The focused border color of the button.
/// @prop {Color} disabled-border-color [transparent] - The disabled border color of the button.
/// @prop {Color} disabled-background [igx-color: ('grays', 300)] - The disabled background color of the button.
/// @prop {Color} disabled-foreground [igx-color: ('grays', 500)] - The disabled foreground color of the button.
Expand All @@ -22,8 +21,6 @@ $material-base-button: (

border-color: transparent,

focus-border-color: transparent,

disabled-border-color: transparent,

disabled-background: (
Expand Down Expand Up @@ -80,7 +77,6 @@ $material-flat-button: extend(

/// @type {Map}
/// @prop {Map} border-color [igx-color: ('secondary', 500)] - The outline color of the button.
/// @prop {Map} focus-border-color [igx-color: ('grays', 300)] - The focused border color of the button.
/// @prop {Map} disabled-border-color [igx-color: ('grays', 300)] - The disabled focused border color of the button.
/// @requires {function} extend
/// @requires {Map} $material-flat-button
Expand All @@ -90,11 +86,7 @@ $material-outlined-button: extend(
selector: '[igxButton="outlined"], .igx-button--outlined',

border-color: (
igx-color: ('secondary', 300)
),

focus-border-color: (
igx-color: ('grays', 300)
igx-color: ('secondary', 500)
),

disabled-border-color: (
Expand Down

0 comments on commit e7daf1b

Please sign in to comment.