Skip to content

Commit 28a023e

Browse files
committed
fix(demos): not running after merging master
1 parent c9acc60 commit 28a023e

File tree

5 files changed

+46
-49
lines changed

5 files changed

+46
-49
lines changed

package-lock.json

Lines changed: 23 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

projects/igniteui-angular/src/lib/core/styles/components/button/_button-theme.scss

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -420,24 +420,6 @@
420420
color: var-get($flat-theme, 'icon-color');
421421
}
422422

423-
&:hover {
424-
background: var-get($flat-theme, 'focus-hover-background');
425-
color: var-get($flat-theme, 'focus-hover-foreground');
426-
427-
igx-icon {
428-
color: var-get($flat-theme, 'icon-color-hover');
429-
}
430-
}
431-
432-
&:active {
433-
background: var-get($flat-theme, 'focus-background');
434-
color: var-get($flat-theme, 'focus-foreground');
435-
436-
igx-icon {
437-
color: var-get($flat-theme, 'focus-foreground');
438-
}
439-
}
440-
441423
@if $variant == 'bootstrap' {
442424
box-shadow: 0 0 0 rem(4px) var-get($flat-theme, 'shadow-color');
443425
}
@@ -465,6 +447,24 @@
465447
}
466448
}
467449
}
450+
451+
&:hover {
452+
background: var-get($flat-theme, 'focus-hover-background');
453+
color: var-get($flat-theme, 'focus-hover-foreground');
454+
455+
igx-icon {
456+
color: var-get($flat-theme, 'icon-color-hover');
457+
}
458+
}
459+
460+
&:active {
461+
background: var-get($flat-theme, 'focus-background');
462+
color: var-get($flat-theme, 'focus-foreground');
463+
464+
igx-icon {
465+
color: var-get($flat-theme, 'focus-foreground');
466+
}
467+
}
468468
}
469469

470470
%igx-button--outlined {

projects/igniteui-angular/src/lib/core/styles/components/highlight/highlight-theme.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
@use 'sass:map';
22
@use '../../base' as *;
3+
@use '../../../styles/themes/standalone' as *;
34

45
/// @deprecated Use the `css-vars` mixin instead.
56
/// @see {mixin} css-vars

projects/igniteui-angular/src/lib/directives/radio/radio-group.directive.ts

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -645,33 +645,6 @@ export class IgxRadioGroupDirective implements ControlValueAccessor, OnDestroy,
645645
}
646646

647647

648-
/**
649-
* Registers a radio button with this radio group.
650-
* This method is called by radio button components when they are created.
651-
* @hidden @internal
652-
*/
653-
public _addRadioButton(radioButton: IgxRadioComponent): void {
654-
this._radioButtons.update(buttons => {
655-
if (!buttons.includes(radioButton)) {
656-
this._setRadioButtonEvents(radioButton);
657-
658-
return [...buttons, radioButton];
659-
}
660-
return buttons;
661-
});
662-
}
663-
664-
/**
665-
* Unregisters a radio button from this radio group.
666-
* This method is called by radio button components when they are destroyed.
667-
* @hidden @internal
668-
*/
669-
public _removeRadioButton(radioButton: IgxRadioComponent): void {
670-
this._radioButtons.update(buttons =>
671-
buttons.filter(btn => btn !== radioButton)
672-
);
673-
}
674-
675648
/**
676649
* Registers a radio button with this radio group.
677650
* This method is called by radio button components when they are created.

src/styles/_variables.scss

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
@use 'sass:map';
22
@use '../../projects/igniteui-angular/src/lib/core/styles/themes' as *;
33

4-
$palette: $light-bootstrap-palette;
5-
$schema: $light-bootstrap-schema;
6-
$typeface: $bootstrap-typeface;
7-
$type-scale: $bootstrap-type-scale;
4+
$palette: $light-material-palette;
5+
$schema: $light-material-schema;
6+
$typeface: $material-typeface;
7+
$type-scale: $material-type-scale;
88
$variant: map.get($schema, '_meta', 'variant');
99

1010
$background-color: var(--ig-gray-900-contrast);

0 commit comments

Comments
 (0)