Skip to content

Commit 4e6b1a5

Browse files
committed
fix(themes): correct theme references and adjust styles for consistency
- Updated `themed-block` calls in date-range-picker themes to use correct theme references (Material and Fluent). - Set `--aside-padding` for Fluent theme in demos settings. - Refined styles in `pageHeading` component and updated `igx-input-group` to use `display: block grid`. - Replaced `--_range-border-style` with `--_preview-border-style` in calendar days view styles.
1 parent aef684d commit 4e6b1a5

6 files changed

Lines changed: 12 additions & 4 deletions

File tree

projects/igniteui-angular/calendar/src/calendar/days-view/themes/_base.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ $theme: $material;
2020
width: calc(50% + #{rem(1px)});
2121
border-width: var(--_range-border-size);
2222
border-inline-color: transparent;
23-
border-style: var(--_range-border-style);
23+
border-style: var(--_preview-border-style);
2424
}
2525
}
2626

projects/igniteui-angular/date-picker/src/date-range-picker/themes/shared/_fluent.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66

77
$_theme: $fluent;
88

9-
@include themed-block(igx-date-range-picker, bootstrap) {
9+
@include themed-block(igx-date-range-picker, fluent) {
1010
--input-group-size: #{map.get($_theme, 'size')};
1111
}

projects/igniteui-angular/date-picker/src/date-range-picker/themes/shared/_material.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66

77
$_theme: $material;
88

9-
@include themed-block(igx-date-range-picker, bootstrap) {
9+
@include themed-block(igx-date-range-picker, material) {
1010
--input-group-size: #{map.get($_theme, 'size')};
1111
}

src/app/app.component.scss

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,12 @@
3232
padding-top: 0;
3333
}
3434
}
35+
36+
[data-ig-theme='fluent'] {
37+
.demos-settings-nav {
38+
--aside-padding: 1rem;
39+
}
40+
}
3541
}
3642

3743
.demos-title {

src/app/pageHeading/pageHeading.component.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import {Component, EventEmitter, inject, input, Output, signal, ViewEncapsulation} from '@angular/core';
22
import { AsyncPipe, KeyValuePipe } from '@angular/common';
33
import {
4+
IgxButtonDirective,
45
IgxIconButtonDirective,
56
IgxIconComponent,
67
IgxRippleDirective,
@@ -33,6 +34,7 @@ export type IgSize = 'small' | 'medium' | 'large';
3334
AsyncPipe,
3435
KeyValuePipe,
3536
FormsModule,
37+
IgxButtonDirective,
3638
]
3739
})
3840
export class PageHeaderComponent {

src/app/pageHeading/pageHeading.styles.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
}
77

88
igx-input-group {
9-
display: block !important;
9+
display: block grid !important;
1010
}
1111
}
1212

0 commit comments

Comments
 (0)