Skip to content

Commit 7606924

Browse files
authored
Merge branch 'master' into bpachilova/fix-14135
2 parents 1e68216 + 766c7ac commit 7606924

File tree

4 files changed

+39
-4
lines changed

4 files changed

+39
-4
lines changed

projects/igniteui-angular/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494
}
9595
},
9696
"igxDevDependencies": {
97-
"@igniteui/angular-schematics": "~18.0.1330-beta.0"
97+
"@igniteui/angular-schematics": "~18.0.1330-rc.0"
9898
},
9999
"ng-update": {
100100
"migrations": "./migrations/migration-collection.json",

projects/igniteui-angular/src/lib/banner/banner.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<igx-expansion-panel #expansionPanel [animationSettings]="animationSettings" (contentCollapsed)="onExpansionPanelClose()" (contentExpanded)="onExpansionPanelOpen()"
2-
[collapsed]="collapsed" aria-live="polite" [attr.aria-hidden]="collapsed">
2+
[collapsed]="collapsed" role="status" aria-live="polite" [attr.aria-hidden]="collapsed">
33
<igx-expansion-panel-body>
44
<div class="igx-banner">
55
<div class="igx-banner__message">

projects/igniteui-angular/src/lib/banner/banner.component.spec.ts

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -475,6 +475,16 @@ describe('igxBanner', () => {
475475
expect(banner.elementRef.nativeElement.style.display).toEqual('');
476476
expect(banner.collapsed).toBeTruthy();
477477
}));
478+
479+
it('Should apply the appropriate attributes on initialization', fakeAsync(() => {
480+
const fixture = TestBed.createComponent(IgxBannerOneButtonComponent);
481+
fixture.detectChanges();
482+
483+
const panel = fixture.nativeElement.querySelector('.' + CSS_CLASS_EXPANSION_PANEL);
484+
expect(panel).not.toBeNull();
485+
expect(panel.attributes.getNamedItem('role').nodeValue).toEqual('status');
486+
expect(panel.attributes.getNamedItem('aria-live').nodeValue).toEqual('polite');
487+
}));
478488
});
479489

480490
const getBaseClassElements = <T>(fixture: ComponentFixture<T>) => {

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

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@
237237
border-radius: border-radius(rem(32px));
238238

239239
@if $variant == 'indigo-design' {
240-
border-radius: initial;
240+
border-radius: border-radius(rem(4px));
241241
}
242242
}
243243

@@ -290,6 +290,14 @@
290290
top: 0;
291291
align-items: flex-end;
292292
}
293+
294+
@if $variant == 'indigo-design' {
295+
bottom: rem(3px);
296+
297+
&%igx-slider__ticks--top {
298+
top: rem(3px);
299+
}
300+
}
293301
}
294302

295303
%igx-slider__ticks-group {
@@ -303,7 +311,7 @@
303311
}
304312

305313
&:last-of-type {
306-
margin-inline-start: rem(-1px);
314+
margin-inline-end: rem(-1px);
307315
}
308316
}
309317

@@ -330,6 +338,10 @@
330338
%igx-slider__ticks--tall {
331339
%igx-slider__ticks-label {
332340
top: calc(#{$tick-height--tall} + #{$tick-height});
341+
342+
@if $variant == 'indigo-design' {
343+
top: calc(#{$tick-height--tall} + (#{$tick-height} / 2));
344+
}
333345
}
334346
}
335347

@@ -348,6 +360,10 @@
348360

349361
%igx-slider__ticks-label {
350362
top: calc(#{$tick-height--tall} + #{$tick-height});
363+
364+
@if $variant == 'indigo-design' {
365+
top: calc(#{$tick-height--tall} + (#{$tick-height} / 2));
366+
}
351367
}
352368
}
353369

@@ -535,6 +551,10 @@
535551
display: flex;
536552
top: calc(((#{$thumb-label-height}) + rem(20px)) * -1);
537553
height: $thumb-label-height;
554+
555+
@if $variant == 'indigo-design' {
556+
top: calc(((#{$thumb-label-height}) + rem(18px)) * -1);
557+
}
538558
}
539559

540560
%igx-slider-thumb-label__container {
@@ -561,6 +581,11 @@
561581
border-inline-start: rem(10px) solid transparent;
562582
border-inline-end: rem(10px) solid transparent;
563583
border-top: rem(10px) solid var-get($theme, 'label-background-color');
584+
585+
@if $variant == 'indigo-design' {
586+
top: rem(16px);
587+
border-top: rem(12px) solid var-get($theme, 'label-background-color');
588+
}
564589
}
565590
}
566591

0 commit comments

Comments
 (0)