Skip to content

Commit 13751de

Browse files
authored
Merge branch '11.0.x' into amarinov/datePickerStrictTemplate110
2 parents b06fd07 + df10013 commit 13751de

File tree

3 files changed

+16
-2
lines changed

3 files changed

+16
-2
lines changed

projects/igniteui-angular/src/lib/buttonGroup/buttonGroup.component.ts

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,17 @@ import { IgxIconModule } from '../icon/public_api';
2424
import { takeUntil } from 'rxjs/operators';
2525
import { DisplayDensityBase, DisplayDensityToken, IDisplayDensityOptions } from '../core/density';
2626
import { IBaseEventArgs } from '../core/utils';
27+
import { mkenum } from '../core/utils';
28+
29+
/**
30+
* Determines the Button Group alignment
31+
*/
32+
export const ButtonGroupAlignment = mkenum({
33+
horizontal: 'horizontal',
34+
vertical: 'vertical'
35+
});
36+
export type ButtonGroupAlignment = (typeof ButtonGroupAlignment)[keyof typeof ButtonGroupAlignment];
2737

28-
export enum ButtonGroupAlignment { horizontal, vertical }
2938
let NEXT_ID = 0;
3039

3140
/**

projects/igniteui-angular/src/lib/core/styles/components/calendar/_calendar-component.scss

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,11 @@
107107
@include e(date, 'weekend') {
108108
@extend %cal-value !optional;
109109
@extend %cal-value--weekend !optional;
110+
111+
&:hover,
112+
&:focus {
113+
@extend %cal-value--hover !optional;
114+
}
110115
}
111116

112117
@include e(date, 'special') {

src/app/buttonGroup/buttonGroup.sample.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ <h4 class="sample-title">Multiple Selection <i class="light">Horizontal Disabled
2020

2121
<article class="sample-column">
2222
<h4 class="sample-title">Exclusive Selection <i class="light">Vertical</i></h4>
23-
<igx-buttongroup [multiSelection]="false" [values]="cities" [alignment]="alignment">
23+
<igx-buttongroup [multiSelection]="false" [values]="cities" alignment="vertical">
2424
</igx-buttongroup>
2525
</article>
2626

0 commit comments

Comments
 (0)